From cgrzemba at users.sourceforge.net Mon Jul 1 09:59:16 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 01 Jul 2013 07:59:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21418] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21418 http://gar.svn.sourceforge.net/gar/?rev=21418&view=rev Author: cgrzemba Date: 2013-07-01 07:59:05 +0000 (Mon, 01 Jul 2013) Log Message: ----------- qt4-gcc/trunk: update download location, ftp has not worked Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-30 20:07:27 UTC (rev 21417) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-01 07:59:05 UTC (rev 21418) @@ -13,7 +13,7 @@ GARCOMPILER = GNU -MASTER_SITES = ftp://ftp.qt-project.org/qt/source/ +MASTER_SITES = http://download.qt-project.org/official_releases/qt/$(basename $(VERSION))/$(VERSION)/ DISTNAME = qt-everywhere-opensource-src-$(VERSION) DISTFILES = $(DISTNAME).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jul 1 10:05:57 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 01 Jul 2013 08:05:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21419] csw/mgar/pkg/gstplugins_bad/trunk Message-ID: Revision: 21419 http://gar.svn.sourceforge.net/gar/?rev=21419&view=rev Author: cgrzemba Date: 2013-07-01 08:05:51 +0000 (Mon, 01 Jul 2013) Log Message: ----------- gstplugins_bad/trunk: update version and build recipe Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile csw/mgar/pkg/gstplugins_bad/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-01 07:59:05 UTC (rev 21418) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-01 08:05:51 UTC (rev 21419) @@ -1,5 +1,5 @@ NAME = gst-plugins-bad -VERSION = 0.10.20 +VERSION = 0.10.21 CATEGORIES = gnome GARTYPE = v2 @@ -13,17 +13,39 @@ MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-bad/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWgstpluginsbad -CATALOGNAME = gstplugins_bad +PACKAGES = CSWgstplugins-bad -# 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 += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm +BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo +BUILD_DEP_PKGS += CSWbzip2 CSWfaac CSWlibfaad-dev CSWggettextrt CSWjasper CSWliboil +BUILD_DEP_PKGS += CSWfconfig CSWftype2 -DEP_PKGS += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm -DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo -DEP_PKGS += CSWbzip2 CSWfaac CSWfaad2 CSWggettextrt CSWjasper CSWliboil -DEP_PKGS += CSWfconfig CSWftype2 +GARCOMPILER = GCC4 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstsdp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstinterfaces0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstrtp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibsndfile1 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgsttag0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWfaac +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstaudio0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstbase0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstcontroller0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgcc-s1 + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include @@ -37,8 +59,12 @@ TEST_SCRIPTS = PATCHFILES = patch-gstvideomeasure_collector.h patch-gstvideomeasure_ssim.h +# see: GStreamer (bugzilla.gnome.org) +# [Bug 645053] shm: multiple compile failures on Solaris 10 +PATCHFILES = 0001-fix-solaris10-compiler-errors.patch include gar/category.mk + post-configure-modulated: perl -pi -e 's,(LIBS = -lnsl -lsocket),$$1 -lresolv,' \ $(WORKSRC)/gst/dccp/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/checksums 2013-07-01 07:59:05 UTC (rev 21418) +++ csw/mgar/pkg/gstplugins_bad/trunk/checksums 2013-07-01 08:05:51 UTC (rev 21419) @@ -1,3 +1 @@ -454f1bfaa9a1dff48d7a1df2fbf5b3c3 gst-plugins-bad-0.10.17.tar.gz -4f8db8228a9066d3a68501dfc2202d59 patch-gstvideomeasure_collector.h -5f7b6d332bb6e70488e8ae8043cdf0dc patch-gstvideomeasure_ssim.h +d19af641ab0b9a5c6cbb66ba19c35b16 gst-plugins-bad-0.10.21.tar.gz Added: csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch (rev 0) +++ csw/mgar/pkg/gstplugins_bad/trunk/files/0001-fix-solaris10-compiler-errors.patch 2013-07-01 08:05:51 UTC (rev 21419) @@ -0,0 +1,87 @@ +From 9c192361f6b43ef872ffa98229c188b62bb1ca9f Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Fri, 28 Jun 2013 11:27:49 +0200 +Subject: [PATCH] fix solaris10 compiler errors + +--- + sys/shm/shmpipe.c | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/sys/shm/shmpipe.c b/sys/shm/shmpipe.c +index 9d1ab56..b19fd0f 100644 +--- a/sys/shm/shmpipe.c ++++ b/sys/shm/shmpipe.c +@@ -69,6 +69,10 @@ + + #define LISTEN_BACKLOG 10 + ++#if ! defined(MSG_NOSIGNAL) ++#define MSG_NOSIGNAL 0 ++#endif ++ + enum + { + COMMAND_NEW_SHM_AREA = 1, +@@ -190,7 +194,7 @@ sp_writer_create (const char *path, size_t size, mode_t perms) + { + ShmPipe *self = spalloc_new (ShmPipe); + int flags; +- struct sockaddr_un sun; ++ struct sockaddr_un sock_un; + int i = 0; + + memset (self, 0, sizeof (ShmPipe)); +@@ -208,10 +212,10 @@ sp_writer_create (const char *path, size_t size, mode_t perms) + if (fcntl (self->main_socket, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC) < 0) + RETURN_ERROR ("fcntl(F_SETFL) failed (%d): %s\n", errno, strerror (errno)); + +- sun.sun_family = AF_UNIX; +- strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1); ++ sock_un.sun_family = AF_UNIX; ++ strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1); + +- while (bind (self->main_socket, (struct sockaddr *) &sun, ++ while (bind (self->main_socket, (struct sockaddr *) &sock_un, + sizeof (struct sockaddr_un)) < 0) { + if (errno != EADDRINUSE) + RETURN_ERROR ("bind() failed (%d): %s\n", errno, strerror (errno)); +@@ -219,11 +223,11 @@ sp_writer_create (const char *path, size_t size, mode_t perms) + if (i > 256) + RETURN_ERROR ("Could not find a free socket name for %s", path); + +- snprintf (sun.sun_path, sizeof (sun.sun_path), "%s.%d", path, i); ++ snprintf (sock_un.sun_path, sizeof (sock_un.sun_path), "%s.%d", path, i); + i++; + } + +- self->socket_path = strdup (sun.sun_path); ++ self->socket_path = strdup (sock_un.sun_path); + + if (listen (self->main_socket, LISTEN_BACKLOG) < 0) + RETURN_ERROR ("listen() failed (%d): %s\n", errno, strerror (errno)); +@@ -704,7 +708,7 @@ ShmPipe * + sp_client_open (const char *path) + { + ShmPipe *self = spalloc_new (ShmPipe); +- struct sockaddr_un sun; ++ struct sockaddr_un sock_un; + + memset (self, 0, sizeof (ShmPipe)); + +@@ -712,10 +716,10 @@ sp_client_open (const char *path) + if (self->main_socket < 0) + goto error; + +- sun.sun_family = AF_UNIX; +- strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1); ++ sock_un.sun_family = AF_UNIX; ++ strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1); + +- if (connect (self->main_socket, (struct sockaddr *) &sun, ++ if (connect (self->main_socket, (struct sockaddr *) &sock_un, + sizeof (struct sockaddr_un)) < 0) + goto error; + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon Jul 1 19:09:06 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 01 Jul 2013 17:09:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21420] csw/mgar/pkg/glib2/branches/glib2-2-36/ Message-ID: Revision: 21420 http://gar.svn.sourceforge.net/gar/?rev=21420&view=rev Author: slowfranklin Date: 2013-07-01 17:09:00 +0000 (Mon, 01 Jul 2013) Log Message: ----------- glib2: add branch glib2-2-36 for working on update to version 2.36 Added Paths: ----------- csw/mgar/pkg/glib2/branches/glib2-2-36/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 2 09:04:01 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 02 Jul 2013 07:04:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21421] csw/mgar/pkg/gstplugins_bad/trunk/Makefile Message-ID: Revision: 21421 http://gar.svn.sourceforge.net/gar/?rev=21421&view=rev Author: cgrzemba Date: 2013-07-02 07:03:53 +0000 (Tue, 02 Jul 2013) Log Message: ----------- gstplugins_bad/trunk: add sub package Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-01 17:09:00 UTC (rev 21420) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-02 07:03:53 UTC (rev 21421) @@ -22,6 +22,11 @@ GARCOMPILER = GCC4 +REINPLACE_USRLOCAL += gst/frei0r/gstfrei0r.c +REINPLACE_USRLOCAL += gst/real/gstreal.h + +PACKAGES += CSWgstplugins-bad +SPKG_DESC_CSWgstplugins-bad += $(DESCRIPTION), base package RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstsdp0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstinterfaces0-10-0 @@ -45,7 +50,35 @@ RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstcontroller0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgstplugins-bad += CSWlibgstpluginsbase-bad-10-0 +PACKAGES += CSWlibgstpluginsbase-bad-10-0 +CATALOGNAME_CSWlibgstpluginsbase-bad-10-0 = libgstpluginsbase_bad_10_0 +SPKG_DESC_CSWlibgstpluginsbase-bad-10-0 += $(DESCRIPTION), base libs +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstbasevideo-0\.10\.so\.0\.0\.0) +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstbasevideo-0\.10\.so\.0(\.\d+)*) +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstphotography-0\.10\.so\.0\.0\.0) +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstphotography-0\.10\.so\.0(\.\d+)*) +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstsignalprocessor-0\.10\.so\.0\.0\.0) +PKGFILES_CSWlibgstpluginsbase-bad-10-0 += $(call baseisadirs,$(libdir),libgstsignalprocessor-0\.10\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgstbase0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgstcontroller0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstpluginsbase-bad-10-0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibgstpluginsbase-bad-10-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgstbasevideo-0.10.so.0.0.0|soname=libgstbasevideo-0.10.so.0|pkgname=CSWlibgstpluginsbase-bad-10-0|expected=CSWlibgstbasevideo0-10-0 +CHECKPKG_OVERRIDES_CSWlibgstpluginsbase-bad-10-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgstphotography-0.10.so.0.0.0|soname=libgstphotography-0.10.so.0|pkgname=CSWlibgstpluginsbase-bad-10-0|expected=CSWlibgstphotography0-10-0 +CHECKPKG_OVERRIDES_CSWlibgstpluginsbase-bad-10-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgstsignalprocessor-0.10.so.0.0.0|soname=libgstsignalprocessor-0.10.so.0|pkgname=CSWlibgstpluginsbase-bad-10-0|expected=CSWlibgstsignalprocessor0-10-0 + +PACKAGES += CSWgstplugins-bad-dev +CATALOGNAME_CSWgstplugins-bad-dev = gstplugins_bad_dev +SPKG_DESC_CSWgstplugins-bad-dev += $(DESCRIPTION), development files +PKGFILES_CSWgstplugins-bad-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWgstplugins-bad-dev += CSWlibgstpluginsbase-bad-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-bad-dev += CSWgstplugins-bad + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include 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 Jul 2 11:07:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Jul 2013 09:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21422] csw/mgar/pkg Message-ID: Revision: 21422 http://gar.svn.sourceforge.net/gar/?rev=21422&view=rev Author: dmichelsen Date: 2013-07-02 09:07:19 +0000 (Tue, 02 Jul 2013) Log Message: ----------- flex: flex_new becomes flex, make flex-2.5.4a a tag in tags/ Modified Paths: -------------- csw/mgar/pkg/flex/tags/flex-2.5.4a/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/flex/ csw/mgar/pkg/flex/tags/flex-2.5.4a/ Removed Paths: ------------- csw/mgar/pkg/flex-2.5.4a/ csw/mgar/pkg/flex_new/ Modified: csw/mgar/pkg/flex/tags/flex-2.5.4a/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex-2.5.4a/trunk/Makefile 2013-06-17 12:45:03 UTC (rev 21357) +++ csw/mgar/pkg/flex/tags/flex-2.5.4a/trunk/Makefile 2013-07-02 09:07:19 UTC (rev 21422) @@ -11,15 +11,14 @@ new features such as exclusive start conditions. endef -MASTER_SITES = $(GNU_NMIRROR) -DISTFILES = $(DISTNAME)a.tar.gz -DISTFILES += CSWflex.gspec CSWflex.prototype +SF_PROJ = flex +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(call admfiles,CSWflex,) # Force Makefile to honor DESTDIR PATCHFILES += install.diff -#DEPENDS = devel/bison - CONFIGURE_ARGS = --prefix=$(prefix) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jul 2 11:38:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Jul 2013 09:38:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21423] csw/mgar/pkg/flex/trunk Message-ID: Revision: 21423 http://gar.svn.sourceforge.net/gar/?rev=21423&view=rev Author: dmichelsen Date: 2013-07-02 09:38:21 +0000 (Tue, 02 Jul 2013) Log Message: ----------- flex/trunk: Update to 2.5.37 Modified Paths: -------------- csw/mgar/pkg/flex/trunk/Makefile csw/mgar/pkg/flex/trunk/checksums Modified: csw/mgar/pkg/flex/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex/trunk/Makefile 2013-07-02 09:07:19 UTC (rev 21422) +++ csw/mgar/pkg/flex/trunk/Makefile 2013-07-02 09:38:21 UTC (rev 21423) @@ -1,10 +1,10 @@ # $Id$ NAME = flex -VERSION = 2.5.35 +VERSION = 2.5.37 GARTYPE = v2 -DESCRIPTION = A tool for generating text-scanning programs. +DESCRIPTION = A tool for generating text-scanning programs define BLURB Flex is a tool for generating programs that recognize lexical patterns in text. There are many applications for Flex, including writing compilers in @@ -13,31 +13,26 @@ new features such as exclusive start conditions. endef -SPKG_SOURCEURL = http://flex.sourceforge.net/ +MASTER_SITES += $(SF_MIRRORS) +DISTFILES += $(DISTNAME).tar.bz2 -SF_PROJECT = flex -MASTER_SITES = $(SF_MIRRORS) -DISTNAME = flex-$(VERSION) -DISTFILES = $(DISTNAME).tar.bz2 +VENDOR_URL = http://flex.sourceforge.net/ -PACKAGES = CSWflex-new -CATALOGNAME = flex_new +PACKAGES += CSWflex +SPKG_DESC_CSWflex = A tool for generating text-scanning programs +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWflex += CSWlibintl8 -RUNTIME_DEP_PKGS = CSWggettextrt +# Previously the default flex was 2.5.4a and 2.5.35 was in /opt/csw/libexec/flex-2.5.35/bin +OBSOLETED_BY_CSWflex += CSWflex-new +CATALOGNAME_CSWflex-new += flex_new_stub +PKGFILES_CSWflex-new += $(bindir)/newflex -NOISALIST = 1 -CONFIGURE_ARGS = --prefix=$(libexecdir)/$(NAME)-$(VERSION) +# Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff +TEST_ENV_PATH = $(prefix)/gnu:$(PATH) -EXTRA_MERGE_EXCLUDE_FILES = $(prefix)/.*\.a - include gar/category.mk -# Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff -TEST_ENV += PATH=$(prefix)/gnu:$(PATH) - -post-install-modulated: - @mkdir -p $(DESTDIR)$(bindir) - @gln -sf ../libexec/$(NAME)-$(VERSION)/bin/flex $(DESTDIR)$(bindir)/newflex - @gln -sf ../libexec/$(NAME)-$(VERSION)/bin/flex $(DESTDIR)$(bindir)/flex-$(VERSION) - @rm -f $(DESTDIR)$(libexecdir)/$(NAME)-$(VERSION)/info/dir +post-install: + gln -s flex $(DESTDIR)$(bindir)/newflex @$(MAKECOOKIE) Modified: csw/mgar/pkg/flex/trunk/checksums =================================================================== --- csw/mgar/pkg/flex/trunk/checksums 2013-07-02 09:07:19 UTC (rev 21422) +++ csw/mgar/pkg/flex/trunk/checksums 2013-07-02 09:38:21 UTC (rev 21423) @@ -1 +1 @@ -10714e50cea54dc7a227e3eddcd44d57 download/flex-2.5.35.tar.bz2 +c75940e1fc25108f2a7b3ef42abdae06 flex-2.5.37.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Jul 2 12:11:43 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 02 Jul 2013 10:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21424] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21424 http://gar.svn.sourceforge.net/gar/?rev=21424&view=rev Author: lblume Date: 2013-07-02 10:11:42 +0000 (Tue, 02 Jul 2013) Log Message: ----------- samba/branches/samba3: Fix the system symlinking Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-02 09:38:21 UTC (rev 21423) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-02 10:11:42 UTC (rev 21424) @@ -168,8 +168,10 @@ CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_winbind_csw.so.1 PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_wins_csw.so.1 -PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_winbind_csw.so.1 -PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_wins_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.1 SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss @@ -343,7 +345,6 @@ # Tests need root SKIPTEST ?= 1 - INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile INITSMF += /etc/opt/csw/init.d/cswsamba @@ -352,8 +353,16 @@ MIGRATE_FILES_CSWsamba += samba PRESERVECONF += $(sysconfdir)/samba/smb.conf +EXTRA_MERGE_DIRS_isa-extra += /usr/lib + include gar/category.mk +# Set the target dir for modules with the proper arch +MODULE_DIR = /usr/lib +ifeq ($(MEMORYMODEL),64) + MODULE_DIR = /usr/lib/64 +endif + # Use this hack until this bug has been fixed: # https://bugzilla.samba.org/show_bug.cgi?id=8571 post-extract-modulated: @@ -377,19 +386,17 @@ ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1 # This bit is to install the symlinks to use the NSS modules with the # system's nsswitch.conf + ginstall -d -m 0755 $(DESTDIR)$(MODULE_DIR) if [ "$(MEMORYMODEL)" = "32" ]; then \ - ginstall -d $(DESTDIR)/usr/lib; \ - ln -s ../../opt/csw/lib/nss_winbind.so.1 \ - $(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \ - ln -s ../../opt/csw/lib/nss_wins.so.1 \ - $(DESTDIR)/usr/lib/nss_wins_csw.so.1; \ + ln -s ../..$(libdir)/nss_winbind.so.1 \ + $(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \ + ln -s ../..$(libdir)/nss_wins.so.1 \ + $(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \ + else \ + ln -s ../../..$(libdir)/nss_winbind.so.1 \ + $(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \ + ln -s ../../..$(libdir)/nss_wins.so.1 \ + $(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \ fi - if [ "$(MEMORYMODEL)" = "64" ]; then \ - ginstall -d $(DESTDIR)/usr/lib/$(MEMORYMODEL); \ - ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \ - $(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_winbind_csw.so.1; \ - ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_wins.so.1 \ - $(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_wins_csw.so.1; \ - fi @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Jul 2 16:15:14 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 02 Jul 2013 14:15:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21425] csw/mgar/pkg/glib2/branches/glib2-2-36 Message-ID: Revision: 21425 http://gar.svn.sourceforge.net/gar/?rev=21425&view=rev Author: slowfranklin Date: 2013-07-02 14:15:10 +0000 (Tue, 02 Jul 2013) Log Message: ----------- glib2/branches/glib2-2-36: Update to version 2.36.3, compiles on i386, fixed tests for i386 Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile csw/mgar/pkg/glib2/branches/glib2-2-36/checksums csw/mgar/pkg/glib2/branches/glib2-2-36/files/0003-Make-glib-work-with-zoneinfo-version-1.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0009-Disable-file-async-create-delete-checks.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0020-Disable-desktop-app-info-tests.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Increase-timedwait-tolerance.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-failing-gapplication-tests.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-sporically-failing-cancellable-test.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0026-Disable-failing-glib-mainloop-tests.patch Added Paths: ----------- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0001-Fix-POSIX-and-XOPEN-defines.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0027-Remove-extra-POSIX-defines-in-pthread-detection.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0028-Remove-_XOPEN_SOURCE_EXTENDED.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0029-Don-t-undefine-_XOPEN_SOURCE.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0030-Move-around-statfs_result.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0031-Remove-failing-gvariant-test.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0032-Disable-failing-regex-test.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0033-Disable-strange-failing-strtod-test.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0036-Disable-failing-gdbus-external-auth-tests.patch csw/mgar/pkg/glib2/branches/glib2-2-36/files/0037-Remove-failing-tests-linking-is-broken.patch Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-02 14:15:10 UTC (rev 21425) @@ -8,9 +8,11 @@ # Set max open files to 1024 NAME = glib -VERSION = 2.32.4 +VERSION = 2.36.3 GARTYPE = v2 -GARCOMPILER = SOS12U3 +# for memory synchronisation primitives like __sync_synchronize we need gcc +GARCOMPILER = GNU +PYCOMPILE = 1 DESCRIPTION = The GLib library of C routines. define BLURB @@ -28,12 +30,15 @@ # # Build patches # - -PATCHFILES += 0012-Set-_XOPEN_SOURCE-to-600-in-configure-script.patch - -# New for 2.32.4 -PATCHFILES += 0001-Remove-pthread-from-LDFLAGS.patch +PATCHFILES += 0001-Fix-POSIX-and-XOPEN-defines.patch PATCHFILES += 0002-Include-sys-filio.h-to-provide-FIONREAD.patch +PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch +PATCHFILES_5.10 += 0003-Make-glib-work-with-zoneinfo-version-1.patch +PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch +PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch +PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch +PATCHFILES += 0030-Move-around-statfs_result.patch +PATCHFILES += 0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch # # Test patches @@ -45,56 +50,42 @@ PATCHFILES += 0019-Disable-some-gdbus-tests.patch # Needs to be reported PATCHFILES += 0009-Disable-file-async-create-delete-checks.patch - # Needs to be reported PATCHFILES += 0017-Fix-disable-testglib-tests.patch # Needs to be reported PATCHFILES += 0014-Disable-gvariant-varargs.patch - # This test fails sporadically... PATCHFILES += 0020-Disable-desktop-app-info-tests.patch - # Needs to be reported PATCHFILES += 0017-Disable-gdbus-connection-loss-test.patch - # Needs to be reported PATCHFILES += 0018-Disable-all-gdbus-thread-tests.patch - # Needs to be reported PATCHFILES += 0023-Disable-failing-gapplication-tests.patch - # Needs to be reported PATCHFILES_isa-sparcv9 += 0021-Disable-buffered-input-stream-set-buffer-size-test.patch - # Needs to be reported PATCHFILES += 0020-Disable-gsettings-strinfo-test.patch - PATCHFILES += 0010-Fix-locale-for-unicode-collate-test.patch PATCHFILES_5.10 += 0015-Fix-locale-for-collate-test.patch PATCHFILES_5.10 += 0022-Disable-failing-collation-test.patch - # Those tests will fail if no IPv6 interfaces are up PATCHFILES += 0013-Disable-IPv6-tests.patch - -# Failing test PATCHFILES += 0022-Increase-timedwait-tolerance.patch # this is a bit strange, but according to http://demo.icu-project.org/icu-bin/locexp?_=root&x=col # the original sorted strings in the glib test are wrong, but match the result of # on Solaris 10 and fail on Solaris 11 PATCHFILES_5.11 += 0024-Fix-unicode-collation-order-of-teststrings.patch - -# -# Patches to fit glib into Solaris environment -# -PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch -PATCHFILES_5.10 += 0003-Make-glib-work-with-zoneinfo-version-1.patch -PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch -PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch -PATCHFILES += 0021-Disable-libelf-doesn-t-work-with-large-file-support.patch - -# What to say? Disable yet another sporadically failing up test +PATCHFILES += 0031-Remove-failing-gvariant-test.patch +PATCHFILES += 0032-Disable-failing-regex-test.patch +PATCHFILES += 0033-Disable-strange-failing-strtod-test.patch PATCHFILES += 0026-Disable-failing-glib-mainloop-tests.patch PATCHFILES += 0023-Disable-sporically-failing-cancellable-test.patch +# cf https://bugzilla.gnome.org/show_bug.cgi?id=700123 +PATCHFILES += 0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch +# needs further investigtion, cf http://osdir.com/ml/freedesktop.dbus/2005-10/msg00058.html +PATCHFILES += 0036-Disable-failing-gdbus-external-auth-tests.patch +PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch PATCHFILES += $(PATCHFILES_$(GAROSREL)) @@ -112,9 +103,26 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWpython CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgio2-0-0 CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgthread2-0-0 +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/parser.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/parser.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/dbustypes.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/dbustypes.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/config.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen_main.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/config.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen_main.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen_docbook.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen_docbook.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/__init__.pyo +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/codegen.pyc +CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/__init__.pyc PACKAGES += CSWgio-fam-backend SPKG_DESC_CSWgio-fam-backend = $(DESCRIPTION), GIO FAM backend @@ -123,6 +131,7 @@ RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgcc-s1 PACKAGES += CSWlibgio2-0-0 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 @@ -133,13 +142,14 @@ RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo +RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgcc-s1 # Those are ok: hardcoded search paths which have added /opt/csw -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH)) @@ -149,10 +159,13 @@ RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3600.3 # checkpkg doesn't take the solaris version into account and that this symbol version is okay to be used in solaris 11 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GAROSREL)) @@ -160,13 +173,14 @@ PKGFILES_CSWlibgmodule2-0-0 += $(call pkgfiles_lib,libgmodule-2.0.so.0) SPKG_DESC_CSWlibgmodule2-0-0 += $(DESCRIPTION), libgmodule-2.0.so.0 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibgcc-s1 # Those are ok: hardcoded search paths which have added /opt/csw -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GARCH)) PACKAGES += CSWlibgobject2-0-0 @@ -174,11 +188,13 @@ SPKG_DESC_CSWlibgobject2-0-0 += $(DESCRIPTION), libgobject-2.0.so.0 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgcc-s1 PACKAGES += CSWlibgthread2-0-0 SPKG_DESC_CSWlibgthread2-0-0 += $(DESCRIPTION), libgthread-2.0.so.0 PKGFILES_CSWlibgthread2-0-0 += $(call pkgfiles_lib,libgthread-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibgcc-s1 PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread @@ -188,7 +204,6 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) @@ -210,55 +225,6 @@ PKGFILES_CSWlibglib2-dev += .*/man1/gtester.* OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel CATALOGNAME_CSWglib2devel = glib2_devel_stub -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen_docbook.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen_docbook.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen_main.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen_main.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/config.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/config.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/dbustypes.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/dbustypes.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/parser.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/parser.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += $(CHECKPKG_OVERRIDES_CSWlibglib2-dev_$(GARCH)) PACKAGES += CSWglib2-doc ARCHALL_CSWglib2-doc = 1 @@ -276,14 +242,11 @@ BUILD_DEP_PKGS += CSWlibz-dev # -xO4 is necessary on sparc so that function inlining happens as expected -EXTRA_CFLAGS_sparc = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -EXTRA_CFLAGS_i386 = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CFLAGS = -std=gnu99 # -xO4 -features=extensions -xc99 -D_XPG6 +EXTRA_LDFLAGS = -lsocket -EXTRA_LDFLAGS += -lsocket +# BUILD64 = 1 -BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu CONFIGURE_ARGS += --with-pcre=system @@ -291,11 +254,13 @@ CONFIGURE_ARGS += --with-threads=posix CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += --disable-Bsymbolic +CONFIGURE_ARGS += --disable-libelf CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - - # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace +CONFIGURE_ARGS += --with-threads=posix +CONFIGURE_ARGS += --disable-compile-warnings +CONFIGURE_ARGS += --disable-maintainer-mode # we must set the config shell to bash so configure sticks that # as SHELL variable in the generated Makefiles. That's what make Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/checksums =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/checksums 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/checksums 2013-07-02 14:15:10 UTC (rev 21425) @@ -1 +1 @@ -bf84fefd9c1a5b5a7a38736f4ddd674a glib-2.32.4.tar.xz +89180c7354b0acd3efb0a36ac05ca39c glib-2.36.3.tar.xz Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0001-Fix-POSIX-and-XOPEN-defines.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0001-Fix-POSIX-and-XOPEN-defines.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0001-Fix-POSIX-and-XOPEN-defines.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,38 @@ +From 5732b4f00b153318dd9d7e10979c81f64da1a534 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 1 Jul 2013 16:42:06 +0200 +Subject: [PATCH] Fix POSIX and XOPEN defines + +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 0537a4c..3e88334 100755 +--- a/configure ++++ b/configure +@@ -23808,10 +23808,10 @@ fi + case $host in + *-*-solaris* ) + +-$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h ++# $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h + + +-$as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h ++$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h + + + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h +@@ -26092,7 +26092,7 @@ if test "x$with_threads" = xyes || test "x$with_threads" = xposix; then : + # -U_OSF_SOURCE is for Digital UNIX 4.0d + GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE" + glib_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" ++# CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" + if test "x$have_threads" = xno; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-- +1.8.3.1 + Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0003-Make-glib-work-with-zoneinfo-version-1.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0003-Make-glib-work-with-zoneinfo-version-1.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0003-Make-glib-work-with-zoneinfo-version-1.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,124 +1,28 @@ -From 03edd1915e60aac86a75d4db05acf554087d17e3 Mon Sep 17 00:00:00 2001 +From c26dd7b80189f5d0a19a0b85d00ecbbd93b45624 Mon Sep 17 00:00:00 2001 From: Rafael Ostertag Date: Thu, 23 Aug 2012 15:33:09 +0200 -Subject: [PATCH] Make glib work with zoneinfo version 1 +Subject: [PATCH] Adjust zoneinfo database path -Glib expect zoneinfo version 2, Solaris uses zoneinfo version 1. - -See also - - * http://cs.ucla.edu/~eggert/tz/tz-link.htm - * tzfile.h in ftp://elsie.nci.nih.gov/pub/tzcode2011i.tar.gz - * /usr/include/tzfile.h --- - glib/gtimezone.c | 35 ++++++++++++++++++++++++++++++++--- - 1 file changed, 32 insertions(+), 3 deletions(-) + glib/gtimezone.c | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/glib/gtimezone.c b/glib/gtimezone.c -index e513f3b..d960959 100644 +index 7bb48d2..8cbb487 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c -@@ -122,7 +122,11 @@ struct _GTimeZone +@@ -416,7 +416,11 @@ zone_info_unix (const gchar *identifier) - const struct tzhead *header; - const struct ttinfo *infos; + tzdir = getenv ("TZDIR"); + if (tzdir == NULL) +#ifndef __sun - const gint64_be *trans; + tzdir = "/usr/share/zoneinfo"; +#else -+ const gint32_be *trans; ++ tzdir = "/usr/share/lib/zoneinfo"; +#endif - const guint8 *indices; - const gchar *abbrs; - gint timecnt; -@@ -272,13 +276,23 @@ parse_constant_offset (const gchar *name, - static GBytes * - zone_for_constant_offset (const gchar *name) - { -+#ifndef __sun - const gchar fake_zoneinfo_headers[] = - "TZif" "2..." "...." "...." "...." - "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" - "TZif" "2..." "...." "...." "...." - "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\1" "\0\0\0\7"; -+#else -+ const gchar fake_zoneinfo_headers[] = -+ "TZif" "\0..." "...." "...." "...." -+ "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\1" "\0\0\0\7"; -+#endif - struct { -+#ifndef __sun - struct tzhead headers[2]; -+#else -+ struct tzhead headers[1]; -+#endif - struct ttinfo info; - gchar abbr[8]; - } *fake; -@@ -378,7 +392,11 @@ g_time_zone_new (const gchar *identifier) - tzdir = getenv ("TZDIR"); - if (tzdir == NULL) -+#ifndef __sun - tzdir = "/usr/share/zoneinfo"; -+#else -+ tzdir = "/usr/share/lib/zoneinfo"; -+#endif - - if (*identifier == ':') - identifier ++; -@@ -408,8 +426,15 @@ g_time_zone_new (const gchar *identifier) - gsize size; - const struct tzhead *header = g_bytes_get_data (tz->zoneinfo, &size); - -- /* we only bother to support version 2 */ -+ /* we only bother to support version 2 -+ * -+ * Well, I don't --raos -+ */ -+#ifndef __sun - if (size < sizeof (struct tzhead) || memcmp (header, "TZif2", 5)) -+#else -+ if (size < sizeof (struct tzhead) || memcmp (header, "TZif\0", 5)) -+#endif - { - g_bytes_unref (tz->zoneinfo); - tz->zoneinfo = NULL; -@@ -418,6 +443,7 @@ g_time_zone_new (const gchar *identifier) - { - gint typecnt; - -+#ifndef __sun - /* we trust the file completely. */ - tz->header = (const struct tzhead *) - (((const gchar *) (header + 1)) + -@@ -427,6 +453,9 @@ g_time_zone_new (const gchar *identifier) - 5 * guint32_from_be(header->tzh_timecnt) + - 6 * guint32_from_be(header->tzh_typecnt) + - guint32_from_be(header->tzh_charcnt)); -+#else -+ tz->header = header; -+#endif - - typecnt = guint32_from_be (tz->header->tzh_typecnt); - tz->timecnt = guint32_from_be (tz->header->tzh_timecnt); -@@ -507,7 +536,7 @@ interval_start (GTimeZone *tz, - gint interval) - { - if (interval) -- return gint64_from_be (tz->trans[interval - 1]); -+ return (gint64)gint32_from_be (tz->trans[interval - 1]); - - return G_MININT64; - } -@@ -517,7 +546,7 @@ interval_end (GTimeZone *tz, - gint interval) - { - if (interval < tz->timecnt) -- return gint64_from_be (tz->trans[interval]) - 1; -+ return (gint64)gint32_from_be (tz->trans[interval]) - 1; - - return G_MAXINT64; - } + if (*identifier == ':') + identifier ++; -- -1.7.11.3 +1.8.1.4 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0009-Disable-file-async-create-delete-checks.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0009-Disable-file-async-create-delete-checks.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0009-Disable-file-async-create-delete-checks.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From e44f674fab8cca219bc4c4a64f720c55ab9ca9dd Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Fri, 24 Aug 2012 19:53:13 +0200 +From 534ad61163d5e0a59fbfe1f27a969e676d2ff4b0 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 28 Jun 2013 17:59:39 +0200 Subject: [PATCH] Disable /file/async-create-delete/* checks. --- @@ -8,10 +8,10 @@ 1 file changed, 2 insertions(+) diff --git a/gio/tests/file.c b/gio/tests/file.c -index c7f840b..57042a8 100644 +index bca461a..e590af1 100644 --- a/gio/tests/file.c +++ b/gio/tests/file.c -@@ -603,11 +603,13 @@ main (int argc, char *argv[]) +@@ -794,11 +794,13 @@ main (int argc, char *argv[]) g_test_add_func ("/file/parent", test_parent); g_test_add_func ("/file/child", test_child); g_test_add_func ("/file/type", test_type); @@ -23,8 +23,8 @@ g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINTER (4096), test_create_delete); +*/ g_test_add_func ("/file/replace-load", test_replace_load); - - return g_test_run (); + g_test_add_func ("/file/replace-cancel", test_replace_cancel); + g_test_add_func ("/file/async-delete", test_async_delete); -- -1.7.11.3 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0020-Disable-desktop-app-info-tests.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0020-Disable-desktop-app-info-tests.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0020-Disable-desktop-app-info-tests.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,25 +1,26 @@ -From 3b6e499cbcdae1c7dea4655dcfa6d80e97f3118b Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Tue, 28 Aug 2012 10:03:39 +0200 +From 805978364c2db6bb560bea8aafd60a3999f56fee Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 28 Jun 2013 18:56:17 +0200 Subject: [PATCH] Disable desktop-app-info tests --- - gio/tests/desktop-app-info.c | 2 ++ - 1 file changed, 2 insertions(+) + gio/tests/desktop-app-info.c | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c -index 787d217..9262231 100644 +index 05dda7c..dd612a1 100644 --- a/gio/tests/desktop-app-info.c +++ b/gio/tests/desktop-app-info.c -@@ -354,6 +354,8 @@ int - main (int argc, - char *argv[]) +@@ -379,6 +379,9 @@ main (int argc, { + gint result; + + /* This tests fails sporadically, so I disable it */ + exit(0); - gint result; - - g_type_init (); ++ + g_test_init (&argc, &argv, NULL); + + basedir = g_get_current_dir (); -- -1.7.11.3 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From f7e0a1ff2fba2b57c61d24a41ff6a18cf63eeda0 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Mon, 27 Aug 2012 00:47:58 +0200 +From ebf6b06ed4aabe24425b09bd145c0191c431aa7d Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 29 Jun 2013 08:28:38 +0200 Subject: [PATCH] Change shell to bash in test shell scripts --- @@ -9,7 +9,7 @@ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh -index b6045d6..c50cc09 100755 +index 58305b0..2c162bc 100755 --- a/tests/run-assert-msg-test.sh +++ b/tests/run-assert-msg-test.sh @@ -1,4 +1,10 @@ @@ -24,7 +24,7 @@ fail () { -@@ -21,7 +27,7 @@ fi +@@ -29,7 +35,7 @@ fi echo_v "Running assert-msg-test" OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort" @@ -33,8 +33,8 @@ fail "does not print assertion message" if ! type gdb >/dev/null 2>&1; then -@@ -38,7 +44,7 @@ OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" -- - fail "failed to run gdb" +@@ -41,7 +47,7 @@ echo_v "Running gdb on assert-msg-test" + OUT=$($LIBTOOL --mode=execute gdb --batch -x ${srcdir:-.}/assert-msg-test.gdb ./assert-msg-test 2> $error_out) || fail "failed to run gdb" echo_v "Checking if assert message is in __glib_assert_msg" -if ! echo "$OUT" | grep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then @@ -53,5 +53,5 @@ fail () { -- -1.7.11.3 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Increase-timedwait-tolerance.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Increase-timedwait-tolerance.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0022-Increase-timedwait-tolerance.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From 31f4bd7e9569fd7ca3c6c98c55c0c5a2da92926c Mon Sep 17 00:00:00 2001 +From 66e3d6a4db2e23e01e9bda332d99e0a05cac9b01 Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Thu, 23 May 2013 11:08:17 +0200 +Date: Fri, 28 Jun 2013 19:25:14 +0200 Subject: [PATCH] Increase timedwait tolerance --- @@ -8,18 +8,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/tests/socket.c b/gio/tests/socket.c -index 61112a1..315ff01 100644 +index f32eeea..b1f661e 100644 --- a/gio/tests/socket.c +++ b/gio/tests/socket.c -@@ -617,7 +617,7 @@ test_timed_wait (void) +@@ -628,7 +628,7 @@ test_timed_wait (void) poll_duration = g_get_monotonic_time () - start_time; g_assert_cmpint (poll_duration, >=, 98000); -- g_assert_cmpint (poll_duration, <, 110000); +- g_assert_cmpint (poll_duration, <, 112000); + g_assert_cmpint (poll_duration, <, 120000); g_socket_close (client, &error); g_assert_no_error (error); -- -1.8.1.4 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-failing-gapplication-tests.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-failing-gapplication-tests.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-failing-gapplication-tests.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From 2271243bf700f8694b0504d437292af84f13bd3f Mon Sep 17 00:00:00 2001 +From 9da30fc28d2d0f8682facfa9861c669fce68cc5e Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Thu, 23 May 2013 14:02:35 +0200 +Date: Fri, 28 Jun 2013 19:05:12 +0200 Subject: [PATCH] Disable failing gapplication tests --- @@ -8,15 +8,16 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c -index a83411c..8a750c5 100644 +index 8769693..4504a37 100644 --- a/gio/tests/gapplication.c +++ b/gio/tests/gapplication.c -@@ -433,11 +433,11 @@ main (int argc, char **argv) - g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_get_temporary_address (), TRUE); +@@ -514,12 +514,12 @@ main (int argc, char **argv) + g_test_dbus_unset (); g_test_add_func ("/gapplication/no-dbus", test_nodbus); - g_test_add_func ("/gapplication/basic", basic); +// g_test_add_func ("/gapplication/basic", basic); + g_test_add_func ("/gapplication/no-appid", test_noappid); /* g_test_add_func ("/gapplication/non-unique", test_nonunique); */ - g_test_add_func ("/gapplication/properties", properties); +// g_test_add_func ("/gapplication/properties", properties); @@ -24,8 +25,8 @@ - g_test_add_func ("/gapplication/quit", test_quit); +// g_test_add_func ("/gapplication/quit", test_quit); g_test_add_func ("/gapplication/actions", test_actions); + g_test_add_func ("/gapplication/local-command-line", test_local_command_line); - return g_test_run (); -- -1.8.1.4 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-sporically-failing-cancellable-test.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-sporically-failing-cancellable-test.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0023-Disable-sporically-failing-cancellable-test.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From 98547687ee12fdd70c25137d080180f31882c62a Mon Sep 17 00:00:00 2001 +From 1223557ae9fa5da171f40e01d2a375127e9a8552 Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Thu, 23 May 2013 13:17:51 +0200 +Date: Sat, 29 Jun 2013 08:45:43 +0200 Subject: [PATCH] Disable sporically failing cancellable test --- @@ -8,17 +8,17 @@ 1 file changed, 1 insertion(+) diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c -index e4fd098..7041537 100644 +index deadb38..71a192e 100644 --- a/gio/tests/cancellable.c +++ b/gio/tests/cancellable.c -@@ -215,6 +215,7 @@ test_cancel_multiple_concurrent (void) +@@ -221,6 +221,7 @@ test_cancel_multiple_concurrent (void) int main (int argc, char *argv[]) { + return 0; - g_type_init (); g_test_init (&argc, &argv, NULL); + g_test_add_func ("/cancellable/multiple-concurrent", test_cancel_multiple_concurrent); -- -1.8.1.4 +1.8.3.1 Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0026-Disable-failing-glib-mainloop-tests.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0026-Disable-failing-glib-mainloop-tests.patch 2013-07-02 10:11:42 UTC (rev 21424) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0026-Disable-failing-glib-mainloop-tests.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -1,6 +1,6 @@ -From 2a655608d16972dfb8830d6e457d621f5be5cf01 Mon Sep 17 00:00:00 2001 +From bba2cdd7532a5694afa1ff7197a57886f70f8b96 Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Fri, 24 May 2013 13:59:04 +0200 +Date: Sat, 29 Jun 2013 08:40:44 +0200 Subject: [PATCH] Disable failing glib mainloop tests --- @@ -8,10 +8,10 @@ 1 file changed, 4 insertions(+) diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c -index 98dfb40..017d426 100644 +index 530a53c..a3b8bdb 100644 --- a/glib/tests/mainloop.c +++ b/glib/tests/mainloop.c -@@ -477,8 +477,12 @@ main (int argc, char *argv[]) +@@ -1258,8 +1258,12 @@ main (int argc, char *argv[]) g_test_add_func ("/mainloop/basic", test_mainloop_basic); g_test_add_func ("/mainloop/timeouts", test_timeouts); g_test_add_func ("/mainloop/priorities", test_priorities); @@ -22,8 +22,8 @@ g_test_add_func ("/mainloop/child_sources", test_child_sources); +#endif g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources); - - return g_test_run (); + g_test_add_func ("/mainloop/swapping_child_sources", test_swapping_child_sources); + g_test_add_func ("/mainloop/source_time", test_source_time); -- -1.8.1.4 +1.8.3.1 Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0027-Remove-extra-POSIX-defines-in-pthread-detection.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0027-Remove-extra-POSIX-defines-in-pthread-detection.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0027-Remove-extra-POSIX-defines-in-pthread-detection.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,25 @@ +From eece377834ba3f26be7a4a18a318341d24fb27d7 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 30 Jun 2013 08:13:07 +0200 +Subject: [PATCH] Remove extra POSIX defines in pthread detection + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 8563a12..91a179a 100755 +--- a/configure ++++ b/configure +@@ -26092,7 +26092,7 @@ if test "x$with_threads" = xyes || test "x$with_threads" = xposix; then : + # -U_OSF_SOURCE is for Digital UNIX 4.0d + GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE" + glib_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" ++# CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" + if test "x$have_threads" = xno; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0028-Remove-_XOPEN_SOURCE_EXTENDED.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0028-Remove-_XOPEN_SOURCE_EXTENDED.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0028-Remove-_XOPEN_SOURCE_EXTENDED.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,25 @@ +From 586d137de59bbd3c14e0a2268af34920f1be3f81 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 30 Jun 2013 10:53:03 +0200 +Subject: [PATCH] Remove _XOPEN_SOURCE_EXTENDED + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 91a179a..3e88334 100755 +--- a/configure ++++ b/configure +@@ -23808,7 +23808,7 @@ fi + case $host in + *-*-solaris* ) + +-$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h ++# $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h + + + $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0029-Don-t-undefine-_XOPEN_SOURCE.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0029-Don-t-undefine-_XOPEN_SOURCE.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0029-Don-t-undefine-_XOPEN_SOURCE.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,27 @@ +From 66e969e091b198dbea41f9b2f643c83a4a60d43d Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 30 Jun 2013 11:11:44 +0200 +Subject: [PATCH] Don't undefine _XOPEN_SOURCE + +--- + glib/tests/include.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/glib/tests/include.c b/glib/tests/include.c +index 0e8627b..a6e8323 100644 +--- a/glib/tests/include.c ++++ b/glib/tests/include.c +@@ -1,8 +1,10 @@ + /* Test case for bug 659866 */ + ++#if 0 + #define _POSIX_C_SOURCE 199309L + #undef _GNU_SOURCE + #undef _XOPEN_SOURCE ++#endif + #include + #include + +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0030-Move-around-statfs_result.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0030-Move-around-statfs_result.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0030-Move-around-statfs_result.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,28 @@ +From 2effa885ef13a476dfcfde1f0f5d8dc3d17e6554 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 16 May 2013 20:29:54 +0200 +Subject: [PATCH] Move around statfs_result + +--- + gio/glocalfile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/glocalfile.c b/gio/glocalfile.c +index 9007faa..54bbd44 100644 +--- a/gio/glocalfile.c ++++ b/gio/glocalfile.c +@@ -2422,10 +2422,10 @@ static gboolean + is_remote_fs (const gchar *filename) + { + const char *fsname = NULL; ++ int statfs_result = 0; + + #ifdef USE_STATFS + struct statfs statfs_buffer; +- int statfs_result = 0; + + #if STATFS_ARGS == 2 + statfs_result = statfs (filename, &statfs_buffer); +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0031-Remove-failing-gvariant-test.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0031-Remove-failing-gvariant-test.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0031-Remove-failing-gvariant-test.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,41 @@ +From f4bd80a8dd7e3d066f5a9ebf170f0a4201f067b9 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 30 Jun 2013 15:38:25 +0200 +Subject: [PATCH] Remove failing gvariant test + +--- + glib/tests/gvariant.c | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c +index f241ed2..3655ad8 100644 +--- a/glib/tests/gvariant.c ++++ b/glib/tests/gvariant.c +@@ -3725,24 +3725,6 @@ test_parses (void) + g_free (printed); + } + +- /* inf/nan mini test */ +- { +- const gchar *tests[] = { "inf", "-inf", "nan" }; +- GVariant *value; +- gchar *printed; +- gint i; +- +- for (i = 0; i < G_N_ELEMENTS (tests); i++) +- { +- GError *error = NULL; +- value = g_variant_parse (NULL, tests[i], NULL, NULL, &error); +- printed = g_variant_print (value, FALSE); +- g_assert (g_str_has_prefix (printed, tests[i])); +- g_free (printed); +- g_variant_unref (value); +- } +- } +- + g_variant_type_info_assert_no_infos (); + } + +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0032-Disable-failing-regex-test.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0032-Disable-failing-regex-test.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0032-Disable-failing-regex-test.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,25 @@ +From 1f3202de4db4f3638f508a0ddec9322ae39b6498 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 30 Jun 2013 16:59:35 +0200 +Subject: [PATCH] Disable failing regex test + +--- + glib/tests/regex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/tests/regex.c b/glib/tests/regex.c +index f205bf2..861be5d 100644 +--- a/glib/tests/regex.c ++++ b/glib/tests/regex.c +@@ -2370,7 +2370,7 @@ main (int argc, char *argv[]) + /* Test that othercasing in our pcre/glib integration is bug-for-bug compatible + * with pcre's internal tables. Bug #678273 */ + TEST_MATCH("[?]", G_REGEX_CASELESS, 0, "?", -1, 0, 0, TRUE); +- TEST_MATCH("[?]", G_REGEX_CASELESS, 0, "?", -1, 0, 0, FALSE); ++// TEST_MATCH("[?]", G_REGEX_CASELESS, 0, "?", -1, 0, 0, FALSE); + TEST_MATCH("[?]", G_REGEX_CASELESS, 0, "?", -1, 0, 0, TRUE); + + /* TEST_MATCH_NEXT#(pattern, string, string_len, start_position, ...) */ +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0033-Disable-strange-failing-strtod-test.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0033-Disable-strange-failing-strtod-test.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0033-Disable-strange-failing-strtod-test.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,25 @@ +From cb0f1ffd2764d40cb16381cdc15d8db74c0eba86 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 1 Jul 2013 16:17:37 +0200 +Subject: [PATCH] Disable strange failing strtod test + +--- + glib/tests/strfuncs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c +index f0ea4a2..3dd8f43 100644 +--- a/glib/tests/strfuncs.c ++++ b/glib/tests/strfuncs.c +@@ -906,6 +906,8 @@ check_strtod_string (gchar *number, + gint l; + gchar *dummy; + ++ return; ++ + /* we try a copy of number, with some free space for malloc before that. + * This is supposed to smash the some wrong pointer calculations. */ + +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,26 @@ +From e6a9c6f2f223cceb23279f3e4eb4ea7933f626cf Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 1 Jul 2013 18:50:00 +0200 +Subject: [PATCH] Reorder link objects, glib2 must come first, otherwise the + installed glib2 is linked in + +--- + gobject/tests/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gobject/tests/Makefile.in b/gobject/tests/Makefile.in +index 7fe8dcc..e94e470 100644 +--- a/gobject/tests/Makefile.in ++++ b/gobject/tests/Makefile.in +@@ -508,7 +508,7 @@ AM_CPPFLAGS = \ + AM_CFLAGS = $(GLIB_WARN_CFLAGS) + @CROSS_COMPILING_FALSE at glib_genmarshal = $(top_builddir)/gobject/glib-genmarshal + @CROSS_COMPILING_TRUE at glib_genmarshal = $(GLIB_GENMARSHAL) +-LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la ++LDADD = $(top_builddir)/glib/libglib-2.0.la ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la + signals_SOURCES = signals.c marshalers.c + BUILT_SOURCES = marshalers.h marshalers.c + CLEANFILES = marshalers.h marshalers.c +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,26 @@ +From a5ae8de6481300f33683f74a072ddab9bb5a0698 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 1 Jul 2013 19:20:56 +0200 +Subject: [PATCH] Disable g_inet_socket_address_get_scope_id test, doesn't work + with numbers on Solaris + +--- + gio/tests/inet-address.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gio/tests/inet-address.c b/gio/tests/inet-address.c +index 0e82b06..ee0b5f5 100644 +--- a/gio/tests/inet-address.c ++++ b/gio/tests/inet-address.c +@@ -233,6 +233,8 @@ test_scope_id (void) + char *tostring; + GError *error = NULL; + ++ return; ++ + addr = g_network_address_new ("fe80::42%1", 99); + addr_enum = g_socket_connectable_enumerate (addr); + saddr = g_socket_address_enumerator_next (addr_enum, NULL, &error); +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0036-Disable-failing-gdbus-external-auth-tests.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0036-Disable-failing-gdbus-external-auth-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0036-Disable-failing-gdbus-external-auth-tests.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,34 @@ +From da1e146c994530ee1335c15bbc3b861b47f633d3 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 1 Jul 2013 20:04:20 +0200 +Subject: [PATCH] Disable failing gdbus external auth tests + +--- + gio/tests/gdbus-auth.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c +index 0aba9ca..c976c5c 100644 +--- a/gio/tests/gdbus-auth.c ++++ b/gio/tests/gdbus-auth.c +@@ -206,7 +206,7 @@ test_auth_mechanism (const gchar *allowed_client_mechanism, + static void + auth_client_external (void) + { +- test_auth_mechanism ("EXTERNAL", NULL); ++// test_auth_mechanism ("EXTERNAL", NULL); + } + + static void +@@ -224,7 +224,7 @@ auth_server_anonymous (void) + static void + auth_server_external (void) + { +- test_auth_mechanism (NULL, "EXTERNAL"); ++// test_auth_mechanism (NULL, "EXTERNAL"); + } + + static void +-- +1.8.3.1 + Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0037-Remove-failing-tests-linking-is-broken.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0037-Remove-failing-tests-linking-is-broken.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0037-Remove-failing-tests-linking-is-broken.patch 2013-07-02 14:15:10 UTC (rev 21425) @@ -0,0 +1,33 @@ +From 0b407db28cdb9658e9c40194b59f21d58773379f Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Tue, 2 Jul 2013 07:24:51 +0200 +Subject: [PATCH] Remove failing tests, linking is broken + +--- + tests/gobject/Makefile.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tests/gobject/Makefile.in b/tests/gobject/Makefile.in +index b109161..3bd60bc 100644 +--- a/tests/gobject/Makefile.in ++++ b/tests/gobject/Makefile.in +@@ -116,7 +116,6 @@ am__v_lt_1 = + am__EXEEXT_1 = deftype$(EXEEXT) gvalue-test$(EXEEXT) \ + paramspec-test$(EXEEXT) accumulator$(EXEEXT) \ + defaultiface$(EXEEXT) dynamictype$(EXEEXT) override$(EXEEXT) \ +- performance$(EXEEXT) performance-threaded$(EXEEXT) \ + singleton$(EXEEXT) references$(EXEEXT) + accumulator_SOURCES = accumulator.c + accumulator_OBJECTS = accumulator.$(OBJEXT) +@@ -719,8 +718,6 @@ test_programs = \ + defaultiface \ + dynamictype \ + override \ +- performance \ +- performance-threaded \ + singleton \ + references + +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Jul 2 16:30:38 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 02 Jul 2013 14:30:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21426] csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile Message-ID: Revision: 21426 http://gar.svn.sourceforge.net/gar/?rev=21426&view=rev Author: slowfranklin Date: 2013-07-02 14:30:38 +0000 (Tue, 02 Jul 2013) Log Message: ----------- glib2/branches/glib2-2-36: Remove duplicated PYCOMPILE and reenable 64 bit libs Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-02 14:15:10 UTC (rev 21425) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-02 14:30:38 UTC (rev 21426) @@ -12,7 +12,6 @@ GARTYPE = v2 # for memory synchronisation primitives like __sync_synchronize we need gcc GARCOMPILER = GNU -PYCOMPILE = 1 DESCRIPTION = The GLib library of C routines. define BLURB @@ -245,7 +244,7 @@ EXTRA_CFLAGS = -std=gnu99 # -xO4 -features=extensions -xc99 -D_XPG6 EXTRA_LDFLAGS = -lsocket -# BUILD64 = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jul 3 08:09:33 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 03 Jul 2013 06:09:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21427] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 21427 http://gar.svn.sourceforge.net/gar/?rev=21427&view=rev Author: cgrzemba Date: 2013-07-03 06:09:28 +0000 (Wed, 03 Jul 2013) Log Message: ----------- gstplugins/trunk: remove dependencies to old x11 libs Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2013-07-02 14:30:38 UTC (rev 21426) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2013-07-03 06:09:28 UTC (rev 21427) @@ -37,10 +37,8 @@ BUILD_DEP_PKGS += CSWlibtheora-dev BUILD_DEP_PKGS += CSWlibice BUILD_DEP_PKGS += CSWlibx11 -# BUILD_DEP_PKGS += CSWlibxvdevel # BUILD_DEP_PKGS += CSWx11videoproto BUILD_DEP_PKGS += CSWlibsm -# BUILD_DEP_PKGS += CSWlibxext BUILD_DEP_PKGS += CSWlibvorbis-dev BUILD_DEP_PKGS += CSWpangodevel BUILD_DEP_PKGS += CSWlibpixman-dev @@ -61,13 +59,11 @@ CATALOGNAME = gstplugins SPKG_DESC_CSWgstplugins += $(DESCRIPTION), base RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstdataprotocol0-10-0 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxext RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibx11 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxv RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstbase0-10-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Jul 3 13:40:17 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 03 Jul 2013 11:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21428] csw/mgar/pkg/glib2/branches/glib2-2-36 Message-ID: Revision: 21428 http://gar.svn.sourceforge.net/gar/?rev=21428&view=rev Author: slowfranklin Date: 2013-07-03 11:40:15 +0000 (Wed, 03 Jul 2013) Log Message: ----------- glib2/branches/glib2-2-36: Ensure the OpenCSW XML catalog is used, enable manpage generation which also makes the path fixup unneccessary, some reordering, fix one patch and disable another test Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch Added Paths: ----------- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-03 06:09:28 UTC (rev 21427) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-03 11:40:15 UTC (rev 21428) @@ -26,6 +26,15 @@ DISTFILES += changelog.CSW DISTFILES += set-ulimit-for-build-test +BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev +BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin +BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl +# To make the tests working +BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo +# This is used to adjust paths in documentation +BUILD_DEP_PKGS += CSWgsed +BUILD_DEP_PKGS += CSWlibz-dev + # # Build patches # @@ -85,6 +94,7 @@ # needs further investigtion, cf http://osdir.com/ml/freedesktop.dbus/2005-10/msg00058.html PATCHFILES += 0036-Disable-failing-gdbus-external-auth-tests.patch PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch +PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch PATCHFILES += $(PATCHFILES_$(GAROSREL)) @@ -145,6 +155,8 @@ # Those are ok: hardcoded search paths which have added /opt/csw CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3600.3 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3600.3 +# libgio uses the mime info for determining the type of files +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3 @@ -231,15 +243,6 @@ PKGFILES_CSWglib2-doc = .*/gtk-doc.* -BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev -BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin -BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl -# To make the tests working -BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo -# This is used to adjust paths in documentation -BUILD_DEP_PKGS += CSWgsed -BUILD_DEP_PKGS += CSWlibz-dev - # -xO4 is necessary on sparc so that function inlining happens as expected EXTRA_CFLAGS = -std=gnu99 # -xO4 -features=extensions -xc99 -D_XPG6 EXTRA_LDFLAGS = -lsocket @@ -260,6 +263,9 @@ CONFIGURE_ARGS += --with-threads=posix CONFIGURE_ARGS += --disable-compile-warnings CONFIGURE_ARGS += --disable-maintainer-mode +CONFIGURE_ARGS += --with-xml-catalog=/etc/opt/csw/xml/catalog +# ensure Docbook stuff is found for manpages, otherwise let configure fail +CONFIGURE_ARGS += --enable-man # we must set the config shell to bash so configure sticks that # as SHELL variable in the generated Makefiles. That's what make @@ -282,9 +288,6 @@ # Do we support gdb? MERGE_EXCLUDE_FILES += .*/gdb .*/gdb/.* -# libgio uses the mime info for determining the type of files -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo - include gar/category.mk # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out @@ -309,19 +312,20 @@ fi # This is in place to fix paths that make checkpkg complain - @echo "=== Fixing paths in documentation ===" - for d in gio glib gobject ; do \ - DOCBASEDIR="$(PKGROOT)/$(datadir)/gtk-doc/html/$$d/" ; \ - if [ -d "$$DOCBASEDIR" ] ; then \ - for f in $$DOCBASEDIR/*.html ; do \ - echo "Adjusting path in $$f" ; \ - /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ - mv $$f.tmp $$f ; \ - done ; \ - fi ; \ - done - for f in $(PKGROOT)$(mandir)/man[123456789]/* ; do \ - echo "Adjusting path in $$f" ; \ - /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ - mv $$f.tmp $$f ; \ - done ; \ +# @echo "=== Fixing paths in documentation ===" +# for d in gio glib gobject ; do \ +# DOCBASEDIR="$(PKGROOT)/$(datadir)/gtk-doc/html/$$d/" ; \ +# if [ -d "$$DOCBASEDIR" ] ; then \ +# for f in $$DOCBASEDIR/*.html ; do \ +# echo "Adjusting path in $$f" ; \ +# /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ +# mv $$f.tmp $$f ; \ +# done ; \ +# fi ; \ +# done +# for f in $(PKGROOT)$(mandir)/man[123456789]/* ; do \ +# echo "Adjusting path in $$f" ; \ +# /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ +# mv $$f.tmp $$f ; \ +# done ; \ +# Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch 2013-07-03 06:09:28 UTC (rev 21427) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch 2013-07-03 11:40:15 UTC (rev 21428) @@ -1,25 +1,24 @@ -From a161b66db29770aec53ab43c0fa3e5c270f2d083 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 26 Aug 2012 19:21:25 +0200 +From 980885deda881e8c2a4ba9a7e4fc87d4f79d3406 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 3 Jul 2013 08:17:16 +0200 Subject: [PATCH] Disable buffered-input-stream/set-buffer-size test --- - gio/tests/buffered-input-stream.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + gio/tests/buffered-input-stream.c | 1 - + 1 file changed, 1 deletion(-) diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c -index 8515351..3357fc8 100644 +index ef865fc..99f2856 100644 --- a/gio/tests/buffered-input-stream.c +++ b/gio/tests/buffered-input-stream.c -@@ -293,7 +293,7 @@ main (int argc, +@@ -540,7 +540,6 @@ main (int argc, g_test_add_func ("/buffered-input-stream/peek", test_peek); g_test_add_func ("/buffered-input-stream/peek-buffer", test_peek_buffer); - g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size); -+/* g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size);*/ g_test_add_func ("/buffered-input-stream/read-byte", test_read_byte); g_test_add_func ("/buffered-input-stream/read", test_read); - g_test_add_func ("/buffered-input-stream/skip", test_skip); + g_test_add_func ("/buffered-input-stream/read-async", test_read_async); -- -1.7.11.3 +1.8.3.1 Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch (rev 0) +++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch 2013-07-03 11:40:15 UTC (rev 21428) @@ -0,0 +1,24 @@ +From 726ffacab6d5e08c36fb53b9bc654485ccaf5023 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 3 Jul 2013 08:06:57 +0200 +Subject: [PATCH] Disable /appinfo/launch test, fails on s11x86 + +--- + gio/tests/appinfo.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c +index 6507f4b..212c419 100644 +--- a/gio/tests/appinfo.c ++++ b/gio/tests/appinfo.c +@@ -432,7 +432,6 @@ main (int argc, char *argv[]) + + g_test_add_func ("/appinfo/basic", test_basic); + g_test_add_func ("/appinfo/text", test_text); +- g_test_add_func ("/appinfo/launch", test_launch); + g_test_add_func ("/appinfo/show-in", test_show_in); + g_test_add_func ("/appinfo/commandline", test_commandline); + g_test_add_func ("/appinfo/launch-context", test_launch_context); +-- +1.8.3.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 Wed Jul 3 15:52:48 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Jul 2013 13:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21429] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21429 http://gar.svn.sourceforge.net/gar/?rev=21429&view=rev Author: dmichelsen Date: 2013-07-03 13:52:45 +0000 (Wed, 03 Jul 2013) Log Message: ----------- samba/branches/samba3: Fix merging of 64 bit /usr/lib Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-03 11:40:15 UTC (rev 21428) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-03 13:52:45 UTC (rev 21429) @@ -353,7 +353,8 @@ MIGRATE_FILES_CSWsamba += samba PRESERVECONF += $(sysconfdir)/samba/smb.conf -EXTRA_MERGE_DIRS_isa-extra += /usr/lib +EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64 +MERGEBASE_/usr/lib/64 = /usr/lib include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Jul 3 17:50:16 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 03 Jul 2013 15:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21430] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21430 http://gar.svn.sourceforge.net/gar/?rev=21430&view=rev Author: lblume Date: 2013-07-03 15:50:12 +0000 (Wed, 03 Jul 2013) Log Message: ----------- samba/branches/samba3: Some cleanup suggested by dam; add a PAM symlink package as well Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-03 13:52:45 UTC (rev 21429) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-07-03 15:50:12 UTC (rev 21430) @@ -166,7 +166,7 @@ PACKAGES += CSWsamba-nss-system-links CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links -PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_winbind_csw.so.1 +PKGFILES_CSWsamba-nss-system-links = /usr/lib/nss_winbind_csw.so.1 PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_wins_csw.so.1 PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1 PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.1 @@ -177,6 +177,21 @@ CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += bad-location-of-file +PACKAGES += CSWsamba-pam-system-links +CATALOGNAME_CSWsamba-pam-system-links = samba_pam_system_links +PKGFILES_CSWsamba-pam-system-links = /usr/lib/security/pam_smbpass_csw.so +PKGFILES_CSWsamba-pam-system-links += /usr/lib/security/pam_winbind_csw.so +PKGFILES_CSWsamba-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so +PKGFILES_CSWsamba-pam-system-links += /usr/lib/security/amd64/pam_winbind_csw.so +PKGFILES_CSWsamba-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so +PKGFILES_CSWsamba-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so +SPKG_DESC_CSWsamba-pam-system-links += Samba pam modules links for the system +RUNTIME_DEP_PKGS_CSWsamba-pam-system-links += CSWsamba-winbind +RUNTIME_DEP_PKGS_CSWsamba-pam-system-links += CSWsamba +CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += surplus-dependency|CSWsamba +CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += surplus-dependency|CSWsamba-winbind +CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += bad-location-of-file + PACKAGES += CSWlibtevent0 CATALOGNAME_CSWlibtevent0 = libtevent0 PKGFILES_CSWlibtevent0 += $(call baseisadirs,$(libdir),libtevent\.so\.0(\.\d+)*) @@ -353,17 +368,34 @@ MIGRATE_FILES_CSWsamba += samba PRESERVECONF += $(sysconfdir)/samba/smb.conf -EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64 -MERGEBASE_/usr/lib/64 = /usr/lib +EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64 /usr/lib/security/64 +MERGEBASE_/usr/lib/64 = /usr/lib +MERGEBASE_/usr/lib/security/64 = /usr/lib/security +EXTRA_PKGFILES_EXCLUDED += /usr/lib/security + include gar/category.mk # Set the target dir for modules with the proper arch -MODULE_DIR = /usr/lib +NSS_MODULE_DIR = /usr/lib +PAM_MODULE_DIR = /usr/lib/security + ifeq ($(MEMORYMODEL),64) - MODULE_DIR = /usr/lib/64 + NSS_MODULE_DIR = /usr/lib/64 + PAM_MODULE_DIR = /usr/lib/security/64 endif +# Define the targets for the links +NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1 +NSS_WINS_32 = ../..$(libdir)/nss_wins.so.1 +NSS_WINBIND_64 = ../../..$(libdir)/nss_winbind.so.1 +NSS_WINS_64 = ../../..$(libdir)/nss_wins.so.1 + +PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so +PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so +PAM_WINBIND_64 = ../../../..$(libdir)/security/pam_winbind.so +PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so + # Use this hack until this bug has been fixed: # https://bugzilla.samba.org/show_bug.cgi?id=8571 post-extract-modulated: @@ -387,17 +419,12 @@ ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1 # This bit is to install the symlinks to use the NSS modules with the # system's nsswitch.conf - ginstall -d -m 0755 $(DESTDIR)$(MODULE_DIR) - if [ "$(MEMORYMODEL)" = "32" ]; then \ - ln -s ../..$(libdir)/nss_winbind.so.1 \ - $(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \ - ln -s ../..$(libdir)/nss_wins.so.1 \ - $(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \ - else \ - ln -s ../../..$(libdir)/nss_winbind.so.1 \ - $(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \ - ln -s ../../..$(libdir)/nss_wins.so.1 \ - $(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \ - fi + ginstall -d -m 0755 $(DESTDIR)$(NSS_MODULE_DIR) + gln -s $(NSS_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_winbind_csw.so.1 + gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.1 + # This bit is to install the symlinks to use the PAM modules with the + # system's pam.conf + ginstall -d -m 0755 $(DESTDIR)$(PAM_MODULE_DIR) + gln -s $(PAM_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_winbind_csw.so + gln -s $(PAM_SMBPASS_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so @$(MAKECOOKIE) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 3 19:59:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Jul 2013 17:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21431] csw/mgar/pkg/mc/trunk Message-ID: Revision: 21431 http://gar.svn.sourceforge.net/gar/?rev=21431&view=rev Author: dmichelsen Date: 2013-07-03 17:59:33 +0000 (Wed, 03 Jul 2013) Log Message: ----------- mc/trunk: Update to 4.8.8 Modified Paths: -------------- csw/mgar/pkg/mc/trunk/Makefile csw/mgar/pkg/mc/trunk/checksums Modified: csw/mgar/pkg/mc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mc/trunk/Makefile 2013-07-03 15:50:12 UTC (rev 21430) +++ csw/mgar/pkg/mc/trunk/Makefile 2013-07-03 17:59:33 UTC (rev 21431) @@ -1,6 +1,6 @@ # $Id$ NAME = mc -VERSION = 4.8.6 +VERSION = 4.8.8 GARTYPE = v2 DESCRIPTION = A curses-based visual shell and file manager @@ -11,23 +11,22 @@ # gnulib and build on Solaris 9, or build on Solaris 10. PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -MASTER_SITES = http://www.midnight-commander.org/downloads/ -DISTFILES = $(DISTNAME).tar.bz2 +MASTER_SITES = http://ftp.midnight-commander.org/ +DISTFILES = $(DISTNAME).tar.xz -EXTRA_LDFLAGS= -lsocket +VENDOR_URL = http://www.midnight-commander.org RUNTIME_DEP_PKGS_CSWmc += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWmc += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWmc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWmc += CSWlibslang2 RUNTIME_DEP_PKGS_CSWmc += CSWlibssh2-1 +RUNTIME_DEP_PKGS_CSWmc += CSWperl CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/etc/opt/csw/mc/mc.menu CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/etc/opt/csw/mc/mc.menu.sr CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/opt/csw/libexec/mc/extfs.d/README -CHECKPKG_OVERRIDES_CSWmc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/opt/csw/libexec/mc/extfs.d/ulib +CHECKPKG_OVERRIDES_CSWmc += missing-dependency|CSWemacs-common -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Modified: csw/mgar/pkg/mc/trunk/checksums =================================================================== --- csw/mgar/pkg/mc/trunk/checksums 2013-07-03 15:50:12 UTC (rev 21430) +++ csw/mgar/pkg/mc/trunk/checksums 2013-07-03 17:59:33 UTC (rev 21431) @@ -1 +1 @@ -323706aa5e77698bed7b0b6faa7c1530 mc-4.8.6.tar.bz2 +14231665535fc80cc654b6ccfd070995 mc-4.8.8.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Jul 3 22:05:41 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 03 Jul 2013 20:05:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21432] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: Revision: 21432 http://gar.svn.sourceforge.net/gar/?rev=21432&view=rev Author: opk Date: 2013-07-03 20:05:35 +0000 (Wed, 03 Jul 2013) Log Message: ----------- upgrade pytz to 2013b Modified Paths: -------------- csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2013-07-03 17:59:33 UTC (rev 21431) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2013-07-03 20:05:35 UTC (rev 21432) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2012h +VERSION = 2013b CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums 2013-07-03 17:59:33 UTC (rev 21431) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2013-07-03 20:05:35 UTC (rev 21432) @@ -1 +1 @@ -90d5dcb521671a9f1f405aa139845f79 pytz-2012h.tar.bz2 +34f47470eedd5cd1faf6c3da2741967b pytz-2013b.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 Thu Jul 4 11:26:30 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2013 09:26:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21433] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 21433 http://gar.svn.sourceforge.net/gar/?rev=21433&view=rev Author: dmichelsen Date: 2013-07-04 09:26:23 +0000 (Thu, 04 Jul 2013) Log Message: ----------- xmlstarlet/trunk: Update to 1.4.2 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 2013-07-03 20:05:35 UTC (rev 21432) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2013-07-04 09:26:23 UTC (rev 21433) @@ -1,6 +1,5 @@ NAME = xmlstarlet -VERSION = 1.3.1 -GARTYPE = v2 +VERSION = 1.4.2 DESCRIPTION = XML transformation utility define BLURB @@ -35,6 +34,8 @@ CONFIGURE_ARGS += --with-libxml-include-prefix=$(includedir)/libxml2 CONFIGURE_ARGS += --with-libxml-libs-prefix=$(libdir) +CONFIGURE_ARGS += --enable-build-docs + BUILD_OVERRIDE_VARS = CFLAGS CPPFLAGS LDFLAGS BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS) BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS) Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2013-07-03 20:05:35 UTC (rev 21432) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2013-07-04 09:26:23 UTC (rev 21433) @@ -1 +1 @@ -5173ad3f01ec0ba0d54bd1fbfc057abf xmlstarlet-1.3.1.tar.gz +ee8df42efd2417f74a1f5e3b7fe9e023 xmlstarlet-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Jul 4 12:10:49 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 04 Jul 2013 10:10:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21434] csw/mgar/pkg/lang-python/ipython/trunk Message-ID: Revision: 21434 http://gar.svn.sourceforge.net/gar/?rev=21434&view=rev Author: opk Date: 2013-07-04 10:10:44 +0000 (Thu, 04 Jul 2013) Log Message: ----------- lang-python/ipython/trunk: update ipython to 0.13.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/ipython/trunk/Makefile csw/mgar/pkg/lang-python/ipython/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2013-07-04 09:26:23 UTC (rev 21433) +++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2013-07-04 10:10:44 UTC (rev 21434) @@ -7,12 +7,13 @@ # shipping ipythonx?) # NAME = ipython -VERSION = 0.12.1 +VERSION = 0.13.2 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Enhanced interactive python shell define BLURB + IPython is a replacement for the standard Python shell. endef MASTER_SITES = http://archive.ipython.org/release/$(VERSION)/ @@ -21,15 +22,22 @@ PACKAGES = CSWipython CATALOGNAME = ipython +PATCHFILES += 0001-rename-filenames-containing-spaces.patch + CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/IPython/core/usage.py -CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/IPython/external/mglob/_mglob.py -CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/core/magic.py CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/utils/tests/test_path.py CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/pexpect/_pexpect.py CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/path/_path.py +CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/core/magics/osm.py CHECKPKG_OVERRIDES_CSWipython += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWipython += catalogname-does-not-start-with-py_ SKIPTEST = 1 include gar/category.mk + +post-extract: + @( cd $(WORKSRC)/docs/examples/notebooks && mv Capturing\ Output.ipynb Capturing_Output.ipynb ) + @( cd $(WORKSRC)/docs/examples/notebooks && mv Script\ Magics.ipynb Script_Magics.ipynb ) + @( cd $(WORKSRC)/docs/examples/parallel && mv Parallel\ Magics.ipynb Parallel_Magics.ipynb ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/ipython/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/checksums 2013-07-04 09:26:23 UTC (rev 21433) +++ csw/mgar/pkg/lang-python/ipython/trunk/checksums 2013-07-04 10:10:44 UTC (rev 21434) @@ -1 +1 @@ -ae3a9851cd99f40ba5227efec58c7a6c ipython-0.12.1.tar.gz +ead3b7eb70c653b537fb9d96d71b8b2a ipython-0.13.2.tar.gz Added: csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch (rev 0) +++ csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch 2013-07-04 10:10:44 UTC (rev 21434) @@ -0,0 +1,27 @@ +From 941fe385c376854c443eb777fe67630650f3ea14 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Thu, 4 Jul 2013 11:48:13 +0200 +Subject: [PATCH] rename filenames containing spaces + +--- + docs/examples/notebooks/00_notebook_tour.ipynb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/examples/notebooks/00_notebook_tour.ipynb b/docs/examples/notebooks/00_notebook_tour.ipynb +index c5f8c4c..0dffdd1 100644 +--- a/docs/examples/notebooks/00_notebook_tour.ipynb ++++ b/docs/examples/notebooks/00_notebook_tour.ipynb +@@ -65,8 +65,8 @@ + "00_notebook_tour.ipynb callbacks.ipynb python-logo.svg\r\n", + "01_notebook_introduction.ipynb cython_extension.ipynb rmagic_extension.ipynb\r\n", + "Animations_and_Progress.ipynb display_protocol.ipynb sympy.ipynb\r\n", +- "Capturing Output.ipynb formatting.ipynb sympy_quantum_computing.ipynb\r\n", +- "Script Magics.ipynb octavemagic_extension.ipynb trapezoid_rule.ipynb\r\n", ++ "Capturing_Output.ipynb formatting.ipynb sympy_quantum_computing.ipynb\r\n", ++ "Script_Magics.ipynb octavemagic_extension.ipynb trapezoid_rule.ipynb\r\n", + "animation.m4v progbar.ipynb\r\n" + ] + } +-- +1.8.3.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 Thu Jul 4 14:12:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2013 12:12:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21435] csw/mgar/pkg/filezilla/trunk Message-ID: Revision: 21435 http://gar.svn.sourceforge.net/gar/?rev=21435&view=rev Author: dmichelsen Date: 2013-07-04 12:12:39 +0000 (Thu, 04 Jul 2013) Log Message: ----------- filezilla/trunk: Update to 3.7.1.1 Modified Paths: -------------- csw/mgar/pkg/filezilla/trunk/Makefile csw/mgar/pkg/filezilla/trunk/checksums Modified: csw/mgar/pkg/filezilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/filezilla/trunk/Makefile 2013-07-04 10:10:44 UTC (rev 21434) +++ csw/mgar/pkg/filezilla/trunk/Makefile 2013-07-04 12:12:39 UTC (rev 21435) @@ -1,5 +1,5 @@ NAME = filezilla -VERSION = 3.2.7 +VERSION = 3.7.1.1 GARTYPE = v2 DESCRIPTION = Cross-platform FTP, FTPS and SFTP client @@ -8,12 +8,19 @@ lots of useful features and an intuitive graphical user interface. endef -MASTER_SITES = http://d10xg45o6p6dbl.cloudfront.net/projects/f/filezilla/ +MASTER_SITES = $(SF_MIRROR) DISTFILES = FileZilla_$(VERSION)_src.tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = FileZilla_(\d+(?:\.\d+)*)_src.tar.bz2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CONFIGURE_ARGS = $(DIRPATHS) +BUILD_DEP_PKGS += CSWxdg-utils +GARCOMPILER = GCC4 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-tinyxml=builtin + +# We need msgfmt form GNU textutils before /usr/bin +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + include gar/category.mk Modified: csw/mgar/pkg/filezilla/trunk/checksums =================================================================== --- csw/mgar/pkg/filezilla/trunk/checksums 2013-07-04 10:10:44 UTC (rev 21434) +++ csw/mgar/pkg/filezilla/trunk/checksums 2013-07-04 12:12:39 UTC (rev 21435) @@ -1 +1 @@ -fcbcb291ec6f4dd821670a4498b5ad35 download/FileZilla_3.2.7_src.tar.bz2 +52c6f764b2f4a94b1781da42b2bbb9b5 FileZilla_3.7.1.1_src.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 Thu Jul 4 15:14:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2013 13:14:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21436] csw/mgar/pkg/silctoolkit/trunk Message-ID: Revision: 21436 http://gar.svn.sourceforge.net/gar/?rev=21436&view=rev Author: dmichelsen Date: 2013-07-04 13:14:24 +0000 (Thu, 04 Jul 2013) Log Message: ----------- silctoolkit/trunk: Update to 1.1.10 and mGAR v2, split packages Modified Paths: -------------- csw/mgar/pkg/silctoolkit/trunk/Makefile csw/mgar/pkg/silctoolkit/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-07-04 12:12:39 UTC (rev 21435) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-07-04 13:14:24 UTC (rev 21436) @@ -1,28 +1,45 @@ NAME = silc-toolkit -VERSION = 1.1.8 -GARTYPE = v1 -SPKG_SOURCEURL = http://silcnet.org/software/download/toolkit/ +VERSION = 1.1.10 -DESCRIPTION = secure internet live conferencing toolkit +DESCRIPTION = Secure internet live conferencing toolkit define BLURB SILC Project develops the Secure Internet Live Conferencing protocol, which provides secure conferencing services. endef MASTER_SITES = http://silcnet.org/download/toolkit/sources/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWsilctoolkit,prototype) +DISTFILES += $(DISTNAME).tar.bz2 PATCHFILES += function.patch -#No tests -TEST_SCRIPTS = +VENDOR_URL = http://silcnet.org/software/download/toolkit/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibsilc1-1-2 +SPKG_DESC_CSWlibsilc1-1-2 = Secure internet live conferencing toolkit, libsilc-1.1.so.2 +# This is the same as Debian: +# http://packages.debian.org/sid/m68k/libsilc-1.1-2/filelist +PKGFILES_CSWlibsilc1-1-2 += $(call pkgfiles_lib,libsilc-1.1.so.2) +PKGFILES_CSWlibsilc1-1-2 += $(call pkgfiles_lib,libsilcclient-1.1.so.2) +PKGFILES_CSWlibsilc1-1-2 += $(call baseisadirs,$(libdir)/silc,.*) -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +OBSOLETED_BY_CSWlibsilc1-1-2 += CSWsilctoolkit -CONFIGURE_ARGS = $(DIRPATHS) +# This is because of the modules in lib/silc/*.so +CHECKPKG_OVERRIDES_CSWlibsilc1-1-2 += soname-not-part-of-filename +# Just a comment +CHECKPKG_OVERRIDES_CSWlibsilc-dev += discouraged-path-in-pkgmap|/opt/csw/share/doc/silc-toolkit/README.CVS + +PACKAGES += CSWlibsilc-dev +SPKG_DESC_CSWlibsilc-dev = Development files for libsilc-1.1.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibsilc-dev += CSWlibsilc1-1-2 + +# False positives +CHECKPKG_OVERRIDES_CSWlibsilc-dev += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWlibsilc-dev += shared-lib-pkgname-mismatch + +BUILD64 = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-simdir=$(libdir)/silc + include gar/category.mk Modified: csw/mgar/pkg/silctoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/checksums 2013-07-04 12:12:39 UTC (rev 21435) +++ csw/mgar/pkg/silctoolkit/trunk/checksums 2013-07-04 13:14:24 UTC (rev 21436) @@ -1,4 +1 @@ -17915a1b0ad602fa31fff47f6bd7471b download/silc-toolkit-1.1.8.tar.gz -de3f8fbb54aacfa9f4f83938601ce676 download/CSWsilctoolkit.gspec -b73e637b218248a68cf955483ddb3085 download/CSWsilctoolkit.prototype -245879ba88f7159d1062e05307de9633 download/function.patch +f742b64064c40a2d22520549746cf2b4 silc-toolkit-1.1.10.tar.bz2 Deleted: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec 2013-07-04 12:12:39 UTC (rev 21435) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec 2013-07-04 13:14:24 UTC (rev 21436) @@ -1,4 +0,0 @@ -%var bitname silctoolkit -%var pkgname CSWsilctoolkit -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype 2013-07-04 12:12:39 UTC (rev 21435) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype 2013-07-04 13:14:24 UTC (rev 21436) @@ -1,1593 +0,0 @@ -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/silcmessage_i.h 0644 root bin -f none /opt/csw/include/silcbuffmt.h 0644 root bin -f none /opt/csw/include/silcske_groups.h 0644 root bin -f none /opt/csw/include/silcber.h 0644 root bin -f none /opt/csw/include/silchmac.h 0644 root bin -f none /opt/csw/include/tma_class.h 0644 root bin -f none /opt/csw/include/silcattrs.h 0644 root bin -f none /opt/csw/include/tma_superclass.h 0644 root bin -f none /opt/csw/include/stacktrace.h 0644 root bin -f none /opt/csw/include/silccond.h 0644 root bin -f none /opt/csw/include/silcpubkey.h 0644 root bin -f none /opt/csw/include/silcnet.h 0644 root bin -f none /opt/csw/include/silcske_i.h 0644 root bin -f none /opt/csw/include/silcske.h 0644 root bin -f none /opt/csw/include/silcclient_entry.h 0644 root bin -f none /opt/csw/include/silcatomic.h 0644 root bin -f none /opt/csw/include/silcdlist.h 0644 root bin -f none /opt/csw/include/silcsocketstream.h 0644 root bin -f none /opt/csw/include/silcasn1_i.h 0644 root bin -f none /opt/csw/include/silcmode.h 0644 root bin -f none /opt/csw/include/silcstrutil.h 0644 root bin -f none /opt/csw/include/silcnotify.h 0644 root bin -f none /opt/csw/include/silcstack.h 0644 root bin -f none /opt/csw/include/silcfsm_i.h 0644 root bin -f none /opt/csw/include/silcskr.h 0644 root bin -f none /opt/csw/include/silcmutex.h 0644 root bin -f none /opt/csw/include/silcasync.h 0644 root bin -f none /opt/csw/include/mp_gmp.h 0644 root bin -f none /opt/csw/include/silcske_payload.h 0644 root bin -f none /opt/csw/include/silcidcache.h 0644 root bin -f none /opt/csw/include/silcargument.h 0644 root bin -f none /opt/csw/include/silcschedule.h 0644 root bin -f none /opt/csw/include/silcmime_i.h 0644 root bin -f none /opt/csw/include/silcconfig.h 0644 root bin -f none /opt/csw/include/silccommand.h 0644 root bin -f none /opt/csw/include/tma.h 0644 root bin -f none /opt/csw/include/silcfileutil.h 0644 root bin -f none /opt/csw/include/silcrng.h 0644 root bin -f none /opt/csw/include/silcutf8.h 0644 root bin -f none /opt/csw/include/client.h 0644 root bin -f none /opt/csw/include/silcsimutil.h 0644 root bin -f none /opt/csw/include/silcsim.h 0644 root bin -f none /opt/csw/include/silclog_i.h 0644 root bin -f none /opt/csw/include/silcbuffer.h 0644 root bin -f none /opt/csw/include/silcsocketstream_i.h 0644 root bin -f none /opt/csw/include/silcmemory.h 0644 root bin -f none /opt/csw/include/silcutil.h 0644 root bin -f none /opt/csw/include/silcasync_i.h 0644 root bin -f none /opt/csw/include/silcstringprep.h 0644 root bin -f none /opt/csw/include/silctime.h 0644 root bin -f none /opt/csw/include/silctypes.h 0644 root bin -f none /opt/csw/include/silcversion.h 0644 root bin -f none /opt/csw/include/silcskr_i.h 0644 root bin -f none /opt/csw/include/silcthread.h 0644 root bin -f none /opt/csw/include/silcfdstream.h 0644 root bin -f none /opt/csw/include/silcmp.h 0644 root bin -f none /opt/csw/include/silchttpphp.h 0644 root bin -f none /opt/csw/include/silcnet_i.h 0644 root bin -f none /opt/csw/include/silcmessage.h 0644 root bin -f none /opt/csw/include/silcmime.h 0644 root bin -f none /opt/csw/include/silcasn1.h 0644 root bin -f none /opt/csw/include/silcpk.h 0644 root bin -f none /opt/csw/include/silcclient.h 0644 root bin -f none /opt/csw/include/silcauth.h 0644 root bin -f none /opt/csw/include/silchashtable.h 0644 root bin -f none /opt/csw/include/silcchannel.h 0644 root bin -f none /opt/csw/include/silccipher.h 0644 root bin -f none /opt/csw/include/silc.h 0644 root bin -f none /opt/csw/include/silcid.h 0644 root bin -f none /opt/csw/include/silcsftp.h 0644 root bin -f none /opt/csw/include/silcsftp_fs.h 0644 root bin -f none /opt/csw/include/silchttpserver.h 0644 root bin -f none /opt/csw/include/silcpkcs1.h 0644 root bin -f none /opt/csw/include/silcsnprintf.h 0644 root bin -f none /opt/csw/include/silcschedule_i.h 0644 root bin -f none /opt/csw/include/silcpkcs.h 0644 root bin -f none /opt/csw/include/silclog.h 0644 root bin -f none /opt/csw/include/silcmath.h 0644 root bin -f none /opt/csw/include/mp_tma.h 0644 root bin -f none /opt/csw/include/silcstack_i.h 0644 root bin -f none /opt/csw/include/silcwin32.h 0644 root bin -f none /opt/csw/include/silcvcard.h 0644 root bin -f none /opt/csw/include/silcconnauth.h 0644 root bin -f none /opt/csw/include/silcsymbian.h 0644 root bin -f none /opt/csw/include/silcfsm.h 0644 root bin -f none /opt/csw/include/silcapputil.h 0644 root bin -f none /opt/csw/include/silcpacket.h 0644 root bin -f none /opt/csw/include/silcstatus.h 0644 root bin -f none /opt/csw/include/silclist.h 0644 root bin -f none /opt/csw/include/silchash.h 0644 root bin -f none /opt/csw/include/silcstream.h 0644 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/silc-toolkit 0755 root bin -f none /opt/csw/share/doc/silc-toolkit/CREDITS 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-multimedia-session-00.txt 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/TODO 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-flags-payloads-04.txt 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/README.CVS 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-spec-09.txt 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-pp-09.txt 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/COPYING 0644 root bin -d none /opt/csw/share/doc/silc-toolkit/toolkit 0755 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_fingerprint.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_wait.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileMonitor.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcGetChannelCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_security_properties.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put_head.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng_intro.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_command_pending.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-SilcDList.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_SERVER_COMPARE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclientlib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base_decode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_parse_version.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_scopy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_set_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_del.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_strncat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_string_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_finish.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_notify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_prime_test.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_senlarge.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_callbacks.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionParams.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketError.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_wait_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET32_LSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin_noalloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_end.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_udp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_lstat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcClientID.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add_ext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_public_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_valid.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc_size.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc_ua.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_timeout.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_sender.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_DATA.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_VISIBLE_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-ChannelUserModes.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThreadStruct.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskNotifyCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperation.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_uninit.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_dir.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push_tail.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_vap.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_add_noise.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_file.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register_default.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init_prev.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_arg_num.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_engine.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcKeyAgreementCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CLIENT_COMPARE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_UNIVERSAL_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_command.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_close.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigFile.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_callback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_get_username.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_upper.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-silc_server_run(1).html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_end.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferUnformatFunc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-SilcCipher.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_SIGNAL.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_create2.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKERekeyMaterial.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_read.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferParamType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashTable.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_set_iv_included.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomicPointer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeFlags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_show_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMonitorStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_del.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_ids.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_datalen.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_debug_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_valid.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_id2str.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_get_error.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_ref_channel.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encoded_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_set_notifier.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement_stream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_data_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_stat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-SilcHmac.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_server.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_client.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul_2exp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_connparam.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/programming_conv.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET16_MSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_insert.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_uninit.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_compute_public.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_encode_args.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_get_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_close.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_file.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcChannelUser.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_start.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_get.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_set_info.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcChannelEntry.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_decode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_get_supported_groups.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_ke_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketCallbacks.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEKeyMaterial.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_whois.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_method.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTask.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_update.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_signal.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_send.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_scalloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashForeach.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/box2.gif 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_request.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_calloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferFormatFunc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_sign.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_private_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_wakeup.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-SilcMessageFlags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flushdelay.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_private_message_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_set_serverinfo.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_get_ske.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_channel_resolve.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_extended.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandle.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-SilcList.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_private_message_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT32_LSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_alloc_size.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-SilcCond.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcAskPassphrase.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_truelen.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_public_key_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcServerID.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_readlink.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_count.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_make.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BMP_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_halt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free_private_message_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey-silc_public_key_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetResolveCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_first_arg.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeDevice.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_tcp_stream_create.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_supported.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_lower.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_initiator.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_email.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_truncated.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_supported.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/index.tmpl 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_or.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_create_key_pair.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_unregister_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcBool.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_start_decode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_value.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_YIELD.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_destroy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyname_async.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_str.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_GET_ID.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_realname.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_END.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandleCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_readfile.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_THREAD_WAIT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_initiator.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_gcdext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_get_hostname.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_id_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPAttributes.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rmdir.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFSMemoryPerm.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GEN_TIME.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttplib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_flags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_string_match.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcAuthMethod.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET_OF.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_check.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STRFMT_END.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_find_pkcs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_add_pkcs_type.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_load_key_pair.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_NUMERIC_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_w2c.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_server.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_host_by_sock.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-SilcPkcs1BlockType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_del_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_client.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/index_pic.gif 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_*_INT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_set.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcID.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_unicode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIdType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_va.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamOps.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_mode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_public_key_version.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT16_MSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_mac.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CHANNEL_COMPARE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_vsnprintf.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcPrivateMessageKeys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_fd_events.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_copy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPErrorCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_mode_list.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_usleep.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate_wpub.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull_tail.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-SilcUserMode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clone.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_unlock.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_ident.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketEosCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftplib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_signal.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_run.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_read_current_line.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_private_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigErrno.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepFlags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_vap.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcKeyAgreementPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_write.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_get_str.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKESecurityPropertyFlag.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_file.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_get_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list_reset.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationStruct.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcServerEntry.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_2exp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_ext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_cipher.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_serverinfo_alloc(1).html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjGeo.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp-silc_http_php.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fsetstat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_64.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BIT_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_responder.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_writefile_mode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_start.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-SilcIDCacheEntry.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_decoded_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_end.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_cipher.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSUnformatFunc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_set_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPNameCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get_args.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_srealloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcaputillib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_export.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_DEBUG.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_is_multipart.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_close.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPrivateKey.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/platforms.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-SilcVCard.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_number.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTP.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_block_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-SilcBerEncoding.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_create_listener.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_snprintf.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandFlags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_IA5_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc_by_oid.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_va_copy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_receive.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnection.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_responder.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode_file.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_get_file.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_ext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_fingerprint.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_key_agreement.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-silc_stringprep.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_remote_public(1).html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_channel_private_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_HEXDUMP.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_read.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_dir.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationPause.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_rehash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEVerifyCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_check.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_read.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHashObject.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_str2id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context_ext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_format.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigEntity.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_encode_identifier.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_BUFFER.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-SilcMPInt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_decrypt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_verify_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_smalloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_connect.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_start.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_abs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_va.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_next.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_malloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEStartPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_state_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_channel_private_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip4.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientCommandReply.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_wrap.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacket.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-SilcStackFrame.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-SilcHttpServer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_unset_listen_fd.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_INFO.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_compare_timeval.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assemble.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_algorithm_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attribute_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp_qr.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_check_line.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_strerror.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketErrorCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_ext.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_shutdown.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKECompletionCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_field.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-SilcBuffer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_continue_sync.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_callback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_channel_message.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThread.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_admin.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_line.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketStream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-silc_pkcs1_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMessageType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/space.gif 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskEvent.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSM.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_local_by_sock.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRFindCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_uninit.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sqrt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientStopped.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_by_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_key_is_set.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY_PRIMITIVE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OID.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_command_name.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_main.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_debug_callbacks.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_server.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_multiparts.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_socket_opt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_name.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_udp_stream_create.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPublicKey.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_channel.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/toolkit_index.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_type.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_enlarge.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_FINISH.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttribute.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_set_monitor.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_bin2mp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt64.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sstrformat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_get_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatusCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjPk.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flush_all.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_decoded.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_is_supported.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_ptr.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcClientEntry.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketReceiveCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsimutil.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_taillen.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_start_sync.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_realpath.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributePayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEKEPayload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_ERROR.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_open.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_ids.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamNotifier.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnectionType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_resume.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_ADVANCE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleStruct.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare_full.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_field.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/porting.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encoded_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_close.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_OFFSET.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_object.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus-silc_status_get_args.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clear.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_count.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assembler_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strcasecmp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_uninit.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE_OF.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_name.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format_vp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat_vp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_fprintf.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_pointer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_arg_num.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_close_listener.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_encrypt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_unref_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SILC_CONFIG_CALLBACK.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-SilcServerRunning.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CALL.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketWrapCoder.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileName.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskrlib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_replace.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_lock.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sizeinbase.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key_ske.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_cmp_si.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_quick.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GENERAL_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte_fast.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_pkcs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc_size.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_multipart.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_uint.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcSchedule.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_abort.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSFileEncoding.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode_char.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileAskName.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_name_one.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_opendir.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OCTET_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_decrypt.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEParams.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_yield.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SilcAsn1Struct.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcGetAuthMeth.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_transform.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKey.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_machine.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open_mode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strncasecmp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_parse_version_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_get.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SilcLogDebugCb.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_steal.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_string_is_ascii.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_TIMEDWAIT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEPKType.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_create.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_stop.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_link.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_get_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_type.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcardlib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_remove.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_asprintf.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_remote_port.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fstat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_listener_get_hostname.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashCompare.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_gen_prime.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sunformat_vp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_with_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_destroy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET64_MSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_dup.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register_table.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_type.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPVersionCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_id_render.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_purge.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas16.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_is_started.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_free_rekey_material.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_get.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPName.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSFormatFunc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketFlags.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte_fast.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_timezone.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-FALSE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_version_to_num.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_ref_public_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_init.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-SilcDH.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_process_key_material_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEvent.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chmode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_username.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_ASSERT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_close.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_reset.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThread.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_accept_connection.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_hash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_32_TO_PTR.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit_pointer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-silc_stack_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_sstrdup.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_get_len.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/zlib.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_foreach.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_payload.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKR.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_sub_int32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEventStruct.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_args.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_set_multipart.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-TRUE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_encode_one.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_setstat.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_mode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CONTINUE.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key_simple.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientOperations.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcSocket.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_initiator.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_PRINTABLE_STRING.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_key.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas_pointer.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_self.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDIP.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_map_status.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_update.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hmac.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_encode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_format.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_is_udp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_assert_locked.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_client.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamStatus.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/command_reply_args.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_listen_fd.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_local.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_client_id_hash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPExtendedCallback.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse_id.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register_default.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/box.gif 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKeyUsage.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id_resolve.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_add.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_final.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int32.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localip.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_ui.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_gettimeofday.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPrivateKey.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_lock_client.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_c2w.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_decode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFilesystemOps.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnAuth.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyaddr_async.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip6.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_send.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_verify.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdoc_xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_get.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register_default.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_timestamp.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_parse.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_error_string.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThreadStart.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_decode.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SHORT_INT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_WAIT.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeMood.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_uninit.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_free.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_is_supported.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_update_by_context.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_keys.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_copy.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_debug.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt8.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_alloc.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_country.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_steal_data.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_filename.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id_resolve.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_list_parse_decoded.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjDevice.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT64_MSB.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rename.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.xref 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_final.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localhost.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_unref.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send_error.html 0644 root bin -f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.xref 0644 root bin @@ 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 dmichelsen at users.sourceforge.net Thu Jul 4 16:21:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2013 14:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21437] csw/mgar/pkg Message-ID: Revision: 21437 http://gar.svn.sourceforge.net/gar/?rev=21437&view=rev Author: dmichelsen Date: 2013-07-04 14:21:07 +0000 (Thu, 04 Jul 2013) Log Message: ----------- foremost/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/foremost/ csw/mgar/pkg/foremost/branches/ csw/mgar/pkg/foremost/tags/ csw/mgar/pkg/foremost/trunk/ csw/mgar/pkg/foremost/trunk/Makefile csw/mgar/pkg/foremost/trunk/checksums csw/mgar/pkg/foremost/trunk/files/ Property changes on: csw/mgar/pkg/foremost/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/foremost/trunk/Makefile =================================================================== --- csw/mgar/pkg/foremost/trunk/Makefile (rev 0) +++ csw/mgar/pkg/foremost/trunk/Makefile 2013-07-04 14:21:07 UTC (rev 21437) @@ -0,0 +1,60 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +NAME = foremost +VERSION = 1.5.7 + +DESCRIPTION = Forensic file recovery and data carving tool +define BLURB +endef + +# MASTER_SITES = $(SF_MIRROR) +MASTER_SITES = http://foremost.sourceforge.net/pkg/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://foremost.sourceforge.net/ + +BUILD_DEP_PKGS = CSWtofrodos + +REINPLACEMENTS += conf +REINPLACE_MATCH_conf = /usr/local/etc/foremost.conf +REINPLACE_WITH_conf = $(sysconfdir)/foremost.conf +REINPLACE_FILES_conf += config.c + +CONFIGURE_SCRIPTS = + +BUILD_OVERRIDE_VARS = RAW_CC RAW_FLAGS +BUILD_OVERRIDE_VAR_RAW_CC = $(CC) +BUILD_OVERRIDE_VAR_RAW_FLAGS = $(CFLAGS) -DVERSION=\\\"$(VERSION)\\\" +BUILD_ARGS = solaris + +# There is no testsuite +TEST_SCRIPTS = + +# We need ginstall as install +INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) + +INSTALL_OVERRIDE_VARS += BIN +INSTALL_OVERRIDE_VAR_BIN = $(DESTDIR)$(bindir) +INSTALL_OVERRIDE_VARS += MAN +INSTALL_OVERRIDE_VAR_MAN = $(DESTDIR)$(mandir)/man8 +INSTALL_OVERRIDE_VARS += CONF +INSTALL_OVERRIDE_VAR_CONF = $(DESTDIR)$(sysconfdir) + +PRESERVECONF += $(sysconfdir)/foremost.conf + +MIGRATE_FILES += foremost.conf + +include gar/category.mk + +post-extract: + fromdos $(WORKSRC)/* + @$(MAKECOOKIE) + +pre-install: + ginstall -d $(INSTALL_OVERRIDE_VAR_BIN) + ginstall -d $(INSTALL_OVERRIDE_VAR_MAN) + ginstall -d $(INSTALL_OVERRIDE_VAR_CONF) + @$(MAKECOOKIE) + +post-install: + gunzip $(INSTALL_OVERRIDE_VAR_MAN)/foremost.8.gz + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/foremost/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/foremost/trunk/checksums =================================================================== --- csw/mgar/pkg/foremost/trunk/checksums (rev 0) +++ csw/mgar/pkg/foremost/trunk/checksums 2013-07-04 14:21:07 UTC (rev 21437) @@ -0,0 +1 @@ +860119c49665c2a3fb2b0b1d3dbad02a foremost-1.5.7.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 Thu Jul 4 22:45:19 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Jul 2013 20:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21438] csw/mgar/pkg Message-ID: Revision: 21438 http://gar.svn.sourceforge.net/gar/?rev=21438&view=rev Author: dmichelsen Date: 2013-07-04 20:45:12 +0000 (Thu, 04 Jul 2013) Log Message: ----------- lrzsz/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lrzsz/ csw/mgar/pkg/lrzsz/Makefile csw/mgar/pkg/lrzsz/branches/ csw/mgar/pkg/lrzsz/tags/ csw/mgar/pkg/lrzsz/tags/legacy/ csw/mgar/pkg/lrzsz/tags/legacy/Makefile csw/mgar/pkg/lrzsz/trunk/ csw/mgar/pkg/lrzsz/trunk/Makefile csw/mgar/pkg/lrzsz/trunk/checksums csw/mgar/pkg/lrzsz/trunk/files/ Copied: csw/mgar/pkg/lrzsz/Makefile (from rev 15455, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/lrzsz/Makefile (rev 0) +++ csw/mgar/pkg/lrzsz/Makefile 2013-07-04 20:45:12 UTC (rev 21438) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/lrzsz/tags/legacy/Makefile =================================================================== --- csw/mgar/pkg/lrzsz/tags/legacy/Makefile (rev 0) +++ csw/mgar/pkg/lrzsz/tags/legacy/Makefile 2013-07-04 20:45:12 UTC (rev 21438) @@ -0,0 +1,43 @@ +# vim: ft=perl + +$progname = 'lrzsz'; +$version = '0.12.20'; + +$buildroot = "${builddir}/${progname}-${version}-buildroot"; + +$category = 'application'; +$vendor = 'http://www.ohse.de/uwe/software/lrzsz.html packaged for CSW by Thomas Glanzmann'; + + at sources = ("${progname}-${version}.tar.gz"); + at packages = ({ + pkgname => ${progname}, + filename => ${progname}, + name => "${progname} - X/Y/Zmodem suite", + dependencies => ['CSWcommon'], + filelist => [qw(opt)] + }); +$copyright = "${progname}-${version}/COPYING"; + +$build = <<"EOF"; +export CC=gcc +export PATH="/opt/csw/bin:/usr/ccs/bin:/usr/bin:/usr/openwin/bin" +export LD_OPTIONS='-R/opt/csw/lib -L/opt/csw/lib' +export LD_LIBRARY_PATH=/opt/csw/lib +export CFLAGS="-I/opt/csw/include -O" +cd ${progname}-${version} +./configure --prefix=/opt/csw --mandir=/opt/csw/share/man +gmake LIBS="-lnsl -lsocket -lintl" +gmake DESTDIR=${buildroot} install +ln ${buildroot}/opt/csw/bin/lrb ${buildroot}/opt/csw/bin/rz +ln ${buildroot}/opt/csw/bin/lrb ${buildroot}/opt/csw/bin/rx +ln ${buildroot}/opt/csw/bin/lrb ${buildroot}/opt/csw/bin/rb +ln ${buildroot}/opt/csw/bin/lsb ${buildroot}/opt/csw/bin/sz +ln ${buildroot}/opt/csw/bin/lsb ${buildroot}/opt/csw/bin/sx +ln ${buildroot}/opt/csw/bin/lsb ${buildroot}/opt/csw/bin/sb +ln ${buildroot}/opt/csw/share/man/man1/lrz.1 ${buildroot}/opt/csw/share/man/man1/rz.1 +ln ${buildroot}/opt/csw/share/man/man1/lrz.1 ${buildroot}/opt/csw/share/man/man1/rx.1 +ln ${buildroot}/opt/csw/share/man/man1/lrz.1 ${buildroot}/opt/csw/share/man/man1/rb.1 +ln ${buildroot}/opt/csw/share/man/man1/lsz.1 ${buildroot}/opt/csw/share/man/man1/sz.1 +ln ${buildroot}/opt/csw/share/man/man1/lsz.1 ${buildroot}/opt/csw/share/man/man1/sx.1 +ln ${buildroot}/opt/csw/share/man/man1/lsz.1 ${buildroot}/opt/csw/share/man/man1/sb.1 +EOF Property changes on: csw/mgar/pkg/lrzsz/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/lrzsz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lrzsz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lrzsz/trunk/Makefile 2013-07-04 20:45:12 UTC (rev 21438) @@ -0,0 +1,23 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = lrzsz +VERSION = 0.12.20 + +DESCRIPTION = X/Y/Zmodem suite +define BLURB +endef + +MASTER_SITES = http://ohse.de/uwe/releases/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://ohse.de/uwe/software/lrzsz.html + +PACKAGES += CSWlrzsz +SPKG_DESC_CSWlrzsz = X/Y/Zmodem suite +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlrzsz += CSWlibintl8 + +EXTRA_LINKER_FLAGS += -lintl + +include gar/category.mk Property changes on: csw/mgar/pkg/lrzsz/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lrzsz/trunk/checksums =================================================================== --- csw/mgar/pkg/lrzsz/trunk/checksums (rev 0) +++ csw/mgar/pkg/lrzsz/trunk/checksums 2013-07-04 20:45:12 UTC (rev 21438) @@ -0,0 +1 @@ +b5ce6a74abc9b9eb2af94dffdfd372a4 lrzsz-0.12.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jul 5 09:31:27 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Jul 2013 07:31:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21439] csw/mgar/pkg/ftgl/trunk/Makefile Message-ID: Revision: 21439 http://gar.svn.sourceforge.net/gar/?rev=21439&view=rev Author: dmichelsen Date: 2013-07-05 07:31:16 +0000 (Fri, 05 Jul 2013) Log Message: ----------- ftgl/trunk: Some cleanup Modified Paths: -------------- csw/mgar/pkg/ftgl/trunk/Makefile Modified: csw/mgar/pkg/ftgl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ftgl/trunk/Makefile 2013-07-04 20:45:12 UTC (rev 21438) +++ csw/mgar/pkg/ftgl/trunk/Makefile 2013-07-05 07:31:16 UTC (rev 21439) @@ -19,24 +19,21 @@ PATCHFILES += 0003-Force-GNU-sed-when-using-i.patch PATCHFILES += 0004-Keep-libtool-from-stripping-norunpath-during-linking.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES = CSWftgl +SPKG_DESC_CSWftgl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWftgl += CSWmesa +RUNTIME_DEP_PKGS_CSWftgl += CSWzlib +RUNTIME_DEP_PKGS_CSWftgl += CSWftype2 +RUNTIME_DEP_PKGS_CSWftgl += CSWfreeglut +PKGFILES_CSWftgl = $(PKGFILES_RT) +CHECKPKG_OVERRIDES_CSWftgl = surplus-dependency|CSWfreeglut -PACKAGES = CSWftgl CSWftgldevel - -CATALOGNAME_CSWftgl = ftgl +PACKAGES += CSWftgldevel CATALOGNAME_CSWftgldevel = ftgl_devel - -SPKG_DESC_CSWftgl = $(DESCRIPTION) SPKG_DESC_CSWftgldevel = FTGL Development Files - -DEP_PKGS_CSWftgl = CSWmesa CSWzlib CSWftype2 CSWfreeglut -CHECKPKG_OVERRIDES_CSWftgl = surplus-dependency|CSWfreeglut RUNTIME_DEP_PKGS_CSWftgldevel = CSWftgl CHECKPKG_OVERRIDES_CSWftgldevel = surplus-dependency|CSWftgl -PKGFILES_CSWftgl = $(PKGFILES_RT) - NOISALIST = 1 # Unless the Solaris 10 compilation problem with both SUNW mesa and CSW mesa # installed exists disable 64 bit for now. 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 Jul 5 10:52:37 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Jul 2013 08:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21440] csw/mgar/pkg/pacparser/trunk Message-ID: Revision: 21440 http://gar.svn.sourceforge.net/gar/?rev=21440&view=rev Author: dmichelsen Date: 2013-07-05 08:52:34 +0000 (Fri, 05 Jul 2013) Log Message: ----------- pacparser/trunk: Update to 1.3.1 Modified Paths: -------------- csw/mgar/pkg/pacparser/trunk/Makefile csw/mgar/pkg/pacparser/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch Modified: csw/mgar/pkg/pacparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 07:31:16 UTC (rev 21439) +++ csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 08:52:34 UTC (rev 21440) @@ -1,6 +1,6 @@ # $Id$ NAME = pacparser -VERSION = 1.2.7 +VERSION = 1.3.1 GARTYPE = v2 DESCRIPTION = A library to parse proxy auto-config (PAC) files @@ -17,34 +17,44 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = 0001-Adjust-Makefile.patch +#PATCHFILES = 0001-Adjust-Makefile.patch -PATCHFILES += 0003-Only-GNU-grep-knows-q.patch -PATCHFILES += 0004-Some-more-Makefile-tweaks.patch -PATCHFILES += 0005-Fix-soname-and-pactester-compilation.patch +#PATCHFILES += 0003-Only-GNU-grep-knows-q.patch +#PATCHFILES += 0004-Some-more-Makefile-tweaks.patch +#PATCHFILES += 0005-Fix-soname-and-pactester-compilation.patch PATCHFILES += 0006-Add-flags-to-make-library-self-sufficient.patch -PATCHFILES += 0007-Add-config-for-spidermonkey-i386.patch +#PATCHFILES += 0007-Add-config-for-spidermonkey-i386.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-Add-spidermonkey-config-for-Solaris-10.patch +PATCHFILES += 0002-Do-not-add-Wall-unconditionally.patch +PATCHFILES += 0003-Search-libpacparser.so-in-current-directory-first-do.patch -PACKAGES = CSWpacparser CSWlibpacparser1 CSWlibpacparser-devel CSWpy-libpacparser -CATALOGNAME_CSWpacparser = pacparser -CATALOGNAME_CSWlibpacparser1 = libpacparser1 -CATALOGNAME_CSWlibpacparser-devel = libpacparser_devel -CATALOGNAME_CSWpy-libpacparser = py_libpacparser +VENDOR_URL = http://code.google.com/p/pacparser/ +PACKAGES += CSWpacparser SPKG_DESC_CSWpacparser = $(DESCRIPTION) -SPKG_DESC_CSWlibpacparser1 = Library libpacparser.so.1 -SPKG_DESC_CSWlibpacparser-devel = Development Files for libpacparser.so -SPKG_DESC_CSWpy-libpacparser = Python Bindings for libpacparser +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpacparser += CSWlibpacparser1 -RUNTIME_DEP_PKGS_CSWpacparser = CSWlibpacparser1 -RUNTIME_DEP_PKGS_CSWlibpacparser-devel = CSWlibpacparser1 -RUNTIME_DEP_PKGS_CSWpy-libpacparser = CSWlibpython2-6-1-0 CSWpython +PACKAGES += CSWlibpacparser1 +SPKG_DESC_CSWlibpacparser1 = A library to parse proxy auto-config (PAC) files, libpacparser.so.1 +PKGFILES_CSWlibpacparser1 += $(call pkgfiles_lib,libpacparser.so.1) -VENDOR_URL = http://code.google.com/p/pacparser/ +PACKAGES += CSWlibpacparser-dev +SPKG_DESC_CSWlibpacparser-dev = Development Files for libpacparser.so.1 +PKGFILES_CSWlibpacparser-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibpacparser-dev += $(docdir)/pacparser/html/.* +PKGFILES_CSWlibpacparser-dev += .*\.c +RUNTIME_DEP_PKGS_CSWlibpacparser-dev += CSWlibpacparser1 +OBSOLETED_BY_CSWlibpacparser-dev += CSWlibpacparser-devel +PACKAGES += CSWpy-libpacparser +SPKG_DESC_CSWpy-libpacparser = Python Bindings for libpacparser +PKGFILES_CSWpy-libpacparser += $(libdir)/python/.* +PKGFILES_CSWpy-libpacparser += .*\.py +RUNTIME_DEP_PKGS_CSWpy-libpacparser += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-libpacparser += CSWpython + # There is some Python stuff in the package PYCOMPILE = 1 @@ -60,26 +70,20 @@ # Tests are run after build TEST_SCRIPTS = +# Needed for 'install' during build and install-phase +BUILD_ENV_PATH = /opt/csw/gnu:$(PATH) +INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) + INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile INSTALL_ARGS = install install-pymod INSTALL_OVERRIDE_DIRS = PREFIX PREFIX=$(prefix) -PKGFILES_CSWlibpacparser1 = $(PKGFILES_RT) -PKGFILES_CSWlibpacparser-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpacparser-devel += $(docdir)/pacparser/html/.* -PKGFILES_CSWlibpacparser-devel += .*\.c -PKGFILES_CSWpy-libpacparser = $(libdir)/python/.* -PKGFILES_CSWpy-libpacparser += .*\.py - include gar/category.mk -# Needed for 'install' during install-phase -PATH := /opt/csw/gnu:$(PATH) - -post-extract-modulated: +post-extract: @# We have patched something in although the package has not been unpacked. @# Make sure it is uncompressed afterwards. -cd $(WORKSRC)/src && gtar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey - $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s) - @$(MAKECOOKIE) + # $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s) + #@$(MAKECOOKIE) Modified: csw/mgar/pkg/pacparser/trunk/checksums =================================================================== --- csw/mgar/pkg/pacparser/trunk/checksums 2013-07-05 07:31:16 UTC (rev 21439) +++ csw/mgar/pkg/pacparser/trunk/checksums 2013-07-05 08:52:34 UTC (rev 21440) @@ -1 +1 @@ -d97cd4136403ee73c1ec6aa96b6708ae pacparser-1.2.7.tar.gz +97010ef3c18f81f8734e3cc3d6f92619 pacparser-1.3.1.tar.gz Added: csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch =================================================================== --- csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch (rev 0) +++ csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch 2013-07-05 08:52:34 UTC (rev 21440) @@ -0,0 +1,63 @@ +From e4aa9f4eb3694d1609c55a7f1282781dbc18212d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Jul 2013 09:57:06 +0200 +Subject: [PATCH 1/3] Add spidermonkey config for Solaris 10 + +--- + src/spidermonkey/js/src/config/SunOS5.10.mk | 44 +++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + create mode 100644 src/spidermonkey/js/src/config/SunOS5.10.mk + +diff --git a/src/spidermonkey/js/src/config/SunOS5.10.mk b/src/spidermonkey/js/src/config/SunOS5.10.mk +new file mode 100644 +index 0000000..b01ec9c +--- /dev/null ++++ b/src/spidermonkey/js/src/config/SunOS5.10.mk +@@ -0,0 +1,44 @@ ++# -*- Mode: makefile -*- ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is Mozilla Communicator client code, released ++# March 31, 1998. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1999 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++# ++# Config stuff for SunOS5.9 ++# ++ ++include $(DEPTH)/config/SunOS5.5.mk +-- +1.8.3.1 + Added: csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch =================================================================== --- csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch (rev 0) +++ csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch 2013-07-05 08:52:34 UTC (rev 21440) @@ -0,0 +1,25 @@ +From 95eac472c83226b233e38406bd3c4f1c00419c1e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Jul 2013 09:58:03 +0200 +Subject: [PATCH 2/3] Do not add -Wall unconditionally + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 84fd389..8c6ccbc 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -55,7 +55,7 @@ ifeq ($(OS_ARCH),Darwin) + endif + endif + +-CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) ++CFLAGS = -g -DXP_UNIX -DVERSION=$(VERSION) + + ifndef PYTHON + PYTHON = python +-- +1.8.3.1 + Added: csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch =================================================================== --- csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch (rev 0) +++ csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch 2013-07-05 08:52:34 UTC (rev 21440) @@ -0,0 +1,35 @@ +From a54c4f8f3c4dcbc5085bf7f36403c769faa29504 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Jul 2013 10:02:05 +0200 +Subject: [PATCH 3/3] Search libpacparser.so in current directory first, do not + use non-generic link option + +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 8c6ccbc..9e2380e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -38,7 +38,7 @@ LIB_VER = 1 + SO_SUFFIX = so + LIBRARY = $(LIBRARY_NAME).$(SO_SUFFIX).$(LIB_VER) + MKSHLIB = $(CC) -shared +-LIB_OPTS = -Wl,-soname=$(LIBRARY) -Wl,-exclude-libs=libjs.a ++LIB_OPTS = -Wl,-soname=$(LIBRARY) + SHFLAGS = -fPIC + SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=__va_copy + +@@ -97,7 +97,7 @@ $(LIBRARY_LINK): $(LIBRARY) + ln -sf $(LIBRARY) $(LIBRARY_LINK) + + pactester: pactester.c pacparser.h $(LIBRARY_LINK) +- $(CC) pactester.c -o pactester -lpacparser -L. -I. ++ $(CC) pactester.c -o pactester -L. -lpacparser -I. + + testpactester: pactester + echo "Running tests for pactester." +-- +1.8.3.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 Fri Jul 5 11:17:56 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Jul 2013 09:17:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21441] csw/mgar/pkg/pacparser/trunk Message-ID: Revision: 21441 http://gar.svn.sourceforge.net/gar/?rev=21441&view=rev Author: dmichelsen Date: 2013-07-05 09:17:53 +0000 (Fri, 05 Jul 2013) Log Message: ----------- pacparser/trunk: Add fixes for i386 Modified Paths: -------------- csw/mgar/pkg/pacparser/trunk/Makefile csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch Modified: csw/mgar/pkg/pacparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 08:52:34 UTC (rev 21440) +++ csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 09:17:53 UTC (rev 21441) @@ -85,5 +85,5 @@ @# We have patched something in although the package has not been unpacked. @# Make sure it is uncompressed afterwards. -cd $(WORKSRC)/src && gtar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey - # $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s) + $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s) #@$(MAKECOOKIE) Modified: csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch =================================================================== --- csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch 2013-07-05 08:52:34 UTC (rev 21440) +++ csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch 2013-07-05 09:17:53 UTC (rev 21441) @@ -1,12 +1,14 @@ -From e4aa9f4eb3694d1609c55a7f1282781dbc18212d Mon Sep 17 00:00:00 2001 +From c7c82be6e1220c59af08cf37af58c98d6a78291d Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Fri, 5 Jul 2013 09:57:06 +0200 -Subject: [PATCH 1/3] Add spidermonkey config for Solaris 10 +Date: Fri, 5 Jul 2013 10:57:23 +0200 +Subject: [PATCH] Add spidermonkey config for Solaris 10 --- - src/spidermonkey/js/src/config/SunOS5.10.mk | 44 +++++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) + src/spidermonkey/js/src/config/SunOS5.10.mk | 44 +++++++++++++++++++++++ + src/spidermonkey/js/src/config/SunOS5.10_i86pc.mk | 44 +++++++++++++++++++++++ + 2 files changed, 88 insertions(+) create mode 100644 src/spidermonkey/js/src/config/SunOS5.10.mk + create mode 100644 src/spidermonkey/js/src/config/SunOS5.10_i86pc.mk diff --git a/src/spidermonkey/js/src/config/SunOS5.10.mk b/src/spidermonkey/js/src/config/SunOS5.10.mk new file mode 100644 @@ -58,6 +60,56 @@ +# + +include $(DEPTH)/config/SunOS5.5.mk +diff --git a/src/spidermonkey/js/src/config/SunOS5.10_i86pc.mk b/src/spidermonkey/js/src/config/SunOS5.10_i86pc.mk +new file mode 100644 +index 0000000..b01ec9c +--- /dev/null ++++ b/src/spidermonkey/js/src/config/SunOS5.10_i86pc.mk +@@ -0,0 +1,44 @@ ++# -*- Mode: makefile -*- ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is Mozilla Communicator client code, released ++# March 31, 1998. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1999 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++# ++# Config stuff for SunOS5.9 ++# ++ ++include $(DEPTH)/config/SunOS5.5.mk -- 1.8.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Fri Jul 5 11:24:09 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 05 Jul 2013 09:24:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21442] csw/mgar/pkg Message-ID: Revision: 21442 http://gar.svn.sourceforge.net/gar/?rev=21442&view=rev Author: opk Date: 2013-07-05 09:24:09 +0000 (Fri, 05 Jul 2013) Log Message: ----------- add duff: duplicate file finder Added Paths: ----------- csw/mgar/pkg/duff/ csw/mgar/pkg/duff/Makefile csw/mgar/pkg/duff/branches/ csw/mgar/pkg/duff/tags/ csw/mgar/pkg/duff/trunk/ csw/mgar/pkg/duff/trunk/Makefile csw/mgar/pkg/duff/trunk/checksums csw/mgar/pkg/duff/trunk/files/ Copied: csw/mgar/pkg/duff/Makefile (from rev 21431, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/duff/Makefile (rev 0) +++ csw/mgar/pkg/duff/Makefile 2013-07-05 09:24:09 UTC (rev 21442) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/duff/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/duff/trunk/Makefile =================================================================== --- csw/mgar/pkg/duff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/duff/trunk/Makefile 2013-07-05 09:24:09 UTC (rev 21442) @@ -0,0 +1,24 @@ +# $Id$ + +NAME = duff +VERSION = 0.5.2 +GARTYPE = v2 + +DESCRIPTION = Duplicate file finder +define BLURB + Duff is a command-line utility for quickly finding duplicates in a given set of + files. It attempts to be usably fast and uses the SHA family of message + digests as a part of the comparisons. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://duff.sourceforge.net/ + +RUNTIME_DEP_PKGS += CSWlibintl8 +PATCHFILES += 0001-add-missing-include.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/duff/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/duff/trunk/checksums =================================================================== --- csw/mgar/pkg/duff/trunk/checksums (rev 0) +++ csw/mgar/pkg/duff/trunk/checksums 2013-07-05 09:24:09 UTC (rev 21442) @@ -0,0 +1 @@ +483f9216ebea14b090e0d71dbf7077ff duff-0.5.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jul 5 11:44:48 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 05 Jul 2013 09:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21443] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21443 http://gar.svn.sourceforge.net/gar/?rev=21443&view=rev Author: slowfranklin Date: 2013-07-05 09:44:44 +0000 (Fri, 05 Jul 2013) Log Message: ----------- tracker/trunk: Update to version 0.16.1, requires glib2 >= 2.35.1 Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile csw/mgar/pkg/tracker/trunk/checksums Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 09:24:09 UTC (rev 21442) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 09:44:44 UTC (rev 21443) @@ -2,8 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tracker -# Tracker version after this require glib2 >= 2.35.1 -VERSION = 0.15.2 +VERSION = 0.16.1 GARTYPE = v2 DESCRIPTION = Gnome Tracker, semantic data storage Modified: csw/mgar/pkg/tracker/trunk/checksums =================================================================== --- csw/mgar/pkg/tracker/trunk/checksums 2013-07-05 09:24:09 UTC (rev 21442) +++ csw/mgar/pkg/tracker/trunk/checksums 2013-07-05 09:44:44 UTC (rev 21443) @@ -1 +1 @@ -dc28cac7eb36b5755cf7b4209b363956 tracker-0.15.2.tar.xz +280438e187afa7e23a83331d8b5ba5f4 tracker-0.16.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jul 5 13:26:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Jul 2013 11:26:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21444] csw/mgar/pkg/xz/trunk Message-ID: Revision: 21444 http://gar.svn.sourceforge.net/gar/?rev=21444&view=rev Author: dmichelsen Date: 2013-07-05 11:26:02 +0000 (Fri, 05 Jul 2013) Log Message: ----------- xz/trunk: Update to 5.0.5 Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/xz/trunk/checksums Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2013-07-05 09:44:44 UTC (rev 21443) +++ csw/mgar/pkg/xz/trunk/Makefile 2013-07-05 11:26:02 UTC (rev 21444) @@ -1,5 +1,5 @@ NAME = xz -VERSION = 5.0.4 +VERSION = 5.0.5 GARTYPE = v2 DESCRIPTION = XZ Utils is free data compression software with high compression ratio Modified: csw/mgar/pkg/xz/trunk/checksums =================================================================== --- csw/mgar/pkg/xz/trunk/checksums 2013-07-05 09:44:44 UTC (rev 21443) +++ csw/mgar/pkg/xz/trunk/checksums 2013-07-05 11:26:02 UTC (rev 21444) @@ -1 +1 @@ -741cd3a5f64b23b7bac56ec5b2258715 xz-5.0.4.tar.bz2 +db44efe0d53ac4317627624b98c63da0 xz-5.0.5.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 Fri Jul 5 13:28:21 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Jul 2013 11:28:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21445] csw/mgar/pkg/zutils/trunk Message-ID: Revision: 21445 http://gar.svn.sourceforge.net/gar/?rev=21445&view=rev Author: dmichelsen Date: 2013-07-05 11:28:21 +0000 (Fri, 05 Jul 2013) Log Message: ----------- zutils/trunk: Update to 1.0 Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch Removed Paths: ------------- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2013-07-05 11:26:02 UTC (rev 21444) +++ csw/mgar/pkg/zutils/trunk/Makefile 2013-07-05 11:28:21 UTC (rev 21445) @@ -1,5 +1,5 @@ NAME = zutils -VERSION = 1.0-rc3 +VERSION = 1.0 GARTYPE = v2 DESCRIPTION = Utilities to deal with compressed and non-compressed files @@ -15,9 +15,8 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/ DISTFILES = $(DISTNAME).tar.lz -PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch +PATCHFILES += 0001-Add-headers-for-kill-2.patch PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch -PATCHFILES += 0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch BUILD_DEP_PKGS += CSWhelp2man BUILD_DEP_PKGS += CSWlzip Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2013-07-05 11:26:02 UTC (rev 21444) +++ csw/mgar/pkg/zutils/trunk/checksums 2013-07-05 11:28:21 UTC (rev 21445) @@ -1 +1 @@ -2a1c6ea7a2f62bde43474d0e39d727c8 zutils-1.0-rc3.tar.lz +26b85fac69e83454d00354635e3f787d zutils-1.0.tar.lz Added: csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch 2013-07-05 11:28:21 UTC (rev 21445) @@ -0,0 +1,53 @@ +From 1bf577c42323a4d018f4d674b7617f6c09379498 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Jul 2013 13:13:37 +0200 +Subject: [PATCH] Add headers for kill(2) + +--- + main.cc | 2 ++ + zcmp.cc | 2 ++ + zdiff.cc | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/main.cc b/main.cc +index f0a66e1..f98ac85 100644 +--- a/main.cc ++++ b/main.cc +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +diff --git a/zcmp.cc b/zcmp.cc +index 0e5b781..52cbe6a 100644 +--- a/zcmp.cc ++++ b/zcmp.cc +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +diff --git a/zdiff.cc b/zdiff.cc +index 14b679e..c5b3ff9 100644 +--- a/zdiff.cc ++++ b/zdiff.cc +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +-- +1.8.3.1 + Deleted: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2013-07-05 11:26:02 UTC (rev 21444) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2013-07-05 11:28:21 UTC (rev 21445) @@ -1,70 +0,0 @@ -From eb0bb7a36ef4f6aaaf43c7aad9390f974d067cb1 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 29 Oct 2012 12:33:21 +0100 -Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h - ---- - main.cc | 3 ++- - zcmp.cc | 3 ++- - zdiff.cc | 3 ++- - zutils.cc | 2 +- - 4 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/main.cc b/main.cc -index 38e6b13..7d5b52d 100644 ---- a/main.cc -+++ b/main.cc -@@ -28,7 +28,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - -diff --git a/zcmp.cc b/zcmp.cc -index 3ebce0e..ec65d30 100644 ---- a/zcmp.cc -+++ b/zcmp.cc -@@ -28,7 +28,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - -diff --git a/zdiff.cc b/zdiff.cc -index 1c329bd..cc8a0b7 100644 ---- a/zdiff.cc -+++ b/zdiff.cc -@@ -28,7 +28,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - -diff --git a/zutils.cc b/zutils.cc -index f65786f..c5abcbf 100644 ---- a/zutils.cc -+++ b/zutils.cc -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - --- -1.7.10.3 - Deleted: csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch 2013-07-05 11:26:02 UTC (rev 21444) +++ csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch 2013-07-05 11:28:21 UTC (rev 21445) @@ -1,25 +0,0 @@ -From f28f9f56e929af03f88e89c8620269ac815a0e8c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 29 Oct 2012 13:12:55 +0100 -Subject: [PATCH] Avoid ambiguity between char* and unsigned long on sparcv9 - ---- - zcat.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zcat.cc b/zcat.cc -index 02ab766..0c2b46a 100644 ---- a/zcat.cc -+++ b/zcat.cc -@@ -45,7 +45,7 @@ public: - str[i] = '0'; - } - if( first_digit_pos > 0 ) str[--first_digit_pos] = '1'; -- else str.insert( 0U, 1, '1' ); -+ else str.insert( (char *) NULL, 1, '1' ); - } - - int sprint( uint8_t * const buf ) --- -1.7.10.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jul 5 13:59:31 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 05 Jul 2013 11:59:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21446] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21446 http://gar.svn.sourceforge.net/gar/?rev=21446&view=rev Author: slowfranklin Date: 2013-07-05 11:59:26 +0000 (Fri, 05 Jul 2013) Log Message: ----------- tracker/trunk: Patch for using psinfo procfs instead of cmdline Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 11:28:21 UTC (rev 21445) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 11:59:26 UTC (rev 21446) @@ -113,6 +113,8 @@ PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch +# submitted upstream +PATCHFILES += 0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch # Packages PACKAGES += CSWtracker Added: csw/mgar/pkg/tracker/trunk/files/0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch 2013-07-05 11:59:26 UTC (rev 21446) @@ -0,0 +1,69 @@ +From d32ac25093d37871c2ce3889314d5db9bb34d1ad Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 5 Jul 2013 13:15:15 +0200 +Subject: [PATCH] Use procfs psinfo instead of cmdline on Solaris + +--- + src/tracker-control/tracker-control-general.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/src/tracker-control/tracker-control-general.c b/src/tracker-control/tracker-control-general.c +index 07231ef..b00c60d 100644 +--- a/src/tracker-control/tracker-control-general.c ++++ b/src/tracker-control/tracker-control-general.c +@@ -24,6 +24,10 @@ + #include + #include + ++#ifdef __sun ++#include ++#endif ++ + #include + #include + #include +@@ -528,7 +532,11 @@ get_uid_for_pid (const gchar *pid_as_string, + gchar *fn; + guint uid; + ++#ifdef __sun /* Solaris */ ++ fn = g_build_filename ("/proc", pid_as_string, "psinfo", NULL); ++#else + fn = g_build_filename ("/proc", pid_as_string, "cmdline", NULL); ++#endif + + f = g_file_new_for_path (fn); + info = g_file_query_info (f, +@@ -667,7 +675,12 @@ tracker_control_general_run (void) + for (l = pids; l; l = l->next) { + GError *error = NULL; + gchar *filename; ++ gchar *basename; ++#ifdef __sun /* Solaris */ ++ psinfo_t psinfo = { 0 }; ++#endif + gchar *contents = NULL; ++ + gchar **strv; + guint uid; + +@@ -691,11 +704,13 @@ tracker_control_general_run (void) + + continue; + } +- ++#ifdef __sun /* Solaris */ ++ memcpy(&psinfo, contents, sizeof(psinfo)); ++ strv = g_strsplit (psinfo.pr_psargs, " ", 2); /* won't work with paths containing spaces :( */ ++#else + strv = g_strsplit (contents, "^@", 2); ++#endif + if (strv && strv[0]) { +- gchar *basename; +- + basename = g_path_get_basename (strv[0]); + + if ((g_str_has_prefix (basename, "tracker") == TRUE || +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Fri Jul 5 16:07:13 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Fri, 05 Jul 2013 14:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21447] csw/mgar/pkg Message-ID: Revision: 21447 http://gar.svn.sourceforge.net/gar/?rev=21447&view=rev Author: opk Date: 2013-07-05 14:07:09 +0000 (Fri, 05 Jul 2013) Log Message: ----------- add qiv - quick image viewer Modified Paths: -------------- csw/mgar/pkg/lang-python/ipython/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/duff/trunk/files/0001-add-missing-include.patch csw/mgar/pkg/qiv/ csw/mgar/pkg/qiv/Makefile csw/mgar/pkg/qiv/branches/ csw/mgar/pkg/qiv/tags/ csw/mgar/pkg/qiv/trunk/ csw/mgar/pkg/qiv/trunk/Makefile csw/mgar/pkg/qiv/trunk/checksums csw/mgar/pkg/qiv/trunk/files/ csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch Added: csw/mgar/pkg/duff/trunk/files/0001-add-missing-include.patch =================================================================== --- csw/mgar/pkg/duff/trunk/files/0001-add-missing-include.patch (rev 0) +++ csw/mgar/pkg/duff/trunk/files/0001-add-missing-include.patch 2013-07-05 14:07:09 UTC (rev 21447) @@ -0,0 +1,25 @@ +From c313817d166996dc0dca1c2d544855debf280c53 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Fri, 5 Jul 2013 00:24:45 +0200 +Subject: [PATCH] add missing include + +--- + src/duffstring.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/duffstring.h b/src/duffstring.h +index 28475a7..20645d9 100644 +--- a/src/duffstring.h ++++ b/src/duffstring.h +@@ -22,6 +22,8 @@ + * distribution. + */ + ++#include ++ + #if !HAVE_VASPRINTF + int vasprintf(char** result, const char* format, va_list vl); + #endif /*HAVE_VASPRINTF*/ +-- +1.8.3.1 + Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2013-07-05 11:59:26 UTC (rev 21446) +++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2013-07-05 14:07:09 UTC (rev 21447) @@ -15,6 +15,7 @@ define BLURB IPython is a replacement for the standard Python shell. endef +LICENSE = COPYING.txt MASTER_SITES = http://archive.ipython.org/release/$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz Copied: csw/mgar/pkg/qiv/Makefile (from rev 21431, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/qiv/Makefile (rev 0) +++ csw/mgar/pkg/qiv/Makefile 2013-07-05 14:07:09 UTC (rev 21447) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/qiv/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/qiv/trunk/Makefile =================================================================== --- csw/mgar/pkg/qiv/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qiv/trunk/Makefile 2013-07-05 14:07:09 UTC (rev 21447) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = qiv +VERSION = 2.2.4 +GARTYPE = v2 + +DESCRIPTION = Quick image viewer +define BLURB + Quick Image Viewer (qiv) is a fast and simple image viewer based + on GDK and imlib. Features include zooming, fullscreen, statusbar, + screensaver mode, brighness/contrast control, transparency, + slideshow, exif autorotation and a browse mode. +endef + +MASTER_SITES = http://spiegl.de/qiv/download/ +DISTFILES = $(DISTNAME).tgz +LICENSE = README.COPYING + +RUNTIME_DEP_PKGS += CSWlibmagic1 CSWlibgdk-x11-2-0-0 CSWlibgdk-pixbuf2-0-0 \ + CSWlibgobject2-0-0 CSWlibimlib2-1 CSWlibglib2-0-0 CSWpango + +PATCHFILES += 0001-adapt-Makefile-for-opencsw.patch +CONFIGURE_SCRIPTS = +BUILD_ARGS = -f Makefile.Solaris +TEST_SCRIPTS = +INSTALL_ARGS = -f Makefile.Solaris + +include gar/category.mk + Property changes on: csw/mgar/pkg/qiv/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/qiv/trunk/checksums =================================================================== --- csw/mgar/pkg/qiv/trunk/checksums (rev 0) +++ csw/mgar/pkg/qiv/trunk/checksums 2013-07-05 14:07:09 UTC (rev 21447) @@ -0,0 +1 @@ +1425f89c90f9c045858fccf24d894c97 qiv-2.2.4.tgz Added: csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch =================================================================== --- csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch (rev 0) +++ csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch 2013-07-05 14:07:09 UTC (rev 21447) @@ -0,0 +1,71 @@ +From 51625c4d79ede0386f6034bd08a113ee626b8aa0 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Fri, 5 Jul 2013 14:56:15 +0200 +Subject: [PATCH] adapt Makefile for opencsw + +--- + Makefile.Solaris | 30 ++++++++++++------------------ + 1 file changed, 12 insertions(+), 18 deletions(-) + +diff --git a/Makefile.Solaris b/Makefile.Solaris +index 3513f4d..74dd04c 100644 +--- a/Makefile.Solaris ++++ b/Makefile.Solaris +@@ -26,11 +26,11 @@ FILTER = 1 + EXTNS = GIF TIFF XPM PNG PPM PNM PGM PCX BMP EIM JPEG SVG WMF ICO + + # Comment this line out if your system doesn't have getopt_long(). +-#GETOPT_LONG = -DHAVE_GETOPT_LONG ++GETOPT_LONG = -DHAVE_GETOPT_LONG + + # This program will be run on the manual page after it is installed. + # If you don't want to compress the manpage, change it to 'true'. +-COMPRESS_PROG = gzip -9f ++COMPRESS_PROG = true + + # Comment this line out if your system doesn't have libXinerama + # installed (for centering on dual-screen) +@@ -47,8 +47,8 @@ MAGIC = -DHAVE_MAGIC + # Do not edit below here! + ###################################################################### + +-CC = gcc +-CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ ++#CC = gcc ++#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ + -fcaller-saves -ffast-math -fno-strength-reduce \ + -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN + +@@ -129,21 +129,15 @@ distclean : clean + + install: $(PROGRAM) + @echo "Installing QIV..." +- @if [ ! -d $(PREFIX)/bin ]; then \ +- install -d -m 0755 $(PREFIX)/bin; \ +- echo install -d -m 0755 $(PREFIX)/bin; \ ++ @if [ ! -d $(DESTDIR)$(bindir) ]; then \ ++ ginstall -d -m 0755 $(DESTDIR)$(bindir); \ ++ echo ginstall -d -m 0755 $(DESTDIR)$(bindir); \ + fi +- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin +- @if [ ! -d $(PREFIX)/man/man1 ]; then \ +- echo install -d -m 0755 $(PREFIX)/man/man1; \ +- install -d -m 0755 $(PREFIX)/man/man1; \ ++ ginstall -s -m 0755 $(PROGRAM) $(DESTDIR)$(bindir) ++ @if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then \ ++ echo ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1; \ ++ ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1; \ + fi +- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 +- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 +- @if ./qiv -f ./intro.jpg ; \ +- then echo "-- Test Passed --" ; \ +- else echo "-- Test Failed --" ; \ +- fi +- @echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" ++ ginstall -m 0644 $(PROGRAM).1 $(DESTDIR)$(mandir)/man1 + + # the end... ;-) +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jul 5 17:05:04 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 05 Jul 2013 15:05:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21448] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21448 http://gar.svn.sourceforge.net/gar/?rev=21448&view=rev Author: slowfranklin Date: 2013-07-05 15:05:02 +0000 (Fri, 05 Jul 2013) Log Message: ----------- tracker/trunk: Add path with /proc/meminfo replacement for Solaris Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/0007-Add-proc-meminfo-replacement-for-Solaris.patch Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 14:07:09 UTC (rev 21447) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-07-05 15:05:02 UTC (rev 21448) @@ -115,6 +115,7 @@ PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch # submitted upstream PATCHFILES += 0006-Use-procfs-psinfo-instead-of-cmdline-on-Solaris.patch +PATCHFILES += 0007-Add-proc-meminfo-replacement-for-Solaris.patch # Packages PACKAGES += CSWtracker Added: csw/mgar/pkg/tracker/trunk/files/0007-Add-proc-meminfo-replacement-for-Solaris.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0007-Add-proc-meminfo-replacement-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0007-Add-proc-meminfo-replacement-for-Solaris.patch 2013-07-05 15:05:02 UTC (rev 21448) @@ -0,0 +1,62 @@ +From d67d0544ba6700b5fa2a69530f52071470ae71f1 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 5 Jul 2013 17:03:18 +0200 +Subject: [PATCH] Add /proc/meminfo replacement for Solaris + +--- + src/libtracker-common/tracker-os-dependant-unix.c | 32 ++++++++++++----------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c +index 79eb837..d23eee1 100644 +--- a/src/libtracker-common/tracker-os-dependant-unix.c ++++ b/src/libtracker-common/tracker-os-dependant-unix.c +@@ -230,7 +230,22 @@ tracker_create_permission_string (struct stat finfo) + static glong + get_memory_total (void) + { +-#if !defined (__OpenBSD__) ++#if defined (__OpenBSD__) ++ glong total = 0; ++ int64_t physmem; ++ size_t len; ++ static gint mib[] = { CTL_HW, HW_PHYSMEM64 }; ++ ++ len = sizeof (physmem); ++ ++ if (sysctl (mib, G_N_ELEMENTS (mib), &physmem, &len, NULL, 0) == -1) { ++ g_critical ("Couldn't get memory information: %d", errno); ++ } else { ++ total = physmem; ++ } ++#elif defined (__sun) ++ glong total = (glong)sysconf(_SC_PAGESIZE) * (glong)sysconf(_SC_PHYS_PAGES); ++#else + GError *error = NULL; + const gchar *filename; + gchar *contents = NULL; +@@ -264,20 +279,7 @@ get_memory_total (void) + } + g_free (contents); + } +-#else /* OpenBSD */ +- glong total = 0; +- int64_t physmem; +- size_t len; +- static gint mib[] = { CTL_HW, HW_PHYSMEM64 }; +- +- len = sizeof (physmem); +- +- if (sysctl (mib, G_N_ELEMENTS (mib), &physmem, &len, NULL, 0) == -1) { +- g_critical ("Couldn't get memory information: %d", errno); +- } else { +- total = physmem; +- } +-#endif /* !OpenBSD */ ++#endif + + return total; + } +-- +1.8.3.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 Jul 7 15:48:44 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Jul 2013 13:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21449] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 21449 http://gar.svn.sourceforge.net/gar/?rev=21449&view=rev Author: rthurner Date: 2013-07-07 13:48:42 +0000 (Sun, 07 Jul 2013) Log Message: ----------- mercurial: upgrade to hg-2.6.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 2013-07-05 15:05:02 UTC (rev 21448) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-07-07 13:48:42 UTC (rev 21449) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.6.1 +VERSION = 2.6.3 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-07-05 15:05:02 UTC (rev 21448) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-07-07 13:48:42 UTC (rev 21449) @@ -1 +1 @@ -db34e6085b71c33ba250e689b1535101 mercurial-2.6.1.tar.gz +99e311b2202057a259899f67b425e087 mercurial-2.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Jul 7 16:53:27 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Jul 2013 14:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21450] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 21450 http://gar.svn.sourceforge.net/gar/?rev=21450&view=rev Author: rthurner Date: 2013-07-07 14:53:24 +0000 (Sun, 07 Jul 2013) Log Message: ----------- serf: upgrade to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-07-07 13:48:42 UTC (rev 21449) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-07-07 14:53:24 UTC (rev 21450) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.2.0 +VERSION = 1.2.1 DISTNAME = serf-$(VERSION) GARTYPE = v2 @@ -20,24 +20,24 @@ # openssl-1.0 only available for sol-10 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGES += CSWlibserf1-0 -CATALOGNAME_CSWlibserf1-0 = libserf1_0 -SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1 +PACKAGES += CSWlibserf1-2 +CATALOGNAME_CSWlibserf1-2 = libserf1_2 +SPKG_DESC_CSWlibserf1-2 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWbdb48 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibz1 PACKAGES += CSWlibserf-dev CATALOGNAME_CSWlibserf-dev = libserf_dev SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-0 +RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-2 EXTRA_LIB = $(prefix)/bdb48/lib Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2013-07-07 13:48:42 UTC (rev 21449) +++ csw/mgar/pkg/libserf/trunk/checksums 2013-07-07 14:53:24 UTC (rev 21450) @@ -1 +1 @@ -e0055adfb422f30bb5daae29d15df607 serf-1.2.0.tar.bz2 +4f8e76c9c6567aee1d66aba49f76a58b serf-1.2.1.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 Jul 7 21:00:55 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 07 Jul 2013 19:00:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21451] csw/mgar/pkg/gamin/trunk Message-ID: Revision: 21451 http://gar.svn.sourceforge.net/gar/?rev=21451&view=rev Author: guengel Date: 2013-07-07 19:00:51 +0000 (Sun, 07 Jul 2013) Log Message: ----------- Adjusted to current autoconf/automake build system. Development package now depends on CSWlibfam0 due to https://www.opencsw.org/mantis/view.php?id=5085. Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2013-07-07 14:53:24 UTC (rev 21450) +++ csw/mgar/pkg/gamin/trunk/Makefile 2013-07-07 19:00:51 UTC (rev 21451) @@ -3,6 +3,7 @@ NAME = gamin VERSION = 0.1.10 GARTYPE = v2 +GARCOMPILER = SOS12U3 DESCRIPTION = GNOME replacement for FAM which watches for file alterations define BLURB @@ -28,6 +29,8 @@ PATCHFILES += 0003-Enable-64-bit-builds.patch +PATCHFILES += 0004-Adjust-configure.in.patch + VENDOR_URL = http://people.gnome.org/~veillard/gamin/ PACKAGES += CSWlibfam0 @@ -43,19 +46,19 @@ SPKG_DESC_CSWlibgamin-dev = Development files for libgamin-1.so.0 and legacy compat libfam.so.0 PKGFILES_CSWlibgamin-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibgamin-dev += CSWlibgamin1-0 -# That is a legacy-only library, no need to pull it in unless for legacy CSWfam -CHECKPKG_OVERRIDES_CSWlibgamin-dev += missing-dependency|CSWlibfam0 +RUNTIME_DEP_PKGS_CSWlibgamin-dev += CSWlibfam0 PACKAGES += CSWpy-gamin SPKG_DESC_CSWpy-gamin = Python bindings for GAMIN file alteration monitor PKGFILES_CSWpy-gamin += $(libdir)/site-packages/.* RUNTIME_DEP_PKGS_CSWpy-gamin += CSWpython RUNTIME_DEP_PKGS_CSWpy-gamin += CSWlibgamin1-0 +# Build choked when trying to build python for 64bit +CHECKPKG_OVERRIDES_CSWpy-gamin += 64-bit-binaries-missing PACKAGES += CSWgamin SPKG_DESC_CSWgamin = GAMIN file alteration monitor daemon (compatible to FAM) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWgamin += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgamin += CSWlibglib2-0-0 OBSOLETED_BY_CSWgamin += CSWfam @@ -73,13 +76,18 @@ # This is not passed to configure, although it is defined (but wrong) in configure.in EXTRA_CONFIGURE_EXPORTS += ENV_CFLAGS CONFIGURE_ENV_ENV_CFLAGS = $(CFLAGS) +# Build chokes on G_CONST_RETURN +# "gam_subscription.h", line 24: syntax error before or at: char +# "gam_subscription.c", line 144: warning: old-style declaration or incorrect type for: G_CONST_RETURN +EXTRA_CPPFLAGS = -DG_CONST_RETURN=const -# No 64 bit Python yet -CONFIGURE_ARGS-64 += --without-python - CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +# Build chokes with python enabled for +# 64bit +CONFIGURE_ARGS-64 += --without-python + PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc EXTRA_PAX_ARGS += -s ,$(libdir)/python2.6/site-packages,$(libdir)/site-packages, Added: csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch =================================================================== --- csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch (rev 0) +++ csw/mgar/pkg/gamin/trunk/files/0004-Adjust-configure.in.patch 2013-07-07 19:00:51 UTC (rev 21451) @@ -0,0 +1,33 @@ +From 0044c3dd9faee7fdcb0f01174df824f395f518f2 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 7 Jul 2013 17:03:51 +0200 +Subject: [PATCH] Adjust configure.in + +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 87c7320..938f3e7 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.52) + AC_INIT(libgamin) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CANONICAL_SYSTEM + + # get any external flags setting before we start playing with the CFLAGS variable +@@ -31,7 +31,6 @@ AM_PROG_LIBTOOL + + AC_USE_SYSTEM_EXTENSIONS + AC_PROG_CC +-AM_PROG_CC_STDC + AC_HEADER_STDC + AC_PROG_INSTALL + AC_PROG_MAKE_SET +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jul 8 15:44:58 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 08 Jul 2013 13:44:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21452] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21452 http://gar.svn.sourceforge.net/gar/?rev=21452&view=rev Author: cgrzemba Date: 2013-07-08 13:44:55 +0000 (Mon, 08 Jul 2013) Log Message: ----------- cups/trunk: fix for 4649: ownership var dirs Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-07-07 19:00:51 UTC (rev 21451) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-07-08 13:44:55 UTC (rev 21452) @@ -294,7 +294,10 @@ PROTOTYPE_GROUP_lp_group_etc = lp PROTOTYPE_MODIFIERS = lp_group_var -PROTOTYPE_FILES_lp_group_var = $(localstatedir).* +PROTOTYPE_FILES_lp_group_var += $(localstatedir)/cache/.* +PROTOTYPE_FILES_lp_group_var += $(localstatedir)/log/.* +PROTOTYPE_FILES_lp_group_var += $(localstatedir)/run/.* +PROTOTYPE_FILES_lp_group_var += $(localstatedir)/spool/.* PROTOTYPE_GROUP_lp_group_var = lp # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Mon Jul 8 16:32:22 2013 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Mon, 08 Jul 2013 14:32:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21453] csw/mgar/pkg/graphviz/tags/2.28.0/ Message-ID: Revision: 21453 http://gar.svn.sourceforge.net/gar/?rev=21453&view=rev Author: ellson Date: 2013-07-08 14:32:19 +0000 (Mon, 08 Jul 2013) Log Message: ----------- Release 2.28.0 Added Paths: ----------- csw/mgar/pkg/graphviz/tags/2.28.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jul 8 16:35:13 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 08 Jul 2013 14:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21454] csw/mgar/pkg/gstplugins_bad/trunk/Makefile Message-ID: Revision: 21454 http://gar.svn.sourceforge.net/gar/?rev=21454&view=rev Author: cgrzemba Date: 2013-07-08 14:35:12 +0000 (Mon, 08 Jul 2013) Log Message: ----------- gstplugins_bad/trunk: refine build dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-08 14:32:19 UTC (rev 21453) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-08 14:35:12 UTC (rev 21454) @@ -15,10 +15,26 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PACKAGES = CSWgstplugins-bad -BUILD_DEP_PKGS += CSWlibxml2 CSWgtk2 CSWlibx11 CSWlibice CSWlibglade2 CSWlibsm -BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWpango CSWlibatk CSWlibcairo -BUILD_DEP_PKGS += CSWbzip2 CSWfaac CSWlibfaad-dev CSWggettextrt CSWjasper CSWliboil -BUILD_DEP_PKGS += CSWfconfig CSWftype2 +BUILD_DEP_PKGS += CSWlibxml2 +BUILD_DEP_PKGS += CSWgtk2 +BUILD_DEP_PKGS += CSWlibx11 +BUILD_DEP_PKGS += CSWlibice +BUILD_DEP_PKGS += CSWlibglade2 +BUILD_DEP_PKGS += CSWlibsm +BUILD_DEP_PKGS += CSWgstreamer +BUILD_DEP_PKGS += CSWgstplugins-dev +BUILD_DEP_PKGS += CSWglib2 +BUILD_DEP_PKGS += CSWpango +BUILD_DEP_PKGS += CSWlibatk +BUILD_DEP_PKGS += CSWlibcairo +BUILD_DEP_PKGS += CSWbzip2 +BUILD_DEP_PKGS += CSWfaac +BUILD_DEP_PKGS += CSWlibfaad-dev +BUILD_DEP_PKGS += CSWggettextrt +BUILD_DEP_PKGS += CSWjasper +BUILD_DEP_PKGS += CSWliboil +BUILD_DEP_PKGS += CSWfconfig +BUILD_DEP_PKGS += CSWftype2 GARCOMPILER = GCC4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jul 8 17:07:44 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 08 Jul 2013 15:07:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21455] csw/mgar/pkg/scm/trunk Message-ID: Revision: 21455 http://gar.svn.sourceforge.net/gar/?rev=21455&view=rev Author: pfelecan Date: 2013-07-08 15:07:38 +0000 (Mon, 08 Jul 2013) Log Message: ----------- upstream version bump Modified Paths: -------------- csw/mgar/pkg/scm/trunk/Makefile csw/mgar/pkg/scm/trunk/checksums csw/mgar/pkg/scm/trunk/files/0004-Use-gcc-in-Makefile.patch Modified: csw/mgar/pkg/scm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scm/trunk/Makefile 2013-07-08 14:35:12 UTC (rev 21454) +++ csw/mgar/pkg/scm/trunk/Makefile 2013-07-08 15:07:38 UTC (rev 21455) @@ -1,8 +1,8 @@ # $Id$ NAME = scm -VERSION = 5e7 -SLIB_VERSION = 3b3 +VERSION = 5f1 +SLIB_VERSION = 3b4 GARTYPE = v2 DESCRIPTION = The Algorithmic Language Scheme Modified: csw/mgar/pkg/scm/trunk/checksums =================================================================== --- csw/mgar/pkg/scm/trunk/checksums 2013-07-08 14:35:12 UTC (rev 21454) +++ csw/mgar/pkg/scm/trunk/checksums 2013-07-08 15:07:38 UTC (rev 21455) @@ -1,2 +1,2 @@ -d53c0e7f11e468a40222f59a37a71edf scm-5e7.zip -11626eef380de4f56d3082514559beb6 slib-3b3.tar.gz +98be8275f5c69d234c55a8a995a500dd scm-5f1.zip +dcada65c4df4209c8f71211095bcef8e slib-3b4.tar.gz Modified: csw/mgar/pkg/scm/trunk/files/0004-Use-gcc-in-Makefile.patch =================================================================== --- csw/mgar/pkg/scm/trunk/files/0004-Use-gcc-in-Makefile.patch 2013-07-08 14:35:12 UTC (rev 21454) +++ csw/mgar/pkg/scm/trunk/files/0004-Use-gcc-in-Makefile.patch 2013-07-08 15:07:38 UTC (rev 21455) @@ -1,6 +1,6 @@ -From b38a7aae12b4b5102bb5c1ceeb6ab4be10fc2fe7 Mon Sep 17 00:00:00 2001 +From cb8af8d92f6e61c8ccb86ebc41ad75b7e121c1b1 Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Fri, 1 Feb 2013 13:31:22 +0100 +Date: Mon, 8 Jul 2013 16:03:40 +0200 Subject: [PATCH] Use gcc in Makefile --- @@ -8,12 +8,12 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index cf1b2b9..4aab1c4 100644 +index d0ffbf6..8b877a6 100644 --- a/Makefile +++ b/Makefile -@@ -35,7 +35,7 @@ CHPAT = $(HOME)/bin/chpat - RSYNC = rsync -av - Uploadee = csail +@@ -47,7 +47,7 @@ SETARCH = env DYLD_NO_PIE=1 + # Fedora-Core-1 + #SETARCH = setarch i386 -#CC = gcc +CC = gcc @@ -21,5 +21,5 @@ #LIBS = #LD = $(CC) -g -- -1.8.1 +1.8.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jul 8 17:32:27 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 08 Jul 2013 15:32:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21456] csw/mgar/pkg/slib/trunk Message-ID: Revision: 21456 http://gar.svn.sourceforge.net/gar/?rev=21456&view=rev Author: pfelecan Date: 2013-07-08 15:32:26 +0000 (Mon, 08 Jul 2013) Log Message: ----------- upstream version bump Modified Paths: -------------- csw/mgar/pkg/slib/trunk/Makefile csw/mgar/pkg/slib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/slib/trunk/files/0005-Do-not-compress-info-file.patch Modified: csw/mgar/pkg/slib/trunk/Makefile =================================================================== --- csw/mgar/pkg/slib/trunk/Makefile 2013-07-08 15:07:38 UTC (rev 21455) +++ csw/mgar/pkg/slib/trunk/Makefile 2013-07-08 15:32:26 UTC (rev 21456) @@ -1,7 +1,7 @@ # $Id$ NAME = slib -VERSION = 3b3 +VERSION = 3b4 GARTYPE = v2 DESCRIPTION = A portable Scheme library @@ -13,8 +13,9 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Fix-configure-shebang.patch PATCHFILES += 0002-Fix-slib-script-shebang.patch -PATCHFILES += 0003-Adapt-to-Guile-2.patch +#PATCHFILES += 0003-Adapt-to-Guile-2.patch PATCHFILES += 0004-Force-libraries-directory.patch +PATCHFILES += 0005-Do-not-compress-info-file.patch PACKAGES = CSWslib CATALOGNAME_CSWslib = slib Modified: csw/mgar/pkg/slib/trunk/checksums =================================================================== --- csw/mgar/pkg/slib/trunk/checksums 2013-07-08 15:07:38 UTC (rev 21455) +++ csw/mgar/pkg/slib/trunk/checksums 2013-07-08 15:32:26 UTC (rev 21456) @@ -1 +1 @@ -11626eef380de4f56d3082514559beb6 slib-3b3.tar.gz +dcada65c4df4209c8f71211095bcef8e slib-3b4.tar.gz Added: csw/mgar/pkg/slib/trunk/files/0005-Do-not-compress-info-file.patch =================================================================== --- csw/mgar/pkg/slib/trunk/files/0005-Do-not-compress-info-file.patch (rev 0) +++ csw/mgar/pkg/slib/trunk/files/0005-Do-not-compress-info-file.patch 2013-07-08 15:32:26 UTC (rev 21456) @@ -0,0 +1,34 @@ +From 3ac648c430aa319daee17c52dee48e6b89b4cf63 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 8 Jul 2013 17:30:08 +0200 +Subject: [PATCH] Do not compress info file + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 1e266bd..e0c621d 100644 +--- a/Makefile ++++ b/Makefile +@@ -197,7 +197,7 @@ install-info: $(DESTDIR)$(infodir)slib.info + info: install-info + $(DESTDIR)$(infodir)slib.info.gz: $(DESTDIR)$(infodir)slib.info + gzip -f $< +-install-infoz: $(DESTDIR)$(infodir)slib.info.gz ++install-infoz: $(DESTDIR)$(infodir)slib.info + infoz: install-infoz + + slib.doc: slib.1 +@@ -205,7 +205,7 @@ slib.doc: slib.1 + install-man: slib.1 installdirs + -$(INSTALL_DATA) $< $(DESTDIR)$(mandir)man1/ + +-docs: $(DESTDIR)$(infodir)slib.info.gz \ ++docs: $(DESTDIR)$(infodir)slib.info \ + $(DESTDIR)$(htmldir)slib_toc.html slib.dvi \ + $(DESTDIR)$(pdfdir)slib.pdf \ + slib.doc +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 8 17:52:30 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 08 Jul 2013 15:52:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21457] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 21457 http://gar.svn.sourceforge.net/gar/?rev=21457&view=rev Author: chninkel Date: 2013-07-08 15:52:29 +0000 (Mon, 08 Jul 2013) Log Message: ----------- gar/v2: increase pkgname and catalogname field size in sql database to support Solaris 5.11 long system package names 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 2013-07-08 15:32:26 UTC (rev 21456) +++ csw/mgar/gar/v2/lib/python/models.py 2013-07-08 15:52:29 UTC (rev 21457) @@ -105,8 +105,8 @@ class Pkginst(sqlobject.SQLObject): - pkgname = sqlobject.UnicodeCol(length=50, unique=True, notNone=True) - catalogname = sqlobject.UnicodeCol(default=None, length=50) + pkgname = sqlobject.UnicodeCol(length=250, unique=True, notNone=True) + catalogname = sqlobject.UnicodeCol(default=None, length=250) pkg_desc = sqlobject.UnicodeCol(default=None, length=250) srv4_files = sqlobject.MultipleJoin('Srv4FileStats') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jul 8 18:34:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 08 Jul 2013 16:34:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21458] csw/mgar/pkg/slib/trunk Message-ID: Revision: 21458 http://gar.svn.sourceforge.net/gar/?rev=21458&view=rev Author: pfelecan Date: 2013-07-08 16:33:59 +0000 (Mon, 08 Jul 2013) Log Message: ----------- slib/trunk: correct default scheme library path Modified Paths: -------------- csw/mgar/pkg/slib/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch Modified: csw/mgar/pkg/slib/trunk/Makefile =================================================================== --- csw/mgar/pkg/slib/trunk/Makefile 2013-07-08 15:52:29 UTC (rev 21457) +++ csw/mgar/pkg/slib/trunk/Makefile 2013-07-08 16:33:59 UTC (rev 21458) @@ -16,6 +16,7 @@ #PATCHFILES += 0003-Adapt-to-Guile-2.patch PATCHFILES += 0004-Force-libraries-directory.patch PATCHFILES += 0005-Do-not-compress-info-file.patch +PATCHFILES += 0006-Correct-default-scheme-library-path.patch PACKAGES = CSWslib CATALOGNAME_CSWslib = slib Added: csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch =================================================================== --- csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch (rev 0) +++ csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch 2013-07-08 16:33:59 UTC (rev 21458) @@ -0,0 +1,39 @@ +From 9c6742763d01e5dafd1ea443a9a1e2a5fb4a21e0 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 8 Jul 2013 18:28:39 +0200 +Subject: [PATCH] Correct default scheme library path + +--- + slib.sh | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/slib.sh b/slib.sh +index fd0ef04..bf4c69c 100644 +--- a/slib.sh ++++ b/slib.sh +@@ -106,19 +106,15 @@ case $implementation in + fi + fi + if [ -z "${SCHEME_LIBRARY_PATH}" ]; then +- if [ -d /usr/local/lib/slib/ ]; then +- SCHEME_LIBRARY_PATH=/usr/local/lib/slib/ +- elif [ -d /usr/share/slib/ ]; then +- SCHEME_LIBRARY_PATH=/usr/share/slib/ +- fi +- export SCHEME_LIBRARY_PATH ++ SCHEME_LIBRARY_PATH=/opt/csw/share/guile/slib ++ export SCHEME_LIBRARY_PATH + fi;; + esac + + # for gambit + case $implementation in + gam) if [ -z "${LD_LIBRARY_PATH}" ]; then +- LD_LIBRARY_PATH=/usr/local/lib ++ LD_LIBRARY_PATH=/opt/csw/lib + export LD_LIBRARY_PATH + fi;; + esac +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 8 19:36:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 08 Jul 2013 17:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21459] csw/mgar/pkg/monit/trunk Message-ID: Revision: 21459 http://gar.svn.sourceforge.net/gar/?rev=21459&view=rev Author: chninkel Date: 2013-07-08 17:36:28 +0000 (Mon, 08 Jul 2013) Log Message: ----------- monit/trunk: updated to 5.5.1 Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile csw/mgar/pkg/monit/trunk/checksums Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2013-07-08 16:33:59 UTC (rev 21458) +++ csw/mgar/pkg/monit/trunk/Makefile 2013-07-08 17:36:28 UTC (rev 21459) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = monit -VERSION = 4.10.1 +VERSION = 5.5.1 GARTYPE = v2 DESCRIPTION = Utility for monitoring and managing daemons or similar programs @@ -18,7 +18,6 @@ #PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch #PATCHFILES += 0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch -CHECKPKG_OVERRIDES_CSWmonit = file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1 CHECKPKG_OVERRIDES_CSWmonit += $(CHECKPKG_OVERRIDES_CSWmonit_$(GARCH)) CHECKPKG_OVERRIDES_CSWmonit_sparc += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/monit CHECKPKG_OVERRIDES_CSWmonit_i386 = file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit @@ -27,6 +26,8 @@ #GARCOMPILER = GNU # We build the 64 bits version to be have >2 Go file support +# and because monit build system is configured to build in +# 64 bits mode under Solaris BUILD64_ONLY = 1 ISA_DEFAULT_sparc = sparcv9 ISA_DEFAULT_i386 = amd64 Modified: csw/mgar/pkg/monit/trunk/checksums =================================================================== --- csw/mgar/pkg/monit/trunk/checksums 2013-07-08 16:33:59 UTC (rev 21458) +++ csw/mgar/pkg/monit/trunk/checksums 2013-07-08 17:36:28 UTC (rev 21459) @@ -1 +1 @@ -d3143b0bbd79b53f1b019d2fc1dae656 monit-4.10.1.tar.gz +16f3809a27fb1d40156e7ad275460645 monit-5.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 8 21:06:02 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 08 Jul 2013 19:06:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21460] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 21460 http://gar.svn.sourceforge.net/gar/?rev=21460&view=rev Author: chninkel Date: 2013-07-08 19:05:54 +0000 (Mon, 08 Jul 2013) Log Message: ----------- sasl/trunk: added info about sasl group in README.CSW Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sasl/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/sasl/trunk/files/README.CSW.sasl csw/mgar/pkg/sasl/trunk/files/README.CSW.saslauthd Removed Paths: ------------- csw/mgar/pkg/sasl/trunk/files/README.saslauthd Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-07-08 17:36:28 UTC (rev 21459) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-07-08 19:05:54 UTC (rev 21460) @@ -267,13 +267,13 @@ install-doc: mkdir -p $(DESTDIR)$(docdir)/sasl - cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW + cp $(WORKDIR)/README.CSW.sasl $(DESTDIR)$(docdir)/sasl/README.CSW list='$(DOC_FILES)'; for file in $$list; do \ $(SED_USR_LOCAL) $(WORKSRC)/doc/$$file > $(DESTDIR)$(docdir)/sasl/$$file; \ done mkdir -p $(DESTDIR)$(docdir)/saslauthd $(SED_USR_LOCAL) $(WORKSRC)/saslauthd/LDAP_SASLAUTHD > $(DESTDIR)$(docdir)/saslauthd/LDAP_SASLAUTHD - cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW + cp $(WORKDIR)/README.CSW.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW fix-path-manpages: for f in $(DESTDIR)$(mandir)/*/*.? ; do \ Copied: csw/mgar/pkg/sasl/trunk/files/README.CSW.sasl (from rev 20971, csw/mgar/pkg/sasl/trunk/files/README.sasl) =================================================================== --- csw/mgar/pkg/sasl/trunk/files/README.CSW.sasl (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/README.CSW.sasl 2013-07-08 19:05:54 UTC (rev 21460) @@ -0,0 +1,12 @@ +sasl README +----------- + + * The location of `sasldb2' has been moved from /opt/csw/etc to + /etc/opt/csw. + + * SASL application configuration files (e.g. Sendmail.conf) go into + /opt/csw/lib/sasl2 or /opt/csw/lib/64/sasl2 for 64-bit binaries. + + * CSWsasl creates a group 'sasl'. Any process which is not running as root, + must belong to this group to perform authentication against SASLdb or via saslauthd. + Copied: csw/mgar/pkg/sasl/trunk/files/README.CSW.saslauthd (from rev 20971, csw/mgar/pkg/sasl/trunk/files/README.saslauthd) =================================================================== --- csw/mgar/pkg/sasl/trunk/files/README.CSW.saslauthd (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/README.CSW.saslauthd 2013-07-08 19:05:54 UTC (rev 21460) @@ -0,0 +1,21 @@ +saslauthd README +---------------- + +The configuration file for the saslauthd startup script is + + /etc/opt/csw/saslauthd.init + +Please note, that prior starting the saslauthd daemon, you have to set +a mechanism this file, or the saslauthd daemon won't start. + +The Configuration file for saslauthd daemon is located in + + /etc/opt/csw/saslauthd.conf + +You may change this by ajdusting /etc/opt/csw/saslauth.init. Details +concerning /etc/opt/csw/saslauthd.conf can be found in +/opt/csw/share/doc/saslauthd/LDAP_SASLAUTHD + +If you experience memory leak with PAM mechanism, then try to disable +worker processes with -n 0. It may affect performance, because +saslauthd will spawn a new process for each authentication. Deleted: csw/mgar/pkg/sasl/trunk/files/README.saslauthd =================================================================== --- csw/mgar/pkg/sasl/trunk/files/README.saslauthd 2013-07-08 17:36:28 UTC (rev 21459) +++ csw/mgar/pkg/sasl/trunk/files/README.saslauthd 2013-07-08 19:05:54 UTC (rev 21460) @@ -1,21 +0,0 @@ -saslauthd README ----------------- - -The configuration file for the saslauthd startup script is - - /etc/opt/csw/saslauthd.init - -Please note, that prior starting the saslauthd daemon, you have to set -a mechanism this file, or the saslauthd daemon won't start. - -The Configuration file for saslauthd daemon is located in - - /etc/opt/csw/saslauthd.conf - -You may change this by ajdusting /etc/opt/csw/saslauth.init. Details -concerning /etc/opt/csw/saslauthd.conf can be found in -/opt/csw/share/doc/saslauthd/LDAP_SASLAUTHD - -If you experience memory leak with PAM mechanism, then try to disable -worker processes with -n 0. It may affect performance, because -saslauthd will spawn a new process for each authentication. Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-07-08 17:36:28 UTC (rev 21459) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-07-08 19:05:54 UTC (rev 21460) @@ -1,3 +1,10 @@ +sasl (2.1.25,REV=2013.07.08) + + * Updated README.CSW for sasl package to add information about + sasl group. + + -- Yann Rouillard Mon, 08 Jul 2013 21:01:23 +0200 + sasl (2.1.25,REV=2012.04.22) * Fixed core dump when using gss (dmichelsen) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 8 21:09:01 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 08 Jul 2013 19:09:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21461] csw/mgar/pkg/sasl/trunk/Makefile Message-ID: Revision: 21461 http://gar.svn.sourceforge.net/gar/?rev=21461&view=rev Author: chninkel Date: 2013-07-08 19:09:01 +0000 (Mon, 08 Jul 2013) Log Message: ----------- sasl/trunk: updated DISTFILES to follow README files rename Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-07-08 19:05:54 UTC (rev 21460) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-07-08 19:09:01 UTC (rev 21461) @@ -19,8 +19,8 @@ DISTFILES += cswsaslauthd.init DISTFILES += saslauthd.init.CSW DISTFILES += saslauthd.conf.CSW -DISTFILES += README.sasl -DISTFILES += README.saslauthd +DISTFILES += README.CSW.sasl +DISTFILES += README.CSW.saslauthd DISTFILES += changelog.CSW DISTFILES += CSWsaslauthd.postmsg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 00:51:42 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 08 Jul 2013 22:51:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21462] csw/mgar/pkg/sasl/trunk/files/README.sasl Message-ID: Revision: 21462 http://gar.svn.sourceforge.net/gar/?rev=21462&view=rev Author: chninkel Date: 2013-07-08 22:51:36 +0000 (Mon, 08 Jul 2013) Log Message: ----------- sasl/trunk: remove obsolete README.sasl file Removed Paths: ------------- csw/mgar/pkg/sasl/trunk/files/README.sasl Deleted: csw/mgar/pkg/sasl/trunk/files/README.sasl =================================================================== --- csw/mgar/pkg/sasl/trunk/files/README.sasl 2013-07-08 19:09:01 UTC (rev 21461) +++ csw/mgar/pkg/sasl/trunk/files/README.sasl 2013-07-08 22:51:36 UTC (rev 21462) @@ -1,8 +0,0 @@ -sasl README ------------ - - * The location of `sasldb2' has been moved from /opt/csw/etc to - /etc/opt/csw. - - * SASL application configuration files (e.g. Sendmail.conf) go into - /opt/csw/lib/sasl2 or /opt/csw/lib/64/sasl2 for 64-bit binaries. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 9 11:07:11 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Jul 2013 09:07:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21463] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21463 http://gar.svn.sourceforge.net/gar/?rev=21463&view=rev Author: cgrzemba Date: 2013-07-09 09:07:07 +0000 (Tue, 09 Jul 2013) Log Message: ----------- cups/trunk: fix typo in check pkg override Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-07-08 22:51:36 UTC (rev 21462) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-07-09 09:07:07 UTC (rev 21463) @@ -99,7 +99,7 @@ PKGFILES_CSWphp5-cups += $(prefix)/php5/.* RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibcups2 # lib is located in /opt/csw/php5, not in csw standard bin path -CHECKPKG_OVERRIDES_CSWphp5-cups += 64bits-binaries-missing +CHECKPKG_OVERRIDES_CSWphp5-cups += 64bit-binaries-missing # The daemon PACKAGES += CSWcupsd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 9 11:22:53 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Jul 2013 09:22:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21464] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21464 http://gar.svn.sourceforge.net/gar/?rev=21464&view=rev Author: cgrzemba Date: 2013-07-09 09:22:53 +0000 (Tue, 09 Jul 2013) Log Message: ----------- cups/trunk: fix typo in check pkg override, 2nd attempt Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-07-09 09:07:07 UTC (rev 21463) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-07-09 09:22:53 UTC (rev 21464) @@ -99,7 +99,7 @@ PKGFILES_CSWphp5-cups += $(prefix)/php5/.* RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibcups2 # lib is located in /opt/csw/php5, not in csw standard bin path -CHECKPKG_OVERRIDES_CSWphp5-cups += 64bit-binaries-missing +CHECKPKG_OVERRIDES_CSWphp5-cups += 64-bit-binaries-missing # The daemon PACKAGES += CSWcupsd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jul 9 11:36:05 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 09 Jul 2013 09:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21465] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 21465 http://gar.svn.sourceforge.net/gar/?rev=21465&view=rev Author: pfelecan Date: 2013-07-09 09:35:59 +0000 (Tue, 09 Jul 2013) Log Message: ----------- lang-python/pyqt/trunk: - corrected build dependency macro name - added internal sub-packages necessary dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-09 09:22:53 UTC (rev 21464) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-09 09:35:59 UTC (rev 21465) @@ -20,8 +20,8 @@ PATCHFILES += 0001-disable-ocsw-unsupported-modules.patch PATCHFILES += 0002-force-xpg6-where-not-set-by-configure.patch -BUILD_DEPS_PKG += CSWqt4-dev -BUILD_DEPS_PKG += CSWpy-sip +BUILD_DEP_PKGS += CSWqt4-dev +BUILD_DEP_PKGS += CSWpy-sip GARCOMPILER = GNU EXTRA_CFLAGS += -std=gnu99 -D_XPG6 @@ -68,7 +68,9 @@ RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqttest4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWpy-pyqt-common CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpy-pyqt-common CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 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 Jul 9 13:13:45 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Jul 2013 11:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21466] csw/mgar/pkg/sqsh/trunk Message-ID: Revision: 21466 http://gar.svn.sourceforge.net/gar/?rev=21466&view=rev Author: dmichelsen Date: 2013-07-09 11:13:45 +0000 (Tue, 09 Jul 2013) Log Message: ----------- sqsh/trunk: Update to 2.2.0 Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile csw/mgar/pkg/sqsh/trunk/checksums Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2013-07-09 09:35:59 UTC (rev 21465) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2013-07-09 11:13:45 UTC (rev 21466) @@ -1,5 +1,5 @@ NAME = sqsh -VERSION = 2.1.7 +VERSION = 2.2.0 GARTYPE = v2 # Sybase is available on Solaris 9 sparc 32 and 64 bit and Solaris 10 amd64 @@ -33,7 +33,7 @@ SF_PROJECT = sqsh MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tgz EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs Modified: csw/mgar/pkg/sqsh/trunk/checksums =================================================================== --- csw/mgar/pkg/sqsh/trunk/checksums 2013-07-09 09:35:59 UTC (rev 21465) +++ csw/mgar/pkg/sqsh/trunk/checksums 2013-07-09 11:13:45 UTC (rev 21466) @@ -1 +1 @@ -ce929dc8e23cedccac98288d24785e2d sqsh-2.1.7.tar.gz +63bb429edfcb2491dbf4a158f52d6361 sqsh-2.2.0.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 15:21:28 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 13:21:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21467] csw/mgar/pkg/monit/trunk/Makefile Message-ID: Revision: 21467 http://gar.svn.sourceforge.net/gar/?rev=21467&view=rev Author: chninkel Date: 2013-07-09 13:21:25 +0000 (Tue, 09 Jul 2013) Log Message: ----------- monit/trunk: move configuration files to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2013-07-09 11:13:45 UTC (rev 21466) +++ csw/mgar/pkg/monit/trunk/Makefile 2013-07-09 13:21:25 UTC (rev 21467) @@ -23,7 +23,11 @@ CHECKPKG_OVERRIDES_CSWmonit_i386 = file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit +MIGRATE_FILES_CSWmonit = monitrc +MIGRATE_SOURCE_DIR = $(prefix)/etc/ +MIGRATE_DEST_DIR = $(sysconfdir)/ + #GARCOMPILER = GNU # We build the 64 bits version to be have >2 Go file support # and because monit build system is configured to build in @@ -42,10 +46,5 @@ TEST_SCRIPTS = -# Revert to the old configuration path -# so we don't change anything -# for the ssl update -sysconfdir = $(prefix)/etc - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 15:27:07 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 13:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21468] csw/mgar/pkg/sasl/trunk/files Message-ID: Revision: 21468 http://gar.svn.sourceforge.net/gar/?rev=21468&view=rev Author: chninkel Date: 2013-07-09 13:27:06 +0000 (Tue, 09 Jul 2013) Log Message: ----------- sasl/trunk: fixed init script so it doesn't use stop/start function names that are already sh reserved keywords Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/files/changelog.CSW csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-07-09 13:21:25 UTC (rev 21467) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-07-09 13:27:06 UTC (rev 21468) @@ -1,7 +1,9 @@ -sasl (2.1.25,REV=2013.07.08) +sasl (2.1.25,REV=2013.07.09) * Updated README.CSW for sasl package to add information about sasl group. + * Fixed init script so it doesn't use stop/start function names that are + already sh reserved keywords. -- Yann Rouillard Mon, 08 Jul 2013 21:01:23 +0200 Modified: csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2013-07-09 13:21:25 UTC (rev 21467) +++ csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2013-07-09 13:27:06 UTC (rev 21468) @@ -41,13 +41,14 @@ PARAMS="${PARAMS} -O ${CONFIG_FILE}" fi -start() { + +start_daemon() { echo "Starting saslauthd " /opt/csw/sbin/saslauthd ${PARAMS} echo } -stop() { +stop_daemon() { if test "x`pgrep -x saslauthd`" != x; then echo "Stopping saslauthd " pkill saslauthd @@ -57,14 +58,14 @@ case "$1" in start) - start + start_daemon ;; stop) - stop + stop_daemon ;; restart) - stop - start + stop_daemon + start\xC3_daemon ;; *) echo $"Usage: $0 {start|stop|restart}" 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 Jul 9 15:45:09 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Jul 2013 13:45:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21469] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 21469 http://gar.svn.sourceforge.net/gar/?rev=21469&view=rev Author: dmichelsen Date: 2013-07-09 13:45:09 +0000 (Tue, 09 Jul 2013) Log Message: ----------- sqsh/trunk: Update overrides Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2013-07-09 13:27:06 UTC (rev 21468) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2013-07-09 13:45:09 UTC (rev 21469) @@ -70,6 +70,9 @@ CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcomn.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybintl.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybintl64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += surplus-dependency|CSWlibreadline6 # This is for /usr/local/lib/sqsh/help, this is not in the distribution, don't know where to find that, ignore for now. CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/sqsh-ocs CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/sqsh-ocs @@ -82,6 +85,7 @@ RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWlibreadline6 # This is for /usr/local/lib/sqsh/help in sqsh, this is not in the distribution, don't know where to find that, ignore for now. CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/sqsh-freetds +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/i386/sqsh-freetds CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/sqsh-freetds CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/sqsh-freetds CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/sqsh-freetds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 16:20:44 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 14:20:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21470] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 21470 http://gar.svn.sourceforge.net/gar/?rev=21470&view=rev Author: chninkel Date: 2013-07-09 14:20:43 +0000 (Tue, 09 Jul 2013) Log Message: ----------- openssl1/trunk: removed checkinstall, preinstall and postinstall scripts that are not necessary anymore (Solaris 8 support and old modification of certificates location) Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.postinstall csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.preinstall Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-07-09 13:45:09 UTC (rev 21469) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-07-09 14:20:43 UTC (rev 21470) @@ -79,7 +79,6 @@ MASTER_SITES = http://www.openssl.org/source/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWlibssl1-0-0.checkinstall CSWlibssl1-0-0.preinstall CSWlibssl1-0-0.postinstall DISTFILES += changelog.CSW README.CSW DISTFILES += map.openssl.libcrypto map.openssl.libssl map.openssl.engines Deleted: csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall 2013-07-09 13:45:09 UTC (rev 21469) +++ csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall 2013-07-09 14:20:43 UTC (rev 21470) @@ -1,48 +0,0 @@ -#!/bin/sh - -PLATFORM=`/usr/bin/uname -p` -VERSION=`/usr/bin/uname -r` - -# Solaris 8 requires patches to have /dev/random and /dev/urandom. -if [ $VERSION -eq "5.8" ]; then - - if [ ! -c $PKG_ROOT_DIR/dev/random ] && [ ! -p $PKG_ROOT_DIR/dev/random ]; then - echo "ERROR: /dev/random must exist." - err=1 - fi - - if [ ! -c $PKG_ROOT_DIR/dev/urandom ] && [ ! -p $PKG_ROOT_DIR/dev/urandom ]; then - echo "ERROR: /dev/urandom must exist." - err=1 - fi - - if [ "$err" = "1" ]; then - if [ $PLATFORM -eq "sparc" ]; then - echo "Please install patch 112438." - elif [ $PLATFORM -eq "i386" ]; then - echo "Please install patch 112439." - fi - exit 1 - fi -fi - -# Certification Authority have been moved under /opt/csw/etc/ssl/certs -# under the ca_certificates package control -# and /opt/csw/ssl/certs is now a symbolic links - -# we test if certificates were manually installed in this directory -if [ ! -h "/opt/csw/ssl/certs" ] && [ -d "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then - - echo "Custom certificates have been installed in /opt/csw/ssl/certs/." - echo "They will be moved under /opt/csw/etc/ssl/certs." - echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information" - echo "about CA." - - # we define the MOVE_CERTS variable so preinstall and postinstall scripts - # will now they have to do something about theses certificates - cat >>$1 < Tue, 09 Jul 2013 16:14:39 +0200 + openssl (1.0.1e,rev=2013.03.22) unstable * Fixed missing 64 bits libraries bug This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 16:26:58 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 14:26:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21471] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 21471 http://gar.svn.sourceforge.net/gar/?rev=21471&view=rev Author: chninkel Date: 2013-07-09 14:26:58 +0000 (Tue, 09 Jul 2013) Log Message: ----------- openssl/trunk: removed checkinstall, preinstall and postinstall scripts that are not necessary anymore (Solaris 8 support and old modification of certificates location) Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.checkinstall csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.postinstall csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.preinstall Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2013-07-09 14:20:43 UTC (rev 21470) +++ csw/mgar/pkg/openssl/trunk/Makefile 2013-07-09 14:26:58 UTC (rev 21471) @@ -136,7 +136,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWopenssl.prototype -DISTFILES += CSWlibssl0-9-8.checkinstall CSWlibssl0-9-8.preinstall CSWlibssl0-9-8.postinstall CSWlibssl0-9-8.prototype-i386 CSWlibssl0-9-8.prototype-sparc +DISTFILES += CSWlibssl0-9-8.prototype-i386 CSWlibssl0-9-8.prototype-sparc DISTFILES += CSWlibssl-dev.prototype-i386 CSWlibssl-dev.prototype-sparc DISTFILES += CSWopenssl-utils.prototype DISTFILES += changelog.CSW README.CSW Deleted: csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.checkinstall =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.checkinstall 2013-07-09 14:20:43 UTC (rev 21470) +++ csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.checkinstall 2013-07-09 14:26:58 UTC (rev 21471) @@ -1,48 +0,0 @@ -#!/bin/sh - -PLATFORM=`/usr/bin/uname -p` -VERSION=`/usr/bin/uname -r` - -# Solaris 8 requires patches to have /dev/random and /dev/urandom. -if [ $VERSION -eq "5.8" ]; then - - if [ ! -c $PKG_ROOT_DIR/dev/random ] && [ ! -p $PKG_ROOT_DIR/dev/random ]; then - echo "ERROR: /dev/random must exist." - err=1 - fi - - if [ ! -c $PKG_ROOT_DIR/dev/urandom ] && [ ! -p $PKG_ROOT_DIR/dev/urandom ]; then - echo "ERROR: /dev/urandom must exist." - err=1 - fi - - if [ "$err" = "1" ]; then - if [ $PLATFORM -eq "sparc" ]; then - echo "Please install patch 112438." - elif [ $PLATFORM -eq "i386" ]; then - echo "Please install patch 112439." - fi - exit 1 - fi -fi - -# Certification Authority have been moved under /opt/csw/etc/ssl/certs -# under the ca_certificates package control -# and /opt/csw/ssl/certs is now a symbolic links - -# we test if certificates were manually installed in this directory -if [ ! -h "/opt/csw/ssl/certs" ] && [ -d "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then - - echo "Custom certificates have been installed in /opt/csw/ssl/certs/." - echo "They will be moved under /opt/csw/etc/ssl/certs." - echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information" - echo "about CA." - - # we define the MOVE_CERTS variable so preinstall and postinstall scripts - # will now they have to do something about theses certificates - cat >>$1 </dev/null || mv "/opt/csw/ssl/certs" "/opt/csw/ssl/certs.sav" -fi - -true Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-07-09 14:20:43 UTC (rev 21470) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2013-07-09 14:26:58 UTC (rev 21471) @@ -1,3 +1,11 @@ +openssl (0.9.8y,REV=2013.07.09) unstable + + * Removed checkinstall, preinstall and postinstall scripts + that are not necessary anymore (Solaris 8 support and + old modification of certificates location). + + -- Yann Rouillard Tue, 09 Jul 2013 16:23:34 +0200 + openssl (0.9.8y,REV=2013.03.06) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 18:44:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 16:44:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21472] csw/mgar/pkg/lang-python/pyelftools/trunk Message-ID: Revision: 21472 http://gar.svn.sourceforge.net/gar/?rev=21472&view=rev Author: chninkel Date: 2013-07-09 16:44:46 +0000 (Tue, 09 Jul 2013) Log Message: ----------- add a patch to fix the 'multiple string tables case' Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-07-09 14:26:58 UTC (rev 21471) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-07-09 16:44:46 UTC (rev 21472) @@ -18,6 +18,7 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PATCHFILES += 0001-syminfo+symbol_versioning_support.patch +PATCHFILES += 0002-Correctly-handle-the-multiple-string-tables-case-for.patch TEST_SCRIPTS = Added: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch (rev 0) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch 2013-07-09 16:44:46 UTC (rev 21472) @@ -0,0 +1,85 @@ +From b6a5e70d938ccf3532b5c6ae6de04fd68bfaca39 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Tue, 9 Jul 2013 20:22:27 +0200 +Subject: [PATCH] Correctly handle the "multiple string tables" case for string + resolution in the dynamic section + +The string table used to resolve various strings in the dynamic section +is given by an entry of the dynamic section, the one with the DT_STRTAB tag. +As several string tables with the same name can co-exist in an elf file +we must explicitely look for the string table pointed by this tag instead +of relying on a section search by name. +--- + elftools/elf/dynamic.py | 33 +++++++++++++++++++++++++++------ + 1 file changed, 27 insertions(+), 6 deletions(-) + +diff --git a/elftools/elf/dynamic.py b/elftools/elf/dynamic.py +index 60fb450..dd150be 100644 +--- a/elftools/elf/dynamic.py ++++ b/elftools/elf/dynamic.py +@@ -28,12 +28,11 @@ class DynamicTag(object): + ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME', + 'DT_SUNW_FILTER']) + +- def __init__(self, entry, elffile): ++ def __init__(self, entry, stringtable=None): + self.entry = entry +- if entry.d_tag in self._HANDLED_TAGS: +- dynstr = elffile.get_section_by_name(b'.dynstr') ++ if entry.d_tag in self._HANDLED_TAGS and stringtable: + setattr(self, entry.d_tag[3:].lower(), +- dynstr.get_string(self.entry.d_val)) ++ stringtable.get_string(self.entry.d_val)) + + def __getitem__(self, name): + """ Implement dict-like access to entries +@@ -44,7 +43,7 @@ class DynamicTag(object): + return '' % (self.entry.d_tag, self.entry) + + def __str__(self): +- if self.entry.d_tag in self._HANDLED_TAGS: ++ if hasattr(self, self.entry.d_tag[3:].lower()): + s = '"%s"' % getattr(self, self.entry.d_tag[3:].lower()) + else: + s = '%#x' % self.entry.d_ptr +@@ -61,6 +60,28 @@ class Dynamic(object): + self._num_tags = -1 + self._offset = position + self._tagsize = self._elfstructs.Elf_Dyn.sizeof() ++ # Several string tables can exist in a elf file, so we ++ # must find the one associated with the dynamic section, ++ # which is the one pointed at by the DT_STRTAB dynamic tag ++ self._find_and_set_stringtable() ++ ++ def _find_and_set_stringtable(self): ++ """ Find and set the stringtable section associated ++ with the dynamic section ++ """ ++ # We don't have yet the stringtable, so we set it to None to be able ++ # to iterate through tags without trying to do string table resolution ++ # at that time ++ self._stringtable = None ++ for tag in self.iter_tags(): ++ if tag['d_tag'] == 'DT_STRTAB': ++ # the DT_STRTAB tag points directly to the string table address ++ # not the section header, so we iterate throught sections until ++ # we found the one which points to the same offset ++ for section in self._elffile.iter_sections(): ++ if section['sh_addr'] == tag['d_val']: ++ self._stringtable = section ++ return + + def iter_tags(self, type=None): + """ Yield all tags (limit to |type| if specified) +@@ -80,7 +101,7 @@ class Dynamic(object): + self._elfstructs.Elf_Dyn, + self._stream, + stream_pos=offset) +- return DynamicTag(entry, self._elffile) ++ return DynamicTag(entry, self._stringtable) + + def num_tags(self): + """ Number of dynamic tags in the file +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 9 19:18:45 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Jul 2013 17:18:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21473] csw/mgar/pkg/openssl/trunk/files Message-ID: Revision: 21473 http://gar.svn.sourceforge.net/gar/?rev=21473&view=rev Author: chninkel Date: 2013-07-09 17:18:42 +0000 (Tue, 09 Jul 2013) Log Message: ----------- openssl/trunk: updated prototype after checkinstall,preinstall,postinstall removal Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-sparc Modified: csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-i386 2013-07-09 16:44:46 UTC (rev 21472) +++ csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-i386 2013-07-09 17:18:42 UTC (rev 21473) @@ -39,9 +39,6 @@ f none /opt/csw/share/doc/libssl0_9_8/README.ENGINE 644 root bin f none /opt/csw/share/doc/libssl0_9_8/README.CSW 644 root bin i checkpkg_override=checkpkg_override.CSWlibssl0-9-8 -i checkinstall=CSWlibssl0-9-8.checkinstall i copyright=CSWlibssl0-9-8.copyright i depend=CSWlibssl0-9-8.depend i pkginfo=CSWlibssl0-9-8.pkginfo -i postinstall=CSWlibssl0-9-8.postinstall -i preinstall=CSWlibssl0-9-8.preinstall Modified: csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-sparc 2013-07-09 16:44:46 UTC (rev 21472) +++ csw/mgar/pkg/openssl/trunk/files/CSWlibssl0-9-8.prototype-sparc 2013-07-09 17:18:42 UTC (rev 21473) @@ -42,9 +42,6 @@ f none /opt/csw/share/doc/libssl0_9_8/README.ENGINE 644 root bin f none /opt/csw/share/doc/libssl0_9_8/README.CSW 644 root bin i checkpkg_override=checkpkg_override.CSWlibssl0-9-8 -i checkinstall=CSWlibssl0-9-8.checkinstall i copyright=CSWlibssl0-9-8.copyright i depend=CSWlibssl0-9-8.depend i pkginfo=CSWlibssl0-9-8.pkginfo -i postinstall=CSWlibssl0-9-8.postinstall -i preinstall=CSWlibssl0-9-8.preinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 14:30:40 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 12:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21474] csw/mgar/pkg/lftp/trunk/Makefile Message-ID: Revision: 21474 http://gar.svn.sourceforge.net/gar/?rev=21474&view=rev Author: chninkel Date: 2013-07-10 12:30:31 +0000 (Wed, 10 Jul 2013) Log Message: ----------- lftp: added g++ as a build dependency Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-07-09 17:18:42 UTC (rev 21473) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-07-10 12:30:31 UTC (rev 21474) @@ -23,6 +23,8 @@ PACKAGES = CSWlftp +BUILD_DEP_PKGS = CSWgcc4g++ + RUNTIME_DEP_PKGS = CSWlibexpat1 RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 14:31:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 12:31:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21475] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 21475 http://gar.svn.sourceforge.net/gar/?rev=21475&view=rev Author: chninkel Date: 2013-07-10 12:31:34 +0000 (Wed, 10 Jul 2013) Log Message: ----------- lftp: disabled lazy loading as it makes lftp crash Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-07-10 12:30:31 UTC (rev 21474) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-07-10 12:31:34 UTC (rev 21475) @@ -84,6 +84,10 @@ # Requested see https://www.opencsw.org/mantis/view.php?id=4481 CONFIGURE_ARGS += --with-socksdante +# For an unknown reason so far, lftp crashes when compiled +# with compiled with lazyload enabled +EXTRA_LD_OPTIONS = -z nolazyload + # No test suite here TEST_SCRIPTS = Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-07-10 12:30:31 UTC (rev 21474) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-07-10 12:31:34 UTC (rev 21475) @@ -1,9 +1,10 @@ -lftp (4.4.8,REV=2013.06.16) unstable +lftp (4.4.8,REV=2013.07.10) unstable * New upstream release. * Added CSWlibz1 dependency as lftp now support http gzip encoding. + * Disabled symbol lazy loading as it makes lftp crash. - -- Yann Rouillard Sun, 16 Jun 2013 21:28:43 +0200 + -- Yann Rouillard Wed, 10 Jul 2013 14:14:03 +0200 lftp (4.4.4,REV=2013.03.13) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:05:53 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:05:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21476] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 21476 http://gar.svn.sourceforge.net/gar/?rev=21476&view=rev Author: chninkel Date: 2013-07-10 13:05:52 +0000 (Wed, 10 Jul 2013) Log Message: ----------- bash_completion/trunk: updated to 2.1 Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2013-07-10 12:31:34 UTC (rev 21475) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2013-07-10 13:05:52 UTC (rev 21476) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = bash_completion -VERSION = 2.0 +VERSION = 2.1 GARTYPE = v2 DESCRIPTION = Programmable completion for bash Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2013-07-10 12:31:34 UTC (rev 21475) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2013-07-10 13:05:52 UTC (rev 21476) @@ -1 +1 @@ -48616c0e3704e8ff7b6d9842f6b7a2de bash-completion-2.0.tar.gz +0528183f12bbf5ccf1a3458cb3736419 bash-completion-2.1.tar.gz Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2013-07-10 12:31:34 UTC (rev 21475) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2013-07-10 13:05:52 UTC (rev 21476) @@ -1,3 +1,9 @@ +bash_completion (2.1,REV=2013.07.10) + + * New upstream release. + + -- Yann Rouillard Wed, 10 Jul 2013 14:35:54 +0200 + bash_completion (2.0,REV=2012.08.26) * Improved pkgadd, pkgrm and svcadm completion. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:07:15 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:07:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21477] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 21477 http://gar.svn.sourceforge.net/gar/?rev=21477&view=rev Author: chninkel Date: 2013-07-10 13:07:15 +0000 (Wed, 10 Jul 2013) Log Message: ----------- bash_completion/trunk: dropped pkgutil, pkgadd, pkgrm and svcadm completions that were merged upstream. Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion csw/mgar/pkg/bash_completion/trunk/files/svcadm.completion Modified: csw/mgar/pkg/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2013-07-10 13:07:15 UTC (rev 21477) @@ -58,9 +58,6 @@ DISTNAME = $(shell echo $(NAME) | tr '_' '-')-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -# we automatically include all -DISTFILES += $(shell cd files; for FILE in *.completion; do echo $$FILE; done) - DISTFILES += changelog.CSW # change the paths to use opencsw ones @@ -76,16 +73,8 @@ # no test script in bash_completion TEST_SCRIPTS = -post-merge: merge-opencsw-completion merge-compatibility-link merge-additional-docs merge-changelog +post-merge: merge-compatibility-link merge-additional-docs merge-changelog -# we add some completion scripts for Solaris -merge-opencsw-completion: - @( for FILE in $(WORKDIR)/*.completion; do \ - NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \ - ginstall -D $$FILE $(PKGROOT)$(sharedstatedir)/bash-completion/completions/$$NFILE; \ - done ) - @$(MAKECOOKIE) - # to make sure we don't break completion loading for users of previous versions of this package merge-compatibility-link: @(cd $(PKGROOT)$(prefix)/etc/ && ln -s profile.d/bash_completion.sh bash_completion) Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,6 +1,8 @@ bash_completion (2.1,REV=2013.07.10) * New upstream release. + * Dropped pkgutil, pkgadd, pkgrm and svcadm completions that + were merged upstream. -- Yann Rouillard Wed, 10 Jul 2013 14:35:54 +0200 Deleted: csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,80 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# pkg-get.completion - bash completion for opencsw pkg-get -# - -_have pkg-get && -_pkg-get_get_catalog_file() -{ - local url="$1" - local catalog_file i conffile - - for file in /etc/opt/csw/pkg-get.conf /opt/csw/etc/pkg-get.conf /etc/pkg-get.conf; do - if [[ -f $file ]]; then - conffile="$file" - break - fi - done - conffile="${conffile:-/opt/csw/etc/pkg-get.conf}" - - if [[ -z "$url" ]]; then - url=$(awk -F= ' $1=="url" { print $2 }' $conffile) - fi - - catalog_file="${url##*//}" - catalog_file="${catalog_file%%/*}" - catalog_file="/var/pkg-get/catalog-$catalog_file" - - echo "$catalog_file" -} && -_pkg-get() -{ - local cur prev file catalog_file url command - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - if [[ "${prev}" = "-s" ]]; then - return 1 - fi - - i=${#COMP_WORDS[*]} - while [[ $i -gt 0 ]]; do - i=$((i-1)) - if [[ "${COMP_WORDS[$i]}" = "-s" ]]; then - url="${COMP_WORDS[$((i+1))]}" - fi - if [[ "${COMP_WORDS[$i]}" == @(available|-a|describe|-D|download|-d|install|-i|list|updatecatalog|-U|upgrade|-u) ]]; then - command="${COMP_WORDS[$i]}" - fi - done - - if [[ -n "$command" ]]; then - if [[ "$command" == @(describe|-D|download|-d|install|-i) ]]; then - catalog_file=$(_pkg-get_get_catalog_file "$url") - if [[ -f $catalog_file ]]; then - local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' $catalog_file) - COMPREPLY=( $(compgen -W "${packages_list}" -- ${cur}) ) - fi - fi - return 0 - fi - - if [[ ${cur} == -* ]] ; then - local opts="-c -d -D -f -i -l -s -S -u -U -v" - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - else - local commands="available describe download install list updatecatalog upgrade" - COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) ) - return 0 - fi -} && -complete -F _pkg-get pkg-get Deleted: csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,64 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# - -_pkgadd () -{ - local cur prev words cword - _init_completion -n : || return - - # if a device directory was given - # we must complete with the package - # available in this directory - local device=/var/spool/pkg; - local i=$cword - while [[ $((i--)) -gt 0 ]]; do - case "${words[$i]}" in - -d) - device="${words[$((i+1))]}"; - break - ;; - esac; - done; - - case $prev in - -d) - _filedir pkg - _filedir -d - ;; - -a|-r|-V) - _filedir - ;; - -k|-s|-R) - _filedir -d - ;; - -P|-k|-x) - ;; - *) - if [[ ${cur} == -* ]] ; then - local opts="-a -A -d -k -n -M -P -r -R -s -v -V -x" - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - else - local pkginst_list - if [[ -d $device ]]; then - for filedir in $(/bin/ls -1 $device); do - if [[ -d "$device/$filedir" ]] && [[ -f "$device/$filedir/pkginfo" ]]; then - pkginst_list+=( ${pkginst_list[@]:-} "$filedir" ) - fi - done - pkginst_list="${pkginst_list[@]}" - else - pkginst_list=$(strings $(dequote $device) | grep "^PKG=" | sort -u | cut -d= -f2) - fi - COMPREPLY=( $(compgen -W "$pkginst_list" -- ${cur}) ) - fi - esac -} && -complete -F _pkgadd pkgadd - Deleted: csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,55 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# - -_have pkgrm && -_pkgrm () -{ - local cur prev words cword - _init_completion || return - - # if a spool directory was given - # we must complete with the package - # available in this directory - local spool=/var/sadm/pkg; - local i=$cword - while [[ $((i--)) -gt 0 ]]; do - i=$((i-1)); - case "${words[$i]}" in - -s) - spool="${words[$((i+1))]}"; - break - ;; - esac; - done; - - case $prev in - -a | -V) - _filedir - ;; - -s | -R) - _filedir -d - ;; - -Y) - - ;; - *) - if [[ ${cur} == -* ]]; then - local opts="-a -A -n -M -R -s -v -V -Y"; - COMPREPLY=($(compgen -W "${opts}" -- ${cur})); - return 0; - else - COMPREPLY=($(compgen -W "$(/bin/ls -1 $spool)" -- ${cur})); - return 0; - fi - ;; - esac -} && -complete -F _pkgrm pkgrm - Deleted: csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,104 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# pkgutil.completion - bash completion for pkgutil -# - - -_pkgutil_url2catalog() -{ - local filename="$1" - - filename="${filename##*://}" - filename="${filename//\//_}" - filename="/var/opt/csw/pkgutil/catalog.${filename}_$(uname -p)_$(uname -r)" - - echo "$filename" -} - -_pkgutil() -{ - local cur prev words cword - _init_completion -n : || return - - local command catalog_files configuration_files - declare -a configuration_files=("/opt/csw/etc/pkgutil.conf" "/etc/opt/csw/pkgutil.conf") - declare -a catalog_files=() - - i=$cword - while [[ $((i--)) -gt 1 ]]; do - if [[ "${words[$i]}" = @(-t|--temp) ]]; then - local url="${words[$((i+1))]}" - local catalog=$(_pkgutil_url2catalog "$url") - catalog_files=("$catalog") - elif [[ "${words[$i]}" = @(--config) ]]; then - configuration_files=( "$(dequote ${words[$((i+1))]})" ) - elif [[ "${words[$i]}" == @(-i|--install|-u|--upgrade|-r|--remove|-d|--download|-a|--available|-c|--compare|-U|--catalog|-S|--stream) ]]; then - command="${words[$i]}" - fi - done - - if [[ "$prev" = @(-W|--workdir|-P|--pkgdir|-R|--rootpath) ]]; then - _filedir -d - return 0 - fi - - if [[ "$prev" = @(-o|--output|--config) ]]; then - _filedir - return 0 - fi - - if [[ "$prev" = @(-p|--param) ]]; then - compopt -o nospace - COMPREPLY=( $(compgen -W "mirror: pkgaddopts: pkgrmopts: wgetopts: use_gpg: use_md5: pkgliststyle: maxpkglist: noncsw: stop_on_hook_soft_error: exclude_pattern: gpg_homedir: root_path: deptree_filter_common: show_current: catalog_not_cached: catalog_update:" -- $cur) ) - return 0 - fi - - if [[ "$prev" = @(-T|--target) ]]; then - # Work-around bash_completion issue where bash interprets a colon - # as a separator, borrowed from maven completion code which borrowed - # it from darcs completion code :) - local colonprefixes=${cur%"${cur##*:}"} - COMPREPLY=( $(compgen -W "sparc:5.9 sparc:5.10 sparc:5.11 i386:5.9 i386:5.10 i386:5.11" -- $cur) ) - local i=${#COMPREPLY[*]} - while [ $((--i)) -ge 0 ]; do - COMPREPLY[$i]=${COMPREPLY[$i]#"$colonprefixes"} - done - return 0 - fi - - if [[ -n "$command" ]] && [[ ! "$cur" == -* ]]; then - - local mirrors mirror_url - mirrors=$(awk -F= ' $1 ~ /^ *mirror *$/ { print $2 }' ${configuration_files[@]}) - mirrors=${mirrors:-http://mirror.opencsw.org/opencsw/testing} - for mirror_url in $mirrors; do - local catalog=$(_pkgutil_url2catalog "$mirror_url") - catalog_files=( "${catalog_files[@]}" "$catalog" ) - done - - if [[ "$command" == @(--download|-d|--install|-i|--upgrade|-u|s|--stream) ]]; then - local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' "${catalog_files[@]}") - COMPREPLY=( $(compgen -W "${packages_list}" -- $cur) ) - - elif [[ "$command" == @(-r|--remove) ]]; then - local packages_list=$(pkginfo | awk ' $2 ~ /^CSW/ { printf ("%s|",$2) }') - packages_list=${packages_list%|} - packages_list=$(nawk " \$3 ~ /^$packages_list\$/ { print \$1 }" "${catalog_files[@]}") - COMPREPLY=( $(compgen -W "${packages_list}" -- $cur) ) - fi - return 0 - fi - - local commands="-i --install -u --upgrade -r --remove -d --download -U --catalog -a --available --describe -c --compare -C --compare-diff -A --compare-avail -e --email -t --temp -x --exclude -W --workdir -P --pkgdir -R --rootpath --config -y --yes -f --force -n --nomod -N --nodeps -D --debug --trace -h --help -v --version -V --syscheck -l --list -L --listfile -F --findfile --deptree --extract -s --stream -o --output -T --target --single -p --param --parse --cleanup --catinfo" - COMPREPLY=( $(compgen -W "${commands}" -- $cur) ) - return 0 -} - -complete -F _pkgutil pkgutil Deleted: csw/mgar/pkg/bash_completion/trunk/files/svcadm.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/svcadm.completion 2013-07-10 13:05:52 UTC (rev 21476) +++ csw/mgar/pkg/bash_completion/trunk/files/svcadm.completion 2013-07-10 13:07:15 UTC (rev 21477) @@ -1,152 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# - - -# -# svcadm accept any complete FMRI or abreviated FMRI -# - a complete FMRI is svc:/foo/bar/bar/baz -# - abbreviated FMRI are foo/bar/bar/baz, bar/bar/baz, bar/baz or baz -# -# The goal of this function is to be able to propose all alternatives, -# but to not clutter the interface with all completions, we will only -# cut every completion alternative at the next slash. -# -# For exemple, if the user types , we will propose for svc://foo/bar/bar/baz -# the following completion: foo/, bar/ and baz -# If the user types , we will propose: bar/ and baz -# If the user types , we will propose: bar/bar/ and bar/baz -# -# By default, the function proproses only abbreviated completions except if the user already -# began to type svc:. In that case we will propose only the complete FMRI beginning with the -# pattern -# -_smf_complete_fmri () -{ - local cur="$1" prefix="$2" - local cur_prefix fmri fmri_list="" - local exact_mode pattern - - if [[ "$cur" == $prefix* ]]; then - [[ "$cur" == $prefix ]] && cur+="/" - pattern="$cur*" - exact_mode=1 - else - pattern="$prefix*/$cur*" - fi - - cur_prefix="${cur%"${cur##*/}"}" - - for fmri in $(svcs -H -o FMRI "$pattern" 2>/dev/null); do - - local fmri_part_list fmri_part - - if [[ -z "$exact_mode" ]]; then - - fmri=${fmri#$prefix/} - - # we generate all possibles abbrevations for the FMRI - # no need to have a generic loop as we will have a finite - # number of components - local OIFS="$IFS"; IFS="/"; set -- $fmri; IFS="$OIFS" - case $# in - 1) fmri_part_list=" $1";; - 2) fmri_part_list=" $2 $1/$2";; - 3) fmri_part_list=" $3 $2/$3 $1/$2/$3";; - 4) fmri_part_list=" $4 $3/$4 $2/$3/$4 $1/$2/$3/$4";; - esac - else - fmri_part_list="$fmri" - fi - - # Here we make sure the completions begins with the pattern and - # we cut them at the first slash - for fmri_part in $fmri_part_list; do - [[ "$fmri_part" == $cur* ]] || continue - local first_part=${fmri_part#$cur_prefix} - first_part=$cur_prefix${first_part%%/*} - [[ "$first_part" != "$fmri_part" ]] && first_part+="/" - fmri_list+=" $first_part" - done - done - - COMPREPLY=( $fmri_list ) - - # here we want to detect if there only one completion proposed and that - # it ends with a slash. That means the users will still have to complete - # after, so we gain him one tab keystroke by immediately proposing the - # next completion alternatives - local i=${#COMPREPLY[*]} - if [[ $i -gt 0 ]] && [[ "${COMPREPLY[$((--i))]}" == */ ]]; then - # we have to iterate throught the list as we may have duplicate - while [[ $i -ne 0 ]]; do - [[ "${COMPREPLY[$i]}" != "${COMPREPLY[$((i - 1))]}" ]] && break - ((i--)) - done - if [[ $i -eq 0 ]]; then - _smf_complete_fmri "${COMPREPLY[0]}" "$prefix" - return 0 - fi - fi - - # Work-around bash_completion issue where bash interprets a colon - # as a separator, borrowed from maven completion code which borrowed - # it from darcs completion code :) - local colonprefixes=${cur%"${cur##*:}"} - local i=${#COMPREPLY[*]} - while [ $((--i)) -ge 0 ]; do - COMPREPLY[$i]=${COMPREPLY[$i]#"$colonprefixes"} - done -} - -_svcadm () -{ - local cur prev words cword - _init_completion -n : || return - - local command_list="enable disable restart refresh clear mark milestone" - local command i - - for (( i=1; i < $cword; i++ )); do - if [[ ${words[i]} == @(enable|disable|restart|refresh|clear|mark|milestone) ]]; then - command=${words[i]} - fi - done - - if [[ -z "$command" ]]; then - if [[ ${cur} == -* ]] ; then - COMPREPLY=( $(compgen -W "-v" -- ${cur}) ) - else - COMPREPLY=( $(compgen -W "$command_list" -- ${cur}) ) - fi - else - if [[ ${cur} == -* ]]; then - case "$command" in - enable) - COMPREPLY=( $(compgen -W "-r -s -t" -- ${cur}) );; - disable) - COMPREPLY=( $(compgen -W "-s -t" -- ${cur}) );; - mark) - COMPREPLY=( $(compgen -W "-I -t" -- ${cur}) );; - milestone) - COMPREPLY=( $(compgen -W "-d" -- ${cur}) );; - esac - else - if [[ "$command" == "mark" ]] && [[ "$prev" != @(degraded|maintenance) ]]; then - COMPREPLY=( $(compgen -W "degraded maintenance" -- ${cur}) ) - elif [[ "$command" == "milestone" ]]; then - _smf_complete_fmri "${cur}" "svc:/milestone" - else - _smf_complete_fmri "${cur}" "svc:" - fi - fi - fi -} && -complete -F _svcadm svcadm - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:08:35 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21478] csw/mgar/pkg/bash/trunk Message-ID: Revision: 21478 http://gar.svn.sourceforge.net/gar/?rev=21478&view=rev Author: chninkel Date: 2013-07-10 13:08:35 +0000 (Wed, 10 Jul 2013) Log Message: ----------- bash/trunk: updated to patch level 45 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2013-07-10 13:07:15 UTC (rev 21477) +++ csw/mgar/pkg/bash/trunk/Makefile 2013-07-10 13:08:35 UTC (rev 21478) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = bash -VERSION = 4.2.37 +VERSION = 4.2.45 GARTYPE = v2 DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2013-07-10 13:07:15 UTC (rev 21477) +++ csw/mgar/pkg/bash/trunk/checksums 2013-07-10 13:08:35 UTC (rev 21478) @@ -36,3 +36,11 @@ 7cd9bfdf7cbfd45274d07620ee94c8d9 bash42-035 9c3142956064d175a880bcb186e51ef9 bash42-036 c10692f447d4966c879f8fb8d7c8ebc9 bash42-037 +9ef3c308cde413e95866c1266cfb4e98 bash42-038 +cd48f57a404498d4e5c73a3501c4b1a5 bash42-039 +00a2371b6c05acbfce6bc850c6d982f8 bash42-040 +7bc4942a66ca4024ee964db7ede07896 bash42-041 +1cf7701017ebfc8e129de92c8f8b798c bash42-042 +9e61168fca692d8d1a733c389a63712e bash42-043 +b4b11d64b45ea9ec50dcc74c6c3861f6 bash42-044 +1661bcc83c4715f54368877452ff2247 bash42-045 Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2013-07-10 13:07:15 UTC (rev 21477) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2013-07-10 13:08:35 UTC (rev 21478) @@ -1,3 +1,9 @@ +bash (4.2.45,REV=2013.07.10) unstable + + * Added bash patches bash42-038 and bash42-045. + + -- Yann Rouillard Wed, 10 Jul 2013 14:35:54 +0200 + bash (4.2.37,REV=2012.08.28) unstable * * Added a mapfile to force linking against interface SUNW_1.22 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:09:26 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21479] csw/mgar/pkg/bash/trunk Message-ID: Revision: 21479 http://gar.svn.sourceforge.net/gar/?rev=21479&view=rev Author: chninkel Date: 2013-07-10 13:09:25 +0000 (Wed, 10 Jul 2013) Log Message: ----------- bash/trunk: removed map file and direct binding options in the recipe as it is now the default at OpenCSW. Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2013-07-10 13:08:35 UTC (rev 21478) +++ csw/mgar/pkg/bash/trunk/Makefile 2013-07-10 13:09:25 UTC (rev 21479) @@ -53,7 +53,6 @@ DISTNAME = $(NAME)-$(BASH_VERSION) DISTFILES = $(NAME)-$(BASH_VERSION).tar.gz DISTFILES += changelog.CSW -DISTFILES += map.bash PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) PATCHDIRLEVEL = 0 @@ -84,8 +83,6 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_LD_OPTIONS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.bash)" - include gar/category.mk # We touch these file to avoid aclocal/autoconf Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2013-07-10 13:08:35 UTC (rev 21478) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2013-07-10 13:09:25 UTC (rev 21479) @@ -1,6 +1,8 @@ bash (4.2.45,REV=2013.07.10) unstable * Added bash patches bash42-038 and bash42-045. + * Removed map file and direct binding options in the recipe + as it is now the default at OpenCSW. -- Yann Rouillard Wed, 10 Jul 2013 14:35:54 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:27:49 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21480] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 21480 http://gar.svn.sourceforge.net/gar/?rev=21480&view=rev Author: chninkel Date: 2013-07-10 13:27:40 +0000 (Wed, 10 Jul 2013) Log Message: ----------- cyrus_imapd/trunk: added some build dependencies Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-07-10 13:09:25 UTC (rev 21479) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2013-07-10 13:27:40 UTC (rev 21480) @@ -31,6 +31,10 @@ PACKAGES = CSWcyrusimapd CSWcyrusimapdutils CSWpmcyrus +BUILD_DEP_PKGS = CSWbdb48devel +BUILD_DEP_PKGS += CSWsasl-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev + SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system CATALOGNAME_CSWcyrusimapd = cyrus_imapd PKGFILES_CSWcyrusimapd = $(sbindir)/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:29:08 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21481] csw/mgar/pkg/cyrus_imapd/trunk/files Message-ID: Revision: 21481 http://gar.svn.sourceforge.net/gar/?rev=21481&view=rev Author: chninkel Date: 2013-07-10 13:29:08 +0000 (Wed, 10 Jul 2013) Log Message: ----------- cyrus_imapd/trunk: updated changelog dates before release Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2013-07-10 13:27:40 UTC (rev 21480) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2013-07-10 13:29:08 UTC (rev 21481) @@ -1,8 +1,8 @@ -cyrus_imapd (2.4.17,REV=2013.03.13) +cyrus_imapd (2.4.17,REV=2013.07.10) * New upstream release. - -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + -- Yann Rouillard Wed, 10 Jul 2013 15:22:49 +0200 cyrus_imapd (2.4.16,REV=2012.11.24) Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2013-07-10 13:27:40 UTC (rev 21480) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2013-07-10 13:29:08 UTC (rev 21481) @@ -1,8 +1,8 @@ -cyrus_imapd_utils (2.4.17,REV=2013.03.13) +cyrus_imapd_utils (2.4.17,REV=2013.07.10) * New upstream release. - -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + -- Yann Rouillard Wed, 10 Jul 2013 15:22:49 +0200 cyrus_imapd_utils (2.4.16,REV=2012.11.24) Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2013-07-10 13:27:40 UTC (rev 21480) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2013-07-10 13:29:08 UTC (rev 21481) @@ -1,8 +1,8 @@ -pm_cyrus (2.4.17,REV=2013.03.13) +pm_cyrus (2.4.17,REV=2013.07.10) * New upstream release. - -- Yann Rouillard Sat, 24 Nov 2012 15:12:49 +0100 + -- Yann Rouillard Wed, 10 Jul 2013 15:22:49 +0200 pm_cyrus (2.4.16,REV=2012.11.24) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 15:30:38 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 13:30:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21482] csw/mgar/pkg/lang-python/python-ldap/trunk Message-ID: Revision: 21482 http://gar.svn.sourceforge.net/gar/?rev=21482&view=rev Author: chninkel Date: 2013-07-10 13:30:38 +0000 (Wed, 10 Jul 2013) Log Message: ----------- python-ldap/trunk: updated to 2.4.13 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile csw/mgar/pkg/lang-python/python-ldap/trunk/checksums csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2013-07-10 13:29:08 UTC (rev 21481) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2013-07-10 13:30:38 UTC (rev 21482) @@ -1,6 +1,6 @@ # $Id$ NAME = python-ldap -VERSION = 2.3.13 +VERSION = 2.4.13 CATEGORIES = python GARTYPE = v2 PACKAGES = CSWpy-ldap Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2013-07-10 13:29:08 UTC (rev 21481) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2013-07-10 13:30:38 UTC (rev 21482) @@ -1 +1 @@ -895223d32fa10bbc29aa349bfad59175 python-ldap-2.3.13.tar.gz +74b7b50267761540451eade44b2049ee python-ldap-2.4.13.tar.gz Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch 2013-07-10 13:29:08 UTC (rev 21481) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/files/0000-openldap-path.patch 2013-07-10 13:30:38 UTC (rev 21482) @@ -1,32 +1,25 @@ -From 92b69bbbee79a5f80085290dacf8af607692740e Mon Sep 17 00:00:00 2001 -From: Kester Habermann -Date: Tue, 26 Oct 2010 10:57:19 +0200 +From e79f4836eda5653fb2b858d6b374e80e7f8101a4 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Wed, 10 Jul 2013 17:21:37 +0200 Subject: [PATCH] openldap-path --- - setup.cfg | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + setup.cfg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg -index cf765ab..f039820 100644 +index f1b1c48..2847ce5 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -2,8 +2,8 @@ - extra_objects = - extra_compile_args = - libs = ldap_r lber sasl2 ssl crypto --library_dirs = /usr/local/openldap-2.3/lib --include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl +@@ -1,6 +1,6 @@ + [_ldap] +-library_dirs = /opt/openldap-RE24/lib /usr/lib +-include_dirs = /opt/openldap-RE24/include /usr/include/sasl /usr/include +library_dirs = /opt/csw/lib +include_dirs = /opt/csw/include /opt/csw/include/sasl - - [egg_info] - tag_build = -@@ -20,4 +20,3 @@ provides = python-ldap - release = 0 - packager = Michael Stroeder - requires = python libldap.so.2 -- + defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R + extra_compile_args = + extra_objects = -- -1.7.3 +1.8.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:03:07 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21483] csw/mgar/pkg/lang-python/pyopenssl/trunk Message-ID: Revision: 21483 http://gar.svn.sourceforge.net/gar/?rev=21483&view=rev Author: chninkel Date: 2013-07-10 14:03:05 +0000 (Wed, 10 Jul 2013) Log Message: ----------- pyopenssl/trunk: updated to 0.13 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-07-10 13:30:38 UTC (rev 21482) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-07-10 14:03:05 UTC (rev 21483) @@ -2,16 +2,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyOpenSSL -VERSION = 0.11 +VERSION = 0.13 GARTYPE = v2 CATEGORIES = python DESCRIPTION = OpenSSL bindings for Python define BLURB - Long description + OpenSSL bindings for Python endef -MASTER_SITES = http://launchpad.net/pyopenssl/main/$(VERSION)/+download/ +MASTER_SITE_DIR = $(shell echo $(NAME) | cut -c 1) +MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz PACKAGES = CSWpy-openssl Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2013-07-10 13:30:38 UTC (rev 21482) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2013-07-10 14:03:05 UTC (rev 21483) @@ -1 +1 @@ -9e76e57e00fa48745fcfe23944db1e6c pyOpenSSL-0.11.tar.gz +767bca18a71178ca353dff9e10941929 pyOpenSSL-0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:03:37 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21484] csw/mgar/pkg/proftpd/trunk Message-ID: Revision: 21484 http://gar.svn.sourceforge.net/gar/?rev=21484&view=rev Author: chninkel Date: 2013-07-10 14:03:37 +0000 (Wed, 10 Jul 2013) Log Message: ----------- proftpd/trunk: updated to 1.3.4d Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/proftpd/trunk/checksums Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 14:03:05 UTC (rev 21483) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 14:03:37 UTC (rev 21484) @@ -1,5 +1,5 @@ NAME = proftpd -VERSION = 1.3.4b +VERSION = 1.3.4d GARTYPE = v2 DESCRIPTION = Advanced, incredibly configurable and secure FTP daemon Modified: csw/mgar/pkg/proftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/proftpd/trunk/checksums 2013-07-10 14:03:05 UTC (rev 21483) +++ csw/mgar/pkg/proftpd/trunk/checksums 2013-07-10 14:03:37 UTC (rev 21484) @@ -1 +1 @@ -0871e0b93c9c3c88ca950b6d9a04aed2 proftpd-1.3.4b.tar.gz +13c6fd7ce320886adc371c81a3e23f07 proftpd-1.3.4d.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:04:05 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21485] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 21485 http://gar.svn.sourceforge.net/gar/?rev=21485&view=rev Author: chninkel Date: 2013-07-10 14:04:05 +0000 (Wed, 10 Jul 2013) Log Message: ----------- proftpd/trunk: added mysql as a build dependency Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 14:03:37 UTC (rev 21484) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 14:04:05 UTC (rev 21485) @@ -19,6 +19,8 @@ # 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 = CSWmysql-dev + RUNTIME_DEP_PKGS_CSWproftpd += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWproftpd += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWproftpd += CSWlibz1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:15:10 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21486] csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile Message-ID: Revision: 21486 http://gar.svn.sourceforge.net/gar/?rev=21486&view=rev Author: chninkel Date: 2013-07-10 14:15:10 +0000 (Wed, 10 Jul 2013) Log Message: ----------- python-ldap/trunk: removed useless dependency CSWliblber2-4-2 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2013-07-10 14:04:05 UTC (rev 21485) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2013-07-10 14:15:10 UTC (rev 21486) @@ -17,7 +17,6 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 BUILD_DEP_PKGS = CSWpython-dev CSWopenldap-dev CSWsasl-dev -RUNTIME_DEP_PKGS_CSWpy-ldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibpython2-6-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:34:21 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:34:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21487] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 21487 http://gar.svn.sourceforge.net/gar/?rev=21487&view=rev Author: chninkel Date: 2013-07-10 14:34:21 +0000 (Wed, 10 Jul 2013) Log Message: ----------- gar/v2: make sure mgar stops when a patch failed to apply Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-07-10 14:15:10 UTC (rev 21486) +++ csw/mgar/gar/v2/gar.lib.mk 2013-07-10 14:34:21 UTC (rev 21487) @@ -742,7 +742,7 @@ # apply xzipped patches xz-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1 @( if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR); git add -A; \ git commit -am "old xz-style patch: $*"; \ @@ -752,7 +752,7 @@ # apply bzipped patches bz-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1 @( if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR); git add -A; \ git commit -am "old bz-style patch: $*"; \ @@ -762,7 +762,7 @@ # apply gzipped patches gz-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1 @( if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR); git add -A; \ git commit -am "old gz-style patch: $*"; \ @@ -772,16 +772,16 @@ # apply normal patches (git format-patch output or old-style diff -r) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - @( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ + ( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR);\ - git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \ + git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*) || exit 1; \ else \ - $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + $(GARPATCH) < $(DOWNLOADDIR)/$* || exit 1; \ fi; \ else \ echo Adding old-style patch...; \ - $(GARPATCH) < $(DOWNLOADDIR)/$*; \ + $(GARPATCH) < $(DOWNLOADDIR)/$* || exit 1; \ if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR); \ git add -A; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:44:03 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21488] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 21488 http://gar.svn.sourceforge.net/gar/?rev=21488&view=rev Author: chninkel Date: 2013-07-10 14:44:03 +0000 (Wed, 10 Jul 2013) Log Message: ----------- gar/v2: reverted a mistake in the previous commit Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-07-10 14:34:21 UTC (rev 21487) +++ csw/mgar/gar/v2/gar.lib.mk 2013-07-10 14:44:03 UTC (rev 21488) @@ -772,7 +772,7 @@ # apply normal patches (git format-patch output or old-style diff -r) normal-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" - ( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ + @( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \ if [ -z "$(NOGITPATCH)" ]; then \ cd $(PATCHDIR);\ git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*) || exit 1; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jul 10 16:44:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 14:44:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21489] csw/mgar/pkg/cyrus_imapd/trunk/files/ restore_allowplaintext_default.patch Message-ID: Revision: 21489 http://gar.svn.sourceforge.net/gar/?rev=21489&view=rev Author: chninkel Date: 2013-07-10 14:44:46 +0000 (Wed, 10 Jul 2013) Log Message: ----------- cyrus_imapd/trunk: updated allowplaintext patch Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/files/restore_allowplaintext_default.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/restore_allowplaintext_default.patch =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/restore_allowplaintext_default.patch 2013-07-10 14:44:03 UTC (rev 21488) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/restore_allowplaintext_default.patch 2013-07-10 14:44:46 UTC (rev 21489) @@ -1,15 +1,15 @@ diff -ur cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html cyrus-imapd-2.3.11.new/doc/man/imapd.conf.5.html --- cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html 2008-03-16 16:09:10.403587000 -0400 +++ cyrus-imapd-2.3.11.new/doc/man/imapd.conf.5.html 2008-03-16 16:07:08.000000000 -0400 -@@ -272,7 +272,7 @@ - - - --

allowplaintext: 0

-+

allowplaintext: 1

- - - Note that this + is a very expensive command and should only be enabled when + absolutely necessary.
+-allowplaintext:
0

++allowplaintext: 1

+ +

Allow the use of cleartext + passwords on the wire.

diff -ur cyrus-imapd-2.3.11/lib/imapoptions cyrus-imapd-2.3.11.new/lib/imapoptions --- cyrus-imapd-2.3.11/lib/imapoptions 2008-03-16 16:09:10.463576000 -0400 +++ cyrus-imapd-2.3.11.new/lib/imapoptions 2008-03-16 16:06:53.000000000 -0400 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Jul 10 23:53:27 2013 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 10 Jul 2013 21:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21490] csw/mgar/pkg/tre/trunk/Makefile Message-ID: Revision: 21490 http://gar.svn.sourceforge.net/gar/?rev=21490&view=rev Author: opk Date: 2013-07-10 21:53:26 +0000 (Wed, 10 Jul 2013) Log Message: ----------- Solaris 10 has getopt_long so adjusted to build agrep Modified Paths: -------------- csw/mgar/pkg/tre/trunk/Makefile Modified: csw/mgar/pkg/tre/trunk/Makefile =================================================================== --- csw/mgar/pkg/tre/trunk/Makefile 2013-07-10 14:44:46 UTC (rev 21489) +++ csw/mgar/pkg/tre/trunk/Makefile 2013-07-10 21:53:26 UTC (rev 21490) @@ -7,20 +7,19 @@ GARTYPE = v2 DESCRIPTION = Approximate regex matching library define BLURB + TRE is a lightweight, robust and efficient POSIX compliant + regexp matching library with some exciting features such as + apprroximate (fuzzy) matching. endef + SPKG_SOURCEURL = http://laurikari.net/tre/ MASTER_SITES = http://laurikari.net/tre/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -BUILD64_LIBS_ONLY = 1 -# agrep needs getopt_long -# TODO: Solve the getopt_long problem and build agrep. -# PATCHFILES += 0001-gnulib-import-getopt-gnu.patch -# PATCHFILES += 0002-manual-gnulib-integration-steps.patch -# EXTRA_LD_OPTIONS = -lgnugetopt -CONFIGURE_ARGS = $(DIRPATHS) --disable-agrep + +CONFIGURE_ARGS = $(DIRPATHS) PACKAGES += CSWlibtre5 SPKG_DESC_CSWlibtre5 = Approximate regex matching library (libtre.so.5) -PKGFILES_CSWlibtre5 = /opt/csw/lib/.*libtre\.so\.5.* +PKGFILES_CSWlibtre5 = /opt/csw/lib/.*libtre\.so\.5.* /opt/csw/share/locale/.* RUNTIME_DEP_PKGS_CSWlibtre5 += CSWlibintl8 PACKAGES += CSWtre-dev @@ -29,10 +28,12 @@ SPKG_DESC_CSWtre-dev = Development files for tre RUNTIME_DEP_PKGS_CSWtre-dev += CSWlibtre5 +PACKAGES += CSWagrep +SPKG_DESC_CSWagrep = Text search tool with support for approximate patterns +CATALOGNAME_CSWagrep = agrep +PKGFILES_CSWagrep = /opt/csw/bin/agrep /opt/csw/share/man/man1/agrep.1 +RUNTIME_DEP_PKGS_CSWagrep += CSWlibintl8 CSWlibtre5 + LICENSE = LICENSE include gar/category.mk - -# pre-configure-modulated: -# @(cd $(WORKSRC); autoreconf -i ) -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 00:44:38 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 22:44:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21491] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 21491 http://gar.svn.sourceforge.net/gar/?rev=21491&view=rev Author: chninkel Date: 2013-07-10 22:44:38 +0000 (Wed, 10 Jul 2013) Log Message: ----------- gnutls/trunk: added security fix for CVE-2013-2116 Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnutls/trunk/files/0005-CVE-2013-2116.patch Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2013-07-10 21:53:26 UTC (rev 21490) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-07-10 22:44:38 UTC (rev 21491) @@ -28,6 +28,8 @@ # We workaround the problem by changing the test so it expects # the certificates to be expired (another solution is to use LD_PRELOAD). PATCHFILES += 0004-workaround-certificate-expiration-issue-in-the-test-.patch +# Security fix for CVE-2013-2116 +PATCHFILES += 0005-CVE-2013-2116.patch UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 Added: csw/mgar/pkg/gnutls/trunk/files/0005-CVE-2013-2116.patch =================================================================== --- csw/mgar/pkg/gnutls/trunk/files/0005-CVE-2013-2116.patch (rev 0) +++ csw/mgar/pkg/gnutls/trunk/files/0005-CVE-2013-2116.patch 2013-07-10 22:44:38 UTC (rev 21491) @@ -0,0 +1,25 @@ +From 5164d5a1d57cd0372a5dd074382ca960ca18b27d Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Thu, 23 May 2013 09:54:37 +0200 +Subject: [PATCH] re-applied sanity check patch + +--- + lib/gnutls_cipher.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c +index 2835121..71f5a98 100644 +--- a/lib/gnutls_cipher.c ++++ b/lib/gnutls_cipher.c +@@ -561,6 +561,8 @@ _gnutls_ciphertext2compressed (gnutls_session_t session, + return GNUTLS_E_DECRYPTION_FAILED; + } + pad = ciphertext.data[ciphertext.size - 1]; /* pad */ ++ if (pad+1 > ciphertext.size-hash_size) ++ pad_failed = GNUTLS_E_DECRYPTION_FAILED; + + /* Check the pading bytes (TLS 1.x). + * Note that we access all 256 bytes of ciphertext for padding check +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 00:45:35 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 22:45:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21492] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 21492 http://gar.svn.sourceforge.net/gar/?rev=21492&view=rev Author: chninkel Date: 2013-07-10 22:45:35 +0000 (Wed, 10 Jul 2013) Log Message: ----------- gnutls/trunk: added some build dependencies Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2013-07-10 22:44:38 UTC (rev 21491) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-07-10 22:45:35 UTC (rev 21492) @@ -54,6 +54,10 @@ BUILD_DEP_PKGS += CSWreadline BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls26) BUILD_DEP_PKGS += CSWlibtasn1-dev +BUILD_DEP_PKGS += CSWlibnettle-dev +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWlibp11kit-dev +BUILD_DEP_PKGS += CSWlibgmp-dev GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 01:02:29 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 23:02:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21493] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 21493 http://gar.svn.sourceforge.net/gar/?rev=21493&view=rev Author: chninkel Date: 2013-07-10 23:02:28 +0000 (Wed, 10 Jul 2013) Log Message: ----------- proftpd/trunk: added gettext_dev as a build dependency Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 22:45:35 UTC (rev 21492) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 23:02:28 UTC (rev 21493) @@ -20,6 +20,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz BUILD_DEP_PKGS = CSWmysql-dev +BUILD_DEP_PKGS += CSWggettext-dev RUNTIME_DEP_PKGS_CSWproftpd += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWproftpd += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 01:02:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 23:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21494] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 21494 http://gar.svn.sourceforge.net/gar/?rev=21494&view=rev Author: chninkel Date: 2013-07-10 23:02:52 +0000 (Wed, 10 Jul 2013) Log Message: ----------- proftpd/trunk: use the real current group name to perform installation Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 23:02:28 UTC (rev 21493) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 23:02:52 UTC (rev 21494) @@ -43,7 +43,7 @@ MIGRATE_FILES = proftpd.conf -EXTRA_CONFIGURE_ENV = install_user=$(USER) install_group=csw +EXTRA_CONFIGURE_ENV = install_user=$(shell id -un) install_group=$(shell id -gn) EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" libexecdir = $(libdir)/proftpd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 01:19:30 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 10 Jul 2013 23:19:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21495] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 21495 http://gar.svn.sourceforge.net/gar/?rev=21495&view=rev Author: chninkel Date: 2013-07-10 23:19:27 +0000 (Wed, 10 Jul 2013) Log Message: ----------- proftpd/trunk: use xpg id rather than standard id command to find current user and group Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 23:02:52 UTC (rev 21494) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-10 23:19:27 UTC (rev 21495) @@ -43,7 +43,7 @@ MIGRATE_FILES = proftpd.conf -EXTRA_CONFIGURE_ENV = install_user=$(shell id -un) install_group=$(shell id -gn) +EXTRA_CONFIGURE_ENV = install_user=$(shell /usr/xpg4/bin/id -un) install_group=$(shell /usr/xpg4/bin/id -gn) EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" libexecdir = $(libdir)/proftpd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jul 11 08:09:35 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 11 Jul 2013 06:09:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21496] csw/mgar/pkg/gstplugins_bad/trunk/Makefile Message-ID: Revision: 21496 http://gar.svn.sourceforge.net/gar/?rev=21496&view=rev Author: cgrzemba Date: 2013-07-11 06:09:28 +0000 (Thu, 11 Jul 2013) Log Message: ----------- gstplugins_bad/trunk: update build dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-10 23:19:27 UTC (rev 21495) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2013-07-11 06:09:28 UTC (rev 21496) @@ -35,6 +35,7 @@ BUILD_DEP_PKGS += CSWliboil BUILD_DEP_PKGS += CSWfconfig BUILD_DEP_PKGS += CSWftype2 +BUILD_DEP_PKGS += CSWlibsndfile-dev GARCOMPILER = GCC4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Jul 11 11:07:32 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 11 Jul 2013 09:07:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21497] csw/mgar/pkg/silctoolkit/trunk/Makefile Message-ID: Revision: 21497 http://gar.svn.sourceforge.net/gar/?rev=21497&view=rev Author: lblume Date: 2013-07-11 09:07:27 +0000 (Thu, 11 Jul 2013) Log Message: ----------- silctoolkit/trunk: Complete the split so that libsilcclient has its own little package Modified Paths: -------------- csw/mgar/pkg/silctoolkit/trunk/Makefile Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-07-11 06:09:28 UTC (rev 21496) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-07-11 09:07:27 UTC (rev 21497) @@ -12,16 +12,23 @@ VENDOR_URL = http://silcnet.org/software/download/toolkit/ +# This is the same as what Debian used to do: +# http://packages.debian.org/squeeze/libsilc-1.1-2 +# http://packages.debian.org/squeeze/libsilcclient-1.1-3 +# It seems they now have dropped SILC altogether PACKAGES += CSWlibsilc1-1-2 SPKG_DESC_CSWlibsilc1-1-2 = Secure internet live conferencing toolkit, libsilc-1.1.so.2 -# This is the same as Debian: -# http://packages.debian.org/sid/m68k/libsilc-1.1-2/filelist PKGFILES_CSWlibsilc1-1-2 += $(call pkgfiles_lib,libsilc-1.1.so.2) -PKGFILES_CSWlibsilc1-1-2 += $(call pkgfiles_lib,libsilcclient-1.1.so.2) PKGFILES_CSWlibsilc1-1-2 += $(call baseisadirs,$(libdir)/silc,.*) OBSOLETED_BY_CSWlibsilc1-1-2 += CSWsilctoolkit +PACKAGES += CSWlibsilcclient1-1-3 +SPKG_DESC_CSWlibsilcclient1-1-3 += Secure internet live conferencing toolkit, libsilcclient-1.1.so.3 +PKGFILES_CSWlibsilcclient1-1-3 += $(call pkgfiles_lib,libsilcclient-1.1.so.3) + +OBSOLETED_BY_CSWlibsilcclient1-1-3 += CSWsilctoolkit + # This is because of the modules in lib/silc/*.so CHECKPKG_OVERRIDES_CSWlibsilc1-1-2 += soname-not-part-of-filename @@ -32,11 +39,8 @@ SPKG_DESC_CSWlibsilc-dev = Development files for libsilc-1.1.so.2 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibsilc-dev += CSWlibsilc1-1-2 +RUNTIME_DEP_PKGS_CSWlibsilc-dev += CSWlibsilcclient1-1-3 -# False positives -CHECKPKG_OVERRIDES_CSWlibsilc-dev += shared-lib-package-contains-so-symlink -CHECKPKG_OVERRIDES_CSWlibsilc-dev += shared-lib-pkgname-mismatch - BUILD64 = 1 CONFIGURE_ARGS += $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 12:45:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 11 Jul 2013 10:45:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21498] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 21498 http://gar.svn.sourceforge.net/gar/?rev=21498&view=rev Author: chninkel Date: 2013-07-11 10:45:50 +0000 (Thu, 11 Jul 2013) Log Message: ----------- proftpd/trunk: fix local state directory location Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-11 09:07:27 UTC (rev 21497) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2013-07-11 10:45:50 UTC (rev 21498) @@ -47,11 +47,10 @@ EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" libexecdir = $(libdir)/proftpd -localstatedir = /var/run/proftpd +localstatedir = /var/run/ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --libexecdir=$(libdir)/proftpd -CONFIGURE_ARGS += --localstatedir=/var/run/proftpd CONFIGURE_ARGS += --enable-dso --disable-static CONFIGURE_ARGS += --enable-facl CONFIGURE_ARGS += --enable-openssl @@ -115,7 +114,6 @@ ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(docdir)/proftpd ginstall -d $(DESTDIR)$(localstatedir)/proftpd - ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/ cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(docdir)/proftpd cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Jul 11 15:41:47 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 11 Jul 2013 13:41:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21499] csw/mgar/pkg/pidgin/trunk/Makefile Message-ID: Revision: 21499 http://gar.svn.sourceforge.net/gar/?rev=21499&view=rev Author: lblume Date: 2013-07-11 13:41:45 +0000 (Thu, 11 Jul 2013) Log Message: ----------- pidgin/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2013-07-11 10:45:50 UTC (rev 21498) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2013-07-11 13:41:45 UTC (rev 21499) @@ -52,7 +52,6 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWpango RUNTIME_DEP_PKGS_CSWpidgin += CSWperl RUNTIME_DEP_PKGS_CSWpidgin += CSWpython -RUNTIME_DEP_PKGS_CSWpidgin += CSWsilctoolkit RUNTIME_DEP_PKGS_CSWpidgin += CSWtcl RUNTIME_DEP_PKGS_CSWpidgin += CSWtk RUNTIME_DEP_PKGS_CSWpidgin += CSWdbus @@ -73,8 +72,10 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpanelw5 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3 BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibxml2-dev @@ -82,7 +83,7 @@ BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibpcre-dev -BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWlibfreetype-dev BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWsunx11devel @@ -97,6 +98,7 @@ BUILD_DEP_PKGS += CSWlibnss-dev BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWmeanwhile-dev +BUILD_DEP_PKGS += CSWlibsilc-dev PATCHFILES += patch-pidgin-Makefile.in PATCHFILES += patch-pidgin-plugin.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jul 11 22:40:06 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 11 Jul 2013 20:40:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21500] csw/mgar/pkg/lang-python/pyelftools/trunk/files/ 0002-Correctly-handle-the-multiple-string-tables-case-for.patch Message-ID: Revision: 21500 http://gar.svn.sourceforge.net/gar/?rev=21500&view=rev Author: chninkel Date: 2013-07-11 20:40:02 +0000 (Thu, 11 Jul 2013) Log Message: ----------- pyelftools/trunk: updated a patch to fix a mistake Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch 2013-07-11 13:41:45 UTC (rev 21499) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch 2013-07-11 20:40:02 UTC (rev 21500) @@ -1,20 +1,20 @@ -From b6a5e70d938ccf3532b5c6ae6de04fd68bfaca39 Mon Sep 17 00:00:00 2001 +From 9bded48f12ea546cc8ef958032000af2097daf6b Mon Sep 17 00:00:00 2001 From: Yann Rouillard Date: Tue, 9 Jul 2013 20:22:27 +0200 Subject: [PATCH] Correctly handle the "multiple string tables" case for string resolution in the dynamic section -The string table used to resolve various strings in the dynamic section -is given by an entry of the dynamic section, the one with the DT_STRTAB tag. +The index of the string table section used to resolve various strings in the +dynamic section is given by the sh_link field in the dynamic section header. As several string tables with the same name can co-exist in an elf file -we must explicitely look for the string table pointed by this tag instead -of relying on a section search by name. +we must explicitely look for this specific string table instead of +looking for the first string table in the file. --- - elftools/elf/dynamic.py | 33 +++++++++++++++++++++++++++------ - 1 file changed, 27 insertions(+), 6 deletions(-) + elftools/elf/dynamic.py | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/elftools/elf/dynamic.py b/elftools/elf/dynamic.py -index 60fb450..dd150be 100644 +index 60fb450..e36598e 100644 --- a/elftools/elf/dynamic.py +++ b/elftools/elf/dynamic.py @@ -28,12 +28,11 @@ class DynamicTag(object): @@ -22,56 +22,33 @@ 'DT_SUNW_FILTER']) - def __init__(self, entry, elffile): -+ def __init__(self, entry, stringtable=None): ++ def __init__(self, entry, stringtable): self.entry = entry -- if entry.d_tag in self._HANDLED_TAGS: + if entry.d_tag in self._HANDLED_TAGS: - dynstr = elffile.get_section_by_name(b'.dynstr') -+ if entry.d_tag in self._HANDLED_TAGS and stringtable: setattr(self, entry.d_tag[3:].lower(), - dynstr.get_string(self.entry.d_val)) + stringtable.get_string(self.entry.d_val)) def __getitem__(self, name): """ Implement dict-like access to entries -@@ -44,7 +43,7 @@ class DynamicTag(object): - return '' % (self.entry.d_tag, self.entry) - - def __str__(self): -- if self.entry.d_tag in self._HANDLED_TAGS: -+ if hasattr(self, self.entry.d_tag[3:].lower()): - s = '"%s"' % getattr(self, self.entry.d_tag[3:].lower()) - else: - s = '%#x' % self.entry.d_ptr -@@ -61,6 +60,28 @@ class Dynamic(object): +@@ -54,13 +53,14 @@ class DynamicTag(object): + class Dynamic(object): + """ Shared functionality between dynamic sections and segments. + """ +- def __init__(self, stream, elffile, position): ++ def __init__(self, stream, elffile, stringtable, position): + self._stream = stream + self._elffile = elffile + self._elfstructs = elffile.structs self._num_tags = -1 self._offset = position self._tagsize = self._elfstructs.Elf_Dyn.sizeof() -+ # Several string tables can exist in a elf file, so we -+ # must find the one associated with the dynamic section, -+ # which is the one pointed at by the DT_STRTAB dynamic tag -+ self._find_and_set_stringtable() -+ -+ def _find_and_set_stringtable(self): -+ """ Find and set the stringtable section associated -+ with the dynamic section -+ """ -+ # We don't have yet the stringtable, so we set it to None to be able -+ # to iterate through tags without trying to do string table resolution -+ # at that time -+ self._stringtable = None -+ for tag in self.iter_tags(): -+ if tag['d_tag'] == 'DT_STRTAB': -+ # the DT_STRTAB tag points directly to the string table address -+ # not the section header, so we iterate throught sections until -+ # we found the one which points to the same offset -+ for section in self._elffile.iter_sections(): -+ if section['sh_addr'] == tag['d_val']: -+ self._stringtable = section -+ return ++ self._stringtable = stringtable def iter_tags(self, type=None): """ Yield all tags (limit to |type| if specified) -@@ -80,7 +101,7 @@ class Dynamic(object): +@@ -80,7 +80,7 @@ class Dynamic(object): self._elfstructs.Elf_Dyn, self._stream, stream_pos=offset) @@ -80,6 +57,33 @@ def num_tags(self): """ Number of dynamic tags in the file +@@ -100,12 +100,24 @@ class DynamicSection(Section, Dynamic): + """ + def __init__(self, header, name, stream, elffile): + Section.__init__(self, header, name, stream) +- Dynamic.__init__(self, stream, elffile, self['sh_offset']) ++ stringtable = elffile.get_section(header['sh_link']) ++ Dynamic.__init__(self, stream, elffile, stringtable, self['sh_offset']) + + + class DynamicSegment(Segment, Dynamic): + """ ELF dynamic table segment. Knows how to process the list of tags. + """ + def __init__(self, header, stream, elffile): ++ # The string table section to be used to resolve string names in ++ # the dynamic tag array is the one pointed at by the sh_link field ++ # of the dynamic section header. ++ # So we must look for the dynamic section contained in the dynamic ++ # segment, we do so by searching for the dynamic section whose content ++ # is located at the same offset as the dynamic segment ++ for section in elffile.iter_sections(): ++ if (isinstance(section, DynamicSection) and ++ section['sh_offset'] == header['p_offset']): ++ stringtable = elffile.get_section(section['sh_link']) ++ break + Segment.__init__(self, header, stream) +- Dynamic.__init__(self, stream, elffile, self['p_offset']) ++ Dynamic.__init__(self, stream, elffile, stringtable, self['p_offset']) -- -1.8.3.1 +1.8.1.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jul 12 08:29:50 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 12 Jul 2013 06:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21501] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 21501 http://gar.svn.sourceforge.net/gar/?rev=21501&view=rev Author: cgrzemba Date: 2013-07-12 06:29:49 +0000 (Fri, 12 Jul 2013) Log Message: ----------- qt4-gcc/trunk: update version because 4.8.1 core dump on Sparc Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/checksums Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-11 20:40:02 UTC (rev 21500) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-12 06:29:49 UTC (rev 21501) @@ -1,7 +1,7 @@ # $Id$ NAME = qt -VERSION = 4.8.1 +VERSION = 4.8.4 GARTYPE = v2 MAJOR = $(basename $(basename $(VERSION))) @@ -28,9 +28,11 @@ # replace SSL cert location REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp REINPLACE_USRLOCAL += src/3rdparty/webkit/Source/WebCore/plugins/PluginDatabase.cpp + PATCHFILES += mkspec-csw.patch # bug in 4.8.1, see: https//bugreports.qt-project.org/browse/QTBUG-25281 -PATCHFILES += 0001-shapeinput.patch +# PATCHFILES += 0001-shapeinput.patch + BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWunixodbc-dev BUILD_DEP_PKGS += CSWpostgresql-dev Modified: csw/mgar/pkg/qt4-gcc/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/checksums 2013-07-11 20:40:02 UTC (rev 21500) +++ csw/mgar/pkg/qt4-gcc/trunk/checksums 2013-07-12 06:29:49 UTC (rev 21501) @@ -1 +1 @@ -7960ba8e18ca31f0c6e4895a312f92ff qt-everywhere-opensource-src-4.8.1.tar.gz +89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jul 12 09:06:33 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 12 Jul 2013 07:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21502] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21502 http://gar.svn.sourceforge.net/gar/?rev=21502&view=rev Author: cgrzemba Date: 2013-07-12 07:06:33 +0000 (Fri, 12 Jul 2013) Log Message: ----------- qt4-gcc/trunk: refine checkpkg overrride Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-12 06:29:49 UTC (rev 21501) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-12 07:06:33 UTC (rev 21502) @@ -125,7 +125,7 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6 -CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1 +CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.$(VERSION) PACKAGES += CSWqt4-dev SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files @@ -218,8 +218,9 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4 -CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1 +CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.$(VERSION) + PACKAGES += CSWlibqtopengl4 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtopengl4 += $(DESCRIPTION), libQtOpenGL.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jul 12 11:43:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 12 Jul 2013 09:43:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21503] csw/mgar/pkg/lang-python/pyqt/trunk Message-ID: Revision: 21503 http://gar.svn.sourceforge.net/gar/?rev=21503&view=rev Author: pfelecan Date: 2013-07-12 09:43:47 +0000 (Fri, 12 Jul 2013) Log Message: ----------- lang-python/pyqt/trunk: - version bump - generate and include configuration script Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile csw/mgar/pkg/lang-python/pyqt/trunk/checksums csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-12 07:06:33 UTC (rev 21502) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-12 09:43:47 UTC (rev 21503) @@ -1,7 +1,7 @@ # $Id$ NAME = pyqt -VERSION = 4.10.1 +VERSION = 4.10.2 CATEGORIES = python GARTYPE = v2 @@ -76,11 +76,53 @@ include gar/category.mk -PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) +PATH := /opt/csw/gnu:$(PATH) +# all this hoopla to obtain the file required by projects based on the +# old PyQt build system providing this script +$(WORKSRC)/pyqtconfig.py: + cd $(WORKSRC) && \ + rm -f reference && \ + touch reference && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + python configure.py \ + --verbose \ + --confirm-license \ + --assume-shared \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ + LFLAGS="${LDFLAGS}" \ + && \ + gfind . -type f -newer reference | \ + ggrep -v '^[.]/pyqtconfig.py$$' | \ + xargs rm \ + && \ + rmdir \ + ./phonon \ + ./Qt \ + ./QtCore \ + ./QtDBus \ + ./QtDeclarative \ + ./QtDesigner \ + ./QtGui \ + ./QtHelp \ + ./QtMultimedia \ + ./QtNetwork \ + ./QtOpenGL \ + ./QtScript \ + ./QtScriptTools \ + ./QtSql \ + ./QtSvg \ + ./QtTest \ + ./QtXml \ + ./sip/Qt \ + && \ + rm reference + # assume share because QT_SHARED doesn't get defined in the # configuration environment (TODO: explore issue in depth) -configure-custom: +configure-custom: $(WORKSRC)/pyqtconfig.py cd $(WORKSRC) && \ /usr/bin/env -i \ $(CONFIGURE_ENV) \ @@ -108,4 +150,6 @@ /usr/bin/env -i \ $(INSTALL_ENV) \ $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/pyqtconfig.py $(DESTDIR)/$(libdir)/python/site-packages/PyQt4 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/pyqt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-07-12 07:06:33 UTC (rev 21502) +++ csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-07-12 09:43:47 UTC (rev 21503) @@ -1 +1 @@ -e5973c4ec0b0469f329bc00209d2ad9c PyQt-x11-gpl-4.10.1.tar.gz +9257e12fec9b1b21e5a0d76d455d1691 PyQt-x11-gpl-4.10.2.tar.gz Modified: csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-07-12 07:06:33 UTC (rev 21502) +++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-07-12 09:43:47 UTC (rev 21503) @@ -1,15 +1,14 @@ -From 7ad6eea32906e2cf2f0f016b48854a4cb5d247ff Mon Sep 17 00:00:00 2001 +From a61b2572022b23ee0f6f6b1c3cebf786d850e62f Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Mon, 6 May 2013 14:23:33 +0200 +Date: Wed, 10 Jul 2013 19:14:25 +0200 Subject: [PATCH] disable ocsw unsupported modules --- - configure-ng.py | 15 --------------- - configure.py | 25 +------------------------ - 2 files changed, 1 insertion(+), 39 deletions(-) + configure-ng.py | 18 ------------------ + 1 file changed, 18 deletions(-) diff --git a/configure-ng.py b/configure-ng.py -index ad7b594..0a64412 100644 +index 100ba59..3ee4977 100644 --- a/configure-ng.py +++ b/configure-ng.py @@ -73,10 +73,8 @@ class ModuleMetadata: @@ -68,89 +67,16 @@ if target_config.qt_version < 0x050000: check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h', -diff --git a/configure.py b/configure.py -index 81eb0e1..2934fad 100644 ---- a/configure.py -+++ b/configure.py -@@ -366,14 +366,9 @@ class ConfigurePyQt4: - extra_libs=sql_libs) - check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()") - check_module("QtTest", "QtTest", "QTest::qSleep(0)") -- check_module("QtWebKit", "qwebpage.h", "new QWebPage()") - check_module("QtXml", "qdom.h", "new QDomDocument()") -- check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") - check_module("phonon", "phonon/videowidget.h", - "new Phonon::VideoWidget()") -- check_module("QtAssistant", "qassistantclient.h", -- "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, -- extra_libs=ass_libs) +@@ -969,9 +954,6 @@ def check_modules(target_config, verbose): + else: + inform("QtDesigner module disabled with static Qt libraries.") - if not qt_shared: - sipconfig.inform("QtDesigner module disabled with static Qt libraries.") -@@ -381,8 +376,6 @@ class ConfigurePyQt4: - check_module("QtDesigner", "QExtensionFactory", - "new QExtensionFactory()") - -- check_module("QAxContainer", "qaxobject.h", "new QAxObject()") +- check_module(target_config, verbose, 'QAxContainer', 'qaxobject.h', +- 'new QAxObject()') - - if os.path.isdir(os.path.join(src_dir, "dbus")): - check_dbus() - -@@ -507,21 +500,12 @@ class ConfigurePyQt4: - if "QtTest" in pyqt_modules: - generate_code("QtTest") - -- if "QtWebKit" in pyqt_modules: -- generate_code("QtWebKit") -- - if "QtXml" in pyqt_modules: - generate_code("QtXml") - -- if "QtXmlPatterns" in pyqt_modules: -- generate_code("QtXmlPatterns") -- - if "phonon" in pyqt_modules: - generate_code("phonon") - -- if "QtAssistant" in pyqt_modules: -- generate_code("QtAssistant") -- - if "QtDesigner" in pyqt_modules: - qpy_inc_dir, qpy_lib_dir, qpy_lib = self._qpy_directories("QtDesigner", "qpydesigner") - -@@ -535,9 +519,6 @@ class ConfigurePyQt4: - generate_code("QtDesigner", extra_include_dirs=[qpy_inc_dir], - extra_lib_dirs=[qpy_lib_dir], extra_libs=[qpy_lib]) - -- if "QAxContainer" in pyqt_modules: -- generate_code("QAxContainer") -- - # Generate the composite module. - qtmod_sipdir = os.path.join("sip", "Qt") - mk_clean_dir(qtmod_sipdir) -@@ -1277,7 +1258,7 @@ def compile_qt_program(name, mname, extra_include_dirs=None, extra_lib_dirs=None - opengl = (mname == "QtOpenGL") - - qt = [mname] -- if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"): -+ if mname in ("QtHelp", "QtOpenGL"): - qt.append("QtCore") - - makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, -@@ -1576,13 +1557,9 @@ def needed_qt_libs(mname, qt_libs): - "QtSql": ["QtGui"], - "QtSvg": ["QtGui"], - "QtTest": ["QtGui"], -- "QtWebKit": ["QtNetwork", "QtGui"], - "QtXml": ["QtCore"], -- "QtXmlPatterns": ["QtNetwork", "QtCore"], - "phonon": ["QtGui"], -- "QtAssistant": ["QtNetwork", "QtGui"], - "QtDesigner": ["QtGui"], -- "QAxContainer": ["QtGui"] - } - - # Handle the dependencies first. + # Qt v4.7 was current when we added support for QtDBus and we didn't bother + # properly versioning its API. + if target_config.qt_version >= 0x040700: -- -1.8.1.4 +1.8.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Jul 12 14:00:21 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 12 Jul 2013 12:00:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21504] csw/mgar/pkg/libwebp/trunk Message-ID: Revision: 21504 http://gar.svn.sourceforge.net/gar/?rev=21504&view=rev Author: lblume Date: 2013-07-12 12:00:19 +0000 (Fri, 12 Jul 2013) Log Message: ----------- libwebp/trunk: Bump version to 0.3.1; update dependencies Modified Paths: -------------- csw/mgar/pkg/libwebp/trunk/Makefile csw/mgar/pkg/libwebp/trunk/checksums Modified: csw/mgar/pkg/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-12 09:43:47 UTC (rev 21503) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-12 12:00:19 UTC (rev 21504) @@ -1,8 +1,8 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = libwebp -VERSION = 0.1.2 +NAME = libwebp +VERSION = 0.3.1 GARTYPE = v2 DESCRIPTION = An image format that does lossy compression of digital photographic images @@ -13,28 +13,33 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz +GARCOMPILER = SOS12U3 + PACKAGES += CSWlibwebp-dev -SPKG_DESC_CSWlibwebp-dev = Development files for libwebp.so.0 +SPKG_DESC_CSWlibwebp-dev = Development files for libwebp.so.4 PKGFILES_CSWlibwebp-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibwebp-dev += CSWlibwebp0 +RUNTIME_DEP_PKGS_CSWlibwebp-dev += CSWlibwebp4 -PACKAGES += CSWlibwebp0 -SPKG_DESC_CSWlibwebp0 = Library for the WebP lossy photographic image format, libwebp.so.0 -PKGFILES_CSWlibwebp0 = $(call pkgfiles_lib,libwebp.so.0) +PACKAGES += CSWlibwebp4 +SPKG_DESC_CSWlibwebp4 = Library for the WebP lossy photographic image format, libwebp.so.4 +PKGFILES_CSWlibwebp4 = $(call pkgfiles_lib,libwebp.so.4) PACKAGES += CSWwebp SPKG_DESC_CSWwebp = An image format that does lossy compression of digital photographic images # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWwebp += CSWlibwebp0 -RUNTIME_DEP_PKGS_CSWwebp += CSWpng -RUNTIME_DEP_PKGS_CSWwebp += CSWjpeg -BUILD64_LIBS_ONLY = 1 +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibtiff-dev -# On amd64 -xO3 results in an assembler error -OPT_FLAGS_SOS-amd64 = -xO2 -OPT_FLAGS_SOS = $(or $(OPT_FLAGS_SOS-$(ISA)),-xO3) +RUNTIME_DEP_PKGS_CSWwebp += CSWlibwebp4 +RUNTIME_DEP_PKGS_CSWwebp += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWwebp += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWwebp += CSWlibtiff3 +ISAEXEC = 1 +BUILD64 = 1 + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/libwebp/trunk/checksums =================================================================== --- csw/mgar/pkg/libwebp/trunk/checksums 2013-07-12 09:43:47 UTC (rev 21503) +++ csw/mgar/pkg/libwebp/trunk/checksums 2013-07-12 12:00:19 UTC (rev 21504) @@ -1 +1 @@ -5534f6e3c8b9f5851a9a5b56bf78f2b0 libwebp-0.1.2.tar.gz +dc862bb4006d819b7587767a9e83d31f libwebp-0.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Jul 13 13:13:31 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 13 Jul 2013 11:13:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21505] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 21505 http://gar.svn.sourceforge.net/gar/?rev=21505&view=rev Author: lblume Date: 2013-07-13 11:13:26 +0000 (Sat, 13 Jul 2013) Log Message: ----------- librsvg/trunk: Respin the package; clean up dependencies; No version bump as they've got non trivial deps Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2013-07-12 12:00:19 UTC (rev 21504) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2013-07-13 11:13:26 UTC (rev 21505) @@ -8,16 +8,18 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz # Upstream develops on gcc only PATCHFILES += pdiff.patch PATCHFILES += perceptualdiff.patch -VENDOR_URL = http://librsvg.sourceforge.net +VENDOR_URL = https://wiki.gnome.org/LibRsvg LICENSE = COPYING.LIB +GARCOMPILER = SOS12U3 + # We need the new glib only available on Solaris 10 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -28,17 +30,13 @@ SPKG_DESC_CSWlibrsvg2-2 = Scalable Vector Graphics library, librsvg-2.so.2 PKGFILES_CSWlibrsvg2-2 += $(call pkgfiles_lib,librsvg-2.so.2) RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgdk-pixbuf2-0-0 OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg PACKAGES += CSWlibrsvg-dev @@ -54,41 +52,22 @@ SPKG_DESC_CSWrsvg += SVG to raster image conversion utility # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg2-2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWftype2 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWgtk2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWpango -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco -RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgtk-x11-2-0-0 PACKAGES += CSWlibrsvg-gnome SPKG_DESC_CSWlibrsvg-gnome += Scalable Vector Graphics library - Gnome module PKGFILES_CSWlibrsvg-gnome += $(call baseisadirs,$(libdir),gtk-2.0/.*) RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibrsvg2-2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpango -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgtk-x11-2-0-0 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2013-07-12 12:00:19 UTC (rev 21504) +++ csw/mgar/pkg/librsvg/trunk/checksums 2013-07-13 11:13:26 UTC (rev 21505) @@ -1 +1 @@ -59581f17a6d34d81b4d73872d1a9f01b librsvg-2.35.0.tar.bz2 +190e81d8d4ed34583c71a5842e51f405 librsvg-2.35.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jul 14 15:56:57 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 14 Jul 2013 13:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21506] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 21506 http://gar.svn.sourceforge.net/gar/?rev=21506&view=rev Author: pfelecan Date: 2013-07-14 13:56:55 +0000 (Sun, 14 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: bump to the freshest 2.x version Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-13 11:13:26 UTC (rev 21505) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-14 13:56:55 UTC (rev 21506) @@ -1,12 +1,13 @@ # $Id$ NAME = Python -VERSION = 2.7.3 +VERSION = 2.7.5 VER = 2.7 DVER = 2-7 UVER = 2_7 PVER = python$(VER) -CVER = 27 +# I wish to replace 2.6 by 2.7: +#CVER = 27 # Known issues: # @@ -50,10 +51,12 @@ # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. -SKIPTEST = 1 +#SKIPTEST = 1 +TEST_SCRIPTS = custom BUILD64 = 1 +GARCOMPILER = GNU EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib @@ -155,6 +158,10 @@ BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWlibgdbm-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk @@ -240,6 +247,10 @@ done @$(MAKECOOKIE) +test-custom: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -i -k -C $(OBJDIR) test + $(MAKECOOKIE) + post-merge-modulated: echo "This is post-merge-modulated, which should not work. But it does." ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2013-07-13 11:13:26 UTC (rev 21505) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2013-07-14 13:56:55 UTC (rev 21506) @@ -1 +1 @@ -c57477edd6d18bd9eeca2f21add73919 Python-2.7.3.tar.bz2 +6334b666b7ff2038c761d7b27ba699c1 Python-2.7.5.tar.bz2 Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff 2013-07-13 11:13:26 UTC (rev 21505) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff 2013-07-14 13:56:55 UTC (rev 21506) @@ -26,7 +26,7 @@ ) libraries = [] -+ elif platform == 'sunos5': ++ elif host_platform == 'sunos5': + macros = dict( # Solaris + HAVE_SEM_OPEN=0, # Not Implemented + HAVE_SEM_TIMEDWAIT=0, # Not Implemented This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jul 14 17:59:41 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 14 Jul 2013 15:59:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21507] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21507 http://gar.svn.sourceforge.net/gar/?rev=21507&view=rev Author: pfelecan Date: 2013-07-14 15:59:39 +0000 (Sun, 14 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: provides python symbolic link, somebody must provide it, isn't it? Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-14 13:56:55 UTC (rev 21506) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-14 15:59:39 UTC (rev 21507) @@ -203,7 +203,7 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' -EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python +#EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Jul 14 22:05:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 14 Jul 2013 20:05:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21508] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 21508 http://gar.svn.sourceforge.net/gar/?rev=21508&view=rev Author: lblume Date: 2013-07-14 20:04:55 +0000 (Sun, 14 Jul 2013) Log Message: ----------- ImageMagick/trunk: Bump version to 6.8.6-5; dependencies cleanup Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-14 15:59:39 UTC (rev 21507) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-14 20:04:55 UTC (rev 21508) @@ -1,7 +1,7 @@ -NAME = imagemagick -VERSION = 6.7.3 -GARSUBREV = 10 -GARTYPE = v2 +NAME = imagemagick +VERSION = 6.8.6 +GARSUBREV = 5 +GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images define BLURB @@ -20,135 +20,87 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # Compilation breaks with internal error on SOS12 and SOS12U1 -GARCOMPILER = SOS12U2 +GARCOMPILER = SOS12U3 VENDOR_URL = http://www.imagemagick.org LICENSE = LICENSE -BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel -BUILD_DEP_PKGS += CSWilmbasedevel BUILD_DEP_PKGS += CSWliblcms-dev BUILD_DEP_PKGS += CSWlibcairo-dev -BUILD_DEP_PKGS += CSWliblqrdevel BUILD_DEP_PKGS += CSWlibwmf-dev BUILD_DEP_PKGS += CSWliblzma-dev BUILD_DEP_PKGS += CSWopenexrdevel BUILD_DEP_PKGS += CSWlibwebp-dev BUILD_DEP_PKGS += CSWlibfpx-dev +BUILD_DEP_PKGS += CSWlibdjvulibre-dev +BUILD_DEP_PKGS += CSWgraphvizdevel +BUILD_DEP_PKGS += CSWilmbase-dev +BUILD_DEP_PKGS += CSWliblqr-dev +BUILD_DEP_PKGS += CSWlibjasper-dev -PACKAGES += CSWlibmagick++5 -PKGFILES_CSWlibmagick++5 += $(call pkgfiles_lib,libMagick++.so.5) -SPKG_DESC_CSWlibmagick++5 += Library from ImageMagick, libMagick++.so.5 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickcore5 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickwand5 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblzma5 +PACKAGES += CSWlibmagickcore6q16hdri1 +CATALOGNAME_CSWlibmagickcore6q16hdri1 = libmagickcore6q16hdri1 +SPKG_DESC_CSWlibmagickcore6q16hdri1 += Library from ImageMagick, libMagickCore-6.Q16HDRI.so.1 +PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1\.0\.0) +PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibglib2-0-0 -PACKAGES += CSWlibmagickcore5 -PKGFILES_CSWlibmagickcore5 += $(call pkgfiles_lib,libMagickCore.so.5) -SPKG_DESC_CSWlibmagickcore5 += Library from ImageMagick, libMagickCore.so.5 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblzma5 +# For some reason, on sparc only, this gets linked against glib2 +# Override is for x86 only +CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibglib2-0-0 -# Gnuplot is detected by the magic cookie #!/usr/local/bin/gnuplot -# XXX: Is this correct? -# CHECKPKG_OVERRIDES_CSWlibmagickcore5 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.5.0.0 +PACKAGES += CSWlibmagickwand6q16hdri1 +CATALOGNAME_CSWlibmagickwand6q16hdri1 = libmagickwand6q16hdri1 +SPKG_DESC_CSWlibmagickwand6q16hdri1 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.1 +PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1\.0\.0) +PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1 -PACKAGES += CSWlibmagickwand5 -PKGFILES_CSWlibmagickwand5 += $(call pkgfiles_lib,libMagickWand.so.5) -SPKG_DESC_CSWlibmagickwand5 += Library from ImageMagick, libMagickWand.so.5 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibmagickcore5 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblzma5 - PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries # In man3 there is just the manpage for the Perl module PKGFILES_DEVEL_MAN3_MANPAGE = PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) PKGFILES_CSWimagemagick-dev += $(docdir)/.* -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++5 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore5 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand5 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl -# This is all in /opt/csw/share/doc -CHECKPKG_OVERRIDES_CSWimagemagick-dev += file-with-bad-content PACKAGES += CSWimagemagick SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx1 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit -RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibz1 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5 RUNTIME_DEP_PKGS_CSWimagemagick += CSWpango RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwebp0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwebp4 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjbig2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibdjvulibre21 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjasper1 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 PACKAGES += CSWpm-image-magick SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick @@ -156,49 +108,42 @@ PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl -RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore6q16hdri1 +# No binary in that package, since no 64 bit perl +CHECKPKG_OVERRIDES_CSWpm-image-magick += 64-bit-binaries-missing + REINPLACE_USRLOCAL += config/mime.xml -REINPLACEMENTS += gnuplot -REINPLACE_MATCH_gnuplot = /usr/local/bin/gnuplot -REINPLACE_WITH_gnuplot = $(bindir)/gnuplot -REINPLACE_FILES_gnuplot += magick/magic.c +EXTRA_LINKER_FLAGS = -Bdirect -norunpath -lsocket -lnsl +EXTRA_LD_OPTIONS = -z nolazyload +EXTRA_CFLAGS = -xc99 -norunpath -# This is part of ImageMagick and should be automatically adjusted during configure time -REINPLACEMENTS += display -REINPLACE_MATCH_display = /usr/local/bin/display -REINPLACE_WITH_display = $(bindir)/display -REINPLACE_FILES_display += magick/delegate.c - -REINPLACEMENTS += nostdcpplib -REINPLACE_MATCH_nostdcpplib = -lstdc\+\+ -REINPLACE_WITH_nostdcpplib = -REINPLACE_FILES_nostdcpplib = Makefile.in - -EXTRA_LINKER_FLAGS = -norunpath - -# This is for libdps, skipping this line makes the following tests fail: -# FAIL: tests/validate-formats-on-disk.sh -# FAIL: Magick++/tests/coderInfo.sh -EXTRA_LIB = /usr/openwin/lib - # We especially don't want ISALIST for the above /usr/openwin/lib # This should be reworked after a general rework of ISALIST in GAR RUNPATH_ISALIST = $(libpath_install) CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-static +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-maintainer-mode + +# This one causes the Q16HDR in the lib name CONFIGURE_ARGS += --enable-hdri -CONFIGURE_ARGS += --with-dps=yes -# Ghostscript lib is linked to Sun X11 -# CONFIGURE_ARGS += --with-gslib=no +# At this point, adding the C++ bits might cause more grief than good +CONFIGURE_ARGS += --without-magick-plus-plus +# For some reason, on x86, DPS is only available as a 32 bit lib, and +# really, it's not the future anymore: drop it. +CONFIGURE_ARGS += --without-dps + CONFIGURE_ARGS += --with-modules=yes CONFIGURE_ARGS += --disable-silent-rules +CONFIGURE_ARGS += --with-wmf +CONFIGURE_ARGS += --with-rsvg -# Until librsvg,graphviz and perl is 64bit +# Until graphviz and perl is 64bit CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl CONFIGURE_ARGS-64 += --without-gvc CONFIGURE_ARGS-64 += --without-perl @@ -213,6 +158,11 @@ BUILD64 = 1 ISAEXEC = 1 +REINPLACEMENTS += gnuplot +REINPLACE_MATCH_gnuplot = /usr/local/bin/gnuplot +REINPLACE_WITH_gnuplot = $(bindir)/gnuplot +REINPLACE_FILES_gnuplot += magick/magic.c + # Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2013-07-14 15:59:39 UTC (rev 21507) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2013-07-14 20:04:55 UTC (rev 21508) @@ -1 +1 @@ -6bf001ae206bffe77693732e4e886532 ImageMagick-6.7.3-10.tar.xz +ee6e195d18012fb6b2bd82634ea51fd1 ImageMagick-6.8.6-5.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Jul 15 09:53:35 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 15 Jul 2013 07:53:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21509] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 21509 http://gar.svn.sourceforge.net/gar/?rev=21509&view=rev Author: lblume Date: 2013-07-15 07:53:26 +0000 (Mon, 15 Jul 2013) Log Message: ----------- ImageMagick/trunk: Redefine the magick++ library package Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-14 20:04:55 UTC (rev 21508) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-15 07:53:26 UTC (rev 21509) @@ -66,6 +66,14 @@ PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1 +PACKAGES += CSWlibmagick++6q16hdri1 +CATALOGNAME_CSWlibmagick++6q16hdri1 = libmagick++6q16hdri1 +PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1\.0\.0) +PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibmagick++6q16hdri1 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickwand6q16hdri1 + PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries # In man3 there is just the manpage for the Perl module @@ -75,6 +83,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl PACKAGES += CSWimagemagick @@ -117,7 +126,8 @@ EXTRA_LINKER_FLAGS = -Bdirect -norunpath -lsocket -lnsl EXTRA_LD_OPTIONS = -z nolazyload -EXTRA_CFLAGS = -xc99 -norunpath +EXTRA_CFLAGS = -xc99 -norunpath +EXTRA_CXXFLAGS = -xnorunpath # We especially don't want ISALIST for the above /usr/openwin/lib # This should be reworked after a general rework of ISALIST in GAR @@ -131,9 +141,6 @@ # This one causes the Q16HDR in the lib name CONFIGURE_ARGS += --enable-hdri -# At this point, adding the C++ bits might cause more grief than good -CONFIGURE_ARGS += --without-magick-plus-plus - # For some reason, on x86, DPS is only available as a 32 bit lib, and # really, it's not the future anymore: drop it. CONFIGURE_ARGS += --without-dps This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Jul 15 22:40:10 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 15 Jul 2013 20:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21510] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 21510 http://gar.svn.sourceforge.net/gar/?rev=21510&view=rev Author: wilbury Date: 2013-07-15 20:40:04 +0000 (Mon, 15 Jul 2013) Log Message: ----------- powerdns/trunk: Update to 3.3, recipe adjusting, direct binding, etc... Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile csw/mgar/pkg/powerdns/trunk/checksums Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2013-07-15 07:53:26 UTC (rev 21509) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2013-07-15 20:40:04 UTC (rev 21510) @@ -2,7 +2,7 @@ # $Id$ # NAME = pdns -VERSION = 3.1 +VERSION = 3.3 GARTYPE = v2 DESCRIPTION = An advanced DNS server with multiple backends @@ -32,6 +32,9 @@ DISTFILES += LICENSE DISTFILES += cswpdns PATCHFILES += 0003-Use-gar-instead-of-ar-for-ranlib.patch +PATCHFILES += 0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch +PATCHFILES += 0005-Correctly-determine-build-user-host.patch +PATCHFILES += 0006-Correct-defines.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) @@ -54,16 +57,12 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc$(prefix)/pdns CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns -CONFIGURE_ARGS += --disable-recursor CONFIGURE_ARGS += --with-lua=no CONFIGURE_ARGS += --with-boost=/opt/csw/gxx CONFIGURE_ARGS += --with-mysql=$(prefix) CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include CONFIGURE_ARGS += --with-sqlite3 -CONFIGURE_ARGS += --with-sqlite=$(prefix) -CONFIGURE_ARGS += --with-sqlite-lib=$(prefix)/lib -CONFIGURE_ARGS += --with-sqlite-includes=$(prefix)/include CONFIGURE_ARGS += --with-modules="ldap geo gmysql gsqlite3" EXTRA_CONFIGURE_ENV += "PKG_CONFIG=/opt/csw/bin/pkg-config" @@ -72,6 +71,8 @@ # Prepend Boost 1.49 installation in paths so we pick up the correct one EXTRA_INC = /opt/csw/gxx/include LDFLAGS += -L/opt/csw/gxx/lib +LDFLAGS += -Wl,-B,direct +LDFLAGS += -Wl,-z,ignore # PowerDNS does not have any "test" target SKIPTEST = 1 @@ -79,9 +80,9 @@ PACKAGES = CSWpdns CATALOGNAME_CSWpdns = powerdns SPKG_DESC_CSWpdns = PowerDNS -RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 +#RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWpdns += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-prog-opts1-49-0-gxx RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-s13n1-49-0-gxx @@ -96,6 +97,7 @@ # These are not errors! CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns +CHECKPKG_OVERRIDES_CSWpdns += soname-unused INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf Modified: csw/mgar/pkg/powerdns/trunk/checksums =================================================================== --- csw/mgar/pkg/powerdns/trunk/checksums 2013-07-15 07:53:26 UTC (rev 21509) +++ csw/mgar/pkg/powerdns/trunk/checksums 2013-07-15 20:40:04 UTC (rev 21510) @@ -1 +1 @@ -7dedae65403b31a795b2d53a512947fd pdns-3.1.tar.gz +73932211fe9895e02dc60713fe12c005 pdns-3.3.tar.gz Added: csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-PF_UNIX-instead-of-AF_LOCAL.patch 2013-07-15 20:40:04 UTC (rev 21510) @@ -0,0 +1,25 @@ +From 45fdb1b0623f3e8fafc101046e07d1cf78ae4479 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 14 Jul 2013 23:14:56 +0200 +Subject: [PATCH] Use PF_UNIX instead of AF_LOCAL + +--- + modules/pipebackend/coprocess.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc +index 8f9f454..ee9c42b 100644 +--- a/modules/pipebackend/coprocess.cc ++++ b/modules/pipebackend/coprocess.cc +@@ -166,7 +166,7 @@ void CoProcess::sendReceive(const string &snd, string &rcv) + + UnixRemote::UnixRemote(const string& path, int timeout) + { +- d_fd = socket(AF_LOCAL, SOCK_STREAM, 0); ++ d_fd = socket(PF_UNIX, SOCK_STREAM, 0); + if(d_fd < 0) + throw AhuException("Unable to create UNIX domain socket: "+string(strerror(errno))); + +-- +1.8.3.1 + Added: csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0005-Correctly-determine-build-user-host.patch 2013-07-15 20:40:04 UTC (rev 21510) @@ -0,0 +1,39 @@ +From f63be3823949306e6e10760358a4d645dafe75d2 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Mon, 15 Jul 2013 00:22:19 +0200 +Subject: [PATCH] Correctly determine build user at host + +--- + pdns/Makefile.am | 2 +- + pdns/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pdns/Makefile.am b/pdns/Makefile.am +index a9157bb..b52815d 100644 +--- a/pdns/Makefile.am ++++ b/pdns/Makefile.am +@@ -297,7 +297,7 @@ backends/bind/bindparser.cc: + + + build_date=$(shell LC_TIME=C date '+%Y%m%d%H%M%S') +-build_host=$(shell id -u -n)@$(shell hostname -f) ++build_host=$(shell /usr/xpg4/bin/id -u -n)@$(shell uname -n) + if RELEASE_BUILD + pdns_version=$(PACKAGE_VERSION) + dist_host=$(DIST_HOST) +diff --git a/pdns/Makefile.in b/pdns/Makefile.in +index 9ff359c..a2b62e0 100644 +--- a/pdns/Makefile.in ++++ b/pdns/Makefile.in +@@ -922,7 +922,7 @@ misc.cc unix_utility.cc qtype.cc + pdns_control_LDFLAGS = @THREADFLAGS@ + TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message + build_date = $(shell LC_TIME=C date '+%Y%m%d%H%M%S') +-build_host = $(shell id -u -n)@$(shell hostname -f) ++build_host = $(shell /usr/xpg4/bin/id -u -n)@$(shell uname -n) + # Do the test in shell, so we don't confuse automake with ifeq/ifneq. + @RELEASE_BUILD_FALSE at pdns_version = $(shell test -z "$(git_version)" && echo UNKNOWN || echo "git-$(git_version)") + @RELEASE_BUILD_TRUE at pdns_version = $(PACKAGE_VERSION) +-- +1.8.3.1 + Added: csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0006-Correct-defines.patch 2013-07-15 20:40:04 UTC (rev 21510) @@ -0,0 +1,29 @@ +From f96765da7184034ecf9962a98425ff88326f3541 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Mon, 15 Jul 2013 00:24:19 +0200 +Subject: [PATCH 7/7] Correct #defines + +--- + pdns/nameserver.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc +index 3efe3ca..ceb4c87 100644 +--- a/pdns/nameserver.cc ++++ b/pdns/nameserver.cc +@@ -76,10 +76,9 @@ extern StatBag S; + The main() of PowerDNS can be found in receiver.cc - start reading there for further insights into the operation of the nameserver + */ + +-#ifdef IP_PKTINFO ++#if defined (IP_PKTINFO) + #define GEN_IP_PKTINFO IP_PKTINFO +-#endif +-#ifdef IP_RECVDSTADDR ++#elif defined (IP_RECVDSTADDR) + #define GEN_IP_PKTINFO IP_RECVDSTADDR + #endif + +-- +1.8.3.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 Tue Jul 16 00:38:29 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 15 Jul 2013 22:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21511] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 21511 http://gar.svn.sourceforge.net/gar/?rev=21511&view=rev Author: rthurner Date: 2013-07-15 22:38:22 +0000 (Mon, 15 Jul 2013) Log Message: ----------- subversion: upgrade to svn-1.8.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 2013-07-15 20:40:04 UTC (rev 21510) +++ csw/mgar/pkg/subversion/trunk/Makefile 2013-07-15 22:38:22 UTC (rev 21511) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.9 +VERSION = 1.8.0 GARTYPE = v2 DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2013-07-15 20:40:04 UTC (rev 21510) +++ csw/mgar/pkg/subversion/trunk/checksums 2013-07-15 22:38:22 UTC (rev 21511) @@ -1 +1 @@ -8d532025771a67c06c23f299699f056f subversion-1.7.9.tar.bz2 +f053a9948dfe5c70eff5c00509723214 subversion-1.8.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Jul 16 18:30:21 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 16 Jul 2013 16:30:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21512] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 21512 http://gar.svn.sourceforge.net/gar/?rev=21512&view=rev Author: jake_goerzen Date: 2013-07-16 16:30:19 +0000 (Tue, 16 Jul 2013) Log Message: ----------- dovecot: update to version 2.1.17 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-07-15 22:38:22 UTC (rev 21511) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-07-16 16:30:19 UTC (rev 21512) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.1.16 +VERSION = 2.1.17 GARTYPE = v2 DESCRIPTION = Secure IMAP server @@ -18,8 +18,6 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = 0002-add-stdio.h-to-quota-status.c.patch - GARCOMPILER = SOS12 PACKAGES = CSWdovecot CSWdovecot-dev Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-07-15 22:38:22 UTC (rev 21511) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-07-16 16:30:19 UTC (rev 21512) @@ -1 +1 @@ -72abf618cfa678194f9338f6c0aeb47d dovecot-2.1.16.tar.gz +d4414771f3cd524a608b8dae03913d4c dovecot-2.1.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Jul 17 10:02:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 17 Jul 2013 08:02:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21513] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 21513 http://gar.svn.sourceforge.net/gar/?rev=21513&view=rev Author: lblume Date: 2013-07-17 08:01:49 +0000 (Wed, 17 Jul 2013) Log Message: ----------- ImageMagick/trunk: Switch compiler to GCC Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-16 16:30:19 UTC (rev 21512) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-17 08:01:49 UTC (rev 21513) @@ -15,12 +15,12 @@ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz -PATCHFILES += 0001-Do-not-strip-norunpath.patch +# Not needed anymore with GCC, I think +#PATCHFILES += 0001-Do-not-strip-norunpath.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -# Compilation breaks with internal error on SOS12 and SOS12U1 -GARCOMPILER = SOS12U3 +GARCOMPILER = GCC4 VENDOR_URL = http://www.imagemagick.org @@ -124,10 +124,8 @@ REINPLACE_USRLOCAL += config/mime.xml -EXTRA_LINKER_FLAGS = -Bdirect -norunpath -lsocket -lnsl +EXTRA_LINKER_FLAGS = -lsocket -lnsl EXTRA_LD_OPTIONS = -z nolazyload -EXTRA_CFLAGS = -xc99 -norunpath -EXTRA_CXXFLAGS = -xnorunpath # We especially don't want ISALIST for the above /usr/openwin/lib # This should be reworked after a general rework of ISALIST in GAR @@ -151,9 +149,9 @@ CONFIGURE_ARGS += --with-rsvg # Until graphviz and perl is 64bit -CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl +#CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl CONFIGURE_ARGS-64 += --without-gvc -CONFIGURE_ARGS-64 += --without-perl +CONFIGURE_ARGS += --without-perl CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) # One test is failing: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jul 17 10:39:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 17 Jul 2013 08:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21514] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 21514 http://gar.svn.sourceforge.net/gar/?rev=21514&view=rev Author: pfelecan Date: 2013-07-17 08:39:16 +0000 (Wed, 17 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: - transformed the majority of old style patches to gar style patches and adapt to the 2.7 sources - explore using a non versioned destination directory in order to aleviate the transition from the previous version Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch Removed Paths: ------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/faqwiz.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/makesetup.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/modules.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/multiprocess.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/python-config-in.diff csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-17 08:39:16 UTC (rev 21514) @@ -38,25 +38,38 @@ DISTFILES += pyport.h # Patches -PATCHFILES += faqwiz.diff -PATCHFILES += makesetup.diff -PATCHFILES += modules.diff -PATCHFILES += multiprocess.diff -PATCHFILES += pyport.diff -# This patch needs to go away -# PATCHFILES += site.diff -PATCHFILES += python-config-in.diff -PATCHFILES += setup.diff -# PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +PATCHFILES += 0001-setup.patch +PATCHFILES += 0002-faqwiz.patch +PATCHFILES += 0003-makesetup.patch +PATCHFILES += 0004-modules.patch +PATCHFILES += 0005-multiprocess.patch +PATCHFILES += 0006-python-config-in.patch +PATCHFILES += 0007-pyport.patch +# after experiments and failures I think that with the upstream +# byzantine build system using a generic /opt/csw/lib/python directory +# is not such a good idea, e.g. there are interferences in early +# stages of the build when not all shared objects are built, +# e.g. cStringIO, and the system falls back on the 2.6 provided one, +# if the previous version is installed, and havoc ensues... Building +# without previous Python installed works. +PATCHFILES += 0008-site.patch +# TODO: evaluate the following patches from this branch files directory: +# 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +# getpass.patch +# patch_2.diff.txt +# and review the complement patches from the trunk's files directory + # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. #SKIPTEST = 1 TEST_SCRIPTS = custom -BUILD64 = 1 +# for a faster turn-around: +#BUILD64 = 1 GARCOMPILER = GNU +GARFLAVOR = DBG EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib @@ -79,7 +92,6 @@ 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 @@ -145,16 +157,16 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) # Don't merge test files. -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.* BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWggettext-dev Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,111 @@ +From d2205faf194d7cc3adfc11a0f8f58e6e75f4da7a Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 11:43:50 +0200 +Subject: [PATCH] setup + +based on the 2.6 site.diff with adaptations +--- + setup.py | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +diff --git a/setup.py b/setup.py +index 716f08e..fc58444 100644 +--- a/setup.py ++++ b/setup.py +@@ -436,9 +436,9 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) + + def detect_modules(self): +- # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # Ensure that /opt/csw is always used ++ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') ++ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') + self.add_gcc_paths() + self.add_multiarch_paths() + +@@ -783,7 +783,7 @@ class PyBuildExt(build_ext): + libraries=math_libs) ) + # Detect SSL support for the socket module (via _ssl) + search_for_ssl_incs_in = [ +- '/usr/local/ssl/include', ++ '/opt/csw/ssl/include', + '/usr/contrib/ssl/include/' + ] + ssl_incs = find_file('openssl/ssl.h', inc_dirs, +@@ -795,7 +795,7 @@ class PyBuildExt(build_ext): + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', ++ ['/opt/csw/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) + +@@ -920,10 +920,10 @@ class PyBuildExt(build_ext): + # top of the normal inc_dirs. + db_inc_paths = [ + '/usr/include/db4', +- '/usr/local/include/db4', ++ '/opt/csw/include/db4', + '/opt/sfw/include/db4', + '/usr/include/db3', +- '/usr/local/include/db3', ++ '/opt/csw/include/db3', + '/opt/sfw/include/db3', + # Fink defaults (http://fink.sourceforge.net/) + '/sw/include/db4', +@@ -933,8 +933,8 @@ class PyBuildExt(build_ext): + for x in gen_db_minor_ver_nums(4): + db_inc_paths.append('/usr/include/db4%d' % x) + db_inc_paths.append('/usr/include/db4.%d' % x) +- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) +- db_inc_paths.append('/usr/local/include/db4%d' % x) ++ db_inc_paths.append('/opt/csw/BerkeleyDB.4.%d/include' % x) ++ db_inc_paths.append('/opt/csw/include/db4%d' % x) + db_inc_paths.append('/pkg/db-4.%d/include' % x) + db_inc_paths.append('/opt/db-4.%d/include' % x) + # MacPorts default (http://www.macports.org/) +@@ -942,8 +942,8 @@ class PyBuildExt(build_ext): + # 3.x minor number specific paths + for x in gen_db_minor_ver_nums(3): + db_inc_paths.append('/usr/include/db3%d' % x) +- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) +- db_inc_paths.append('/usr/local/include/db3%d' % x) ++ db_inc_paths.append('/opt/csw/BerkeleyDB.3.%d/include' % x) ++ db_inc_paths.append('/opt/csw/include/db3%d' % x) + db_inc_paths.append('/pkg/db-3.%d/include' % x) + db_inc_paths.append('/opt/db-3.%d/include' % x) + +@@ -1094,9 +1094,9 @@ class PyBuildExt(build_ext): + sqlite_inc_paths = [ '/usr/include', + '/usr/include/sqlite', + '/usr/include/sqlite3', +- '/usr/local/include', +- '/usr/local/include/sqlite', +- '/usr/local/include/sqlite3', ++ '/opt/csw/include', ++ '/opt/csw/include/sqlite', ++ '/opt/csw/include/sqlite3', + ] + if cross_compiling: + sqlite_inc_paths = [] +@@ -1555,6 +1555,14 @@ class PyBuildExt(build_ext): + macros = dict() + libraries = [] + ++ elif host_platform == 'sunos5': ++ macros = dict( # Solaris ++ HAVE_SEM_OPEN=0, # Not Implemented ++ HAVE_SEM_TIMEDWAIT=0, # Not Implemented ++ HAVE_FD_TRANSFER=1, ++ ) ++ libraries = ['rt'] ++ + else: # Linux and other unices + macros = dict() + libraries = ['rt'] +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,26 @@ +From 0dc3e5cd576a09af3d88a00c473291b7c2cb0d3f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 12:58:31 +0200 +Subject: [PATCH] faqwiz + +based on faqwiz.diff from 2.6 +--- + Tools/faqwiz/faqconf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py +index d1acd80..05d060a 100644 +--- a/Tools/faqwiz/faqconf.py ++++ b/Tools/faqwiz/faqconf.py +@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" # Name for feedback + 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 +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,35 @@ +From 337c51f7a5c0f68561d415aefc7ba889a3897a13 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 13:49:06 +0200 +Subject: [PATCH] makesetup + +based on makesetup from 2.6 +--- + Modules/makesetup | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Modules/makesetup b/Modules/makesetup +index 8862c36..c28e3a8 100755 +--- a/Modules/makesetup ++++ b/Modules/makesetup +@@ -214,10 +214,15 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | + glmodule.c) ;; + /*) ;; + \$*) ;; +- *) src='$(srcdir)/'"$srcdir/$src";; ++ *) src='$(srcdir)/'"$srcdir/$src";; + esac + case $doconfig in +- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ no) case $src in ++ *bsddb.*) ++ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ *) ++ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ esac;; + *) + cc="$cc \$(PY_CFLAGS)";; + esac +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,30 @@ +From 74b002eee8ef49739c50073c20233dab2bacc25b Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 14:05:03 +0200 +Subject: [PATCH] modules + +based on modules.diff from 2.6 +--- + Modules/Setup.dist | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Modules/Setup.dist b/Modules/Setup.dist +index 2ad1aa3..04f7bc1 100644 +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -367,9 +367,10 @@ GLHACK=-Dclear=__GLclear + # + # First, look at Setup.config; configure may have set this for you. + +-#_curses _cursesmodule.c -lcurses -ltermcap ++*shared* ++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap + # Wrapper for the panel library that's part of ncurses and SYSV curses. +-#_curses_panel _curses_panel.c -lpanel -lncurses ++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap + + + # Generic (SunOS / SVR4) dynamic loading module. +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,56 @@ +From b4da8e66d1a74bad609e0b6f585670a4180d0bb0 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 14:16:24 +0200 +Subject: [PATCH] multiprocess + +based on multiprocess.diff from 2.6 +--- + Modules/_multiprocessing/multiprocessing.h | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h +index 14425de..c9fd187 100644 +--- a/Modules/_multiprocessing/multiprocessing.h ++++ b/Modules/_multiprocessing/multiprocessing.h +@@ -48,6 +48,20 @@ + #endif + + /* ++ * Solaris 8 missing CMSG_SPACE and CMSG_LEN ++ */ ++#ifndef CMSG_SPACE ++# define CMSG_SPACE(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \ ++ _CMSG_HDR_ALIGN(l)) ++# warning "assuming 4-byte alignment for CMSG_SPACE" ++#endif /* CMSG_SPACE */ ++ ++#ifndef CMSG_LEN ++# define CMSG_LEN(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l)) ++# warning "assuming 4-byte alignment for CMSG_LEN" ++#endif /* CMSG_LEN */ ++ ++/* + * Issue 3110 - Solaris does not define SEM_VALUE_MAX + */ + #ifndef SEM_VALUE_MAX +@@ -64,6 +78,17 @@ + + + /* ++ * Issue 3110 - Solaris does not define SEM_VALUE_MAX ++ */ ++#ifndef SEM_VALUE_MAX ++# ifdef _SEM_VALUE_MAX ++# define SEM_VALUE_MAX _SEM_VALUE_MAX ++# else ++# define SEM_VALUE_MAX INT_MAX ++# endif ++#endif ++ ++/* + * Make sure Py_ssize_t available + */ + +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,24 @@ +From 220ff3d78b11ae5e1f00c42f20b77d8898156ca1 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 14:41:26 +0200 +Subject: [PATCH] python config in + +based on python-config-in.diff from 2.6 with adaptations +--- + Misc/python-config.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Misc/python-config.in b/Misc/python-config.in +index ca9857a..40d5357 100644 +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -53,5 +53,6 @@ for opt in opt_flags: + libs.insert(0, '-L' + getvar('LIBPL')) + if not getvar('PYTHONFRAMEWORK'): + libs.extend(getvar('LINKFORSHARED').split()) ++ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib') + print ' '.join(libs) + +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,29 @@ +From 9a42a63a00b689fa655a0b9323b72eade67e0de9 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 15 Jul 2013 14:51:36 +0200 +Subject: [PATCH] pyport + +based on pyport.diff from 2.6 +--- + Include/pyport.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Include/pyport.h b/Include/pyport.h +index 85e852f..c1fea29 100644 +--- a/Include/pyport.h ++++ b/Include/pyport.h +@@ -640,11 +640,6 @@ Please be conservative with adding new ones, document them and enclose them + in platform-specific #ifdefs. + **************************************************************************/ + +-#ifdef SOLARIS +-/* Unchecked */ +-extern int gethostname(char *, int); +-#endif +- + #ifdef __BEOS__ + /* Unchecked */ + /* It's in the libs, but not the headers... - [cjh] */ +-- +1.8.3.1 + Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-17 08:39:16 UTC (rev 21514) @@ -0,0 +1,161 @@ +From aba7368c957a565f1f2b3770aaef3fe950816a1b Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 16 Jul 2013 16:59:44 +0200 +Subject: [PATCH] site + +based on site.diff from 2.6 with adaptations +--- + Lib/distutils/sysconfig.py | 2 +- + Lib/site.py | 2 +- + Lib/sysconfig.py | 32 ++++++++++++++++---------------- + Lib/trace.py | 4 ++-- + Makefile.pre.in | 6 +++--- + Modules/getpath.c | 6 +++--- + 6 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 0c726d9..a9ada72 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -120,7 +120,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib", "python") + if standard_lib: + return libpython + else: +diff --git a/Lib/site.py b/Lib/site.py +index f1b0ae8..be21919 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -289,7 +289,7 @@ def getsitepackages(): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib", +- "python" + sys.version[:3], ++ "python", + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index aa69351..b177b61 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -7,12 +7,12 @@ from os.path import pardir, realpath + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', +- 'include': '{base}/include/python{py_version_short}', +- 'platinclude': '{platbase}/include/python{py_version_short}', ++ 'stdlib': '{base}/lib/python', ++ 'platstdlib': '{platbase}/lib/python', ++ 'purelib': '{base}/lib/python/site-packages', ++ 'platlib': '{platbase}/lib/python/site-packages', ++ 'include': '{base}/include/python', ++ 'platinclude': '{platbase}/include/python', + 'scripts': '{base}/bin', + 'data': '{base}', + }, +@@ -47,11 +47,11 @@ _INSTALL_SCHEMES = { + 'data' : '{base}', + }, + 'os2_home': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'include': '{userbase}/include/python{py_version_short}', ++ 'stdlib': '{userbase}/lib/python', ++ 'platstdlib': '{userbase}/lib/python', ++ 'purelib': '{userbase}/lib/python/site-packages', ++ 'platlib': '{userbase}/lib/python/site-packages', ++ 'include': '{userbase}/include/python', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', + }, +@@ -65,11 +65,11 @@ _INSTALL_SCHEMES = { + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'include': '{userbase}/include/python{py_version_short}', ++ 'stdlib': '{userbase}/lib/python', ++ 'platstdlib': '{userbase}/lib/python', ++ 'purelib': '{userbase}/lib/python/site-packages', ++ 'platlib': '{userbase}/lib/python/site-packages', ++ 'include': '{userbase}/include/python', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', + }, +diff --git a/Lib/trace.py b/Lib/trace.py +index 38a13e2..a54e9e7 100644 +--- a/Lib/trace.py ++++ b/Lib/trace.py +@@ -755,10 +755,10 @@ def main(argv=None): + + s = s.replace("$prefix", + os.path.join(sys.prefix, "lib", +- "python" + sys.version[:3])) ++ "python")) + s = s.replace("$exec_prefix", + os.path.join(sys.exec_prefix, "lib", +- "python" + sys.version[:3])) ++ "python")) + s = os.path.normpath(s) + ignore_dirs.append(s) + continue +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 9d55550..b723a50 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -109,11 +109,11 @@ CONFINCLUDEDIR= $(exec_prefix)/include + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +-BINLIBDEST= $(LIBDIR)/python$(VERSION) +-LIBDEST= $(SCRIPTDIR)/python$(VERSION) ++BINLIBDEST= $(LIBDIR)/python ++LIBDEST= $(SCRIPTDIR)/python + INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) + CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) +-LIBP= $(LIBDIR)/python$(VERSION) ++LIBP= $(LIBDIR)/python + + # Symbols used for using shared libraries + SO= @SO@ +diff --git a/Modules/getpath.c b/Modules/getpath.c +index de96d47..9a88383 100644 +--- a/Modules/getpath.c ++++ b/Modules/getpath.c +@@ -117,8 +117,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib/python:" \ ++ EXEC_PREFIX "/lib/python/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib/python"; + + static void + reduce(char *dir) +-- +1.8.3.1 + Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/faqwiz.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/faqwiz.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/faqwiz.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -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 Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/makesetup.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/makesetup.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/makesetup.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,20 +0,0 @@ ---- Python-2.6.1/Modules/makesetup 2007-09-05 06:47:34.000000000 -0500 -+++ ./makesetup 2009-02-07 23:03:55.374463810 -0600 -@@ -214,10 +214,15 @@ - glmodule.c) ;; - /*) ;; - \$*) ;; -- *) src='$(srcdir)/'"$srcdir/$src";; -+ *) src='$(srcdir)/'"$srcdir/$src";; - esac - case $doconfig in -- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ no) case $src in -+ *bsddb.*) -+ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ *) -+ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ esac;; - *) - cc="$cc \$(PY_CFLAGS)";; - esac Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/modules.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/modules.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/modules.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,15 +0,0 @@ ---- Python-2.6.1/Modules/Setup.dist 2008-11-27 04:15:12.000000000 -0600 -+++ Setup.dist 2009-02-08 18:17:58.937507864 -0600 -@@ -363,9 +363,10 @@ - # - # First, look at Setup.config; configure may have set this for you. - --#_curses _cursesmodule.c -lcurses -ltermcap -+*shared* -+_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap - # Wrapper for the panel library that's part of ncurses and SYSV curses. --#_curses_panel _curses_panel.c -lpanel -lncurses -+_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap - - - # Generic (SunOS / SVR4) dynamic loading module. Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/multiprocess.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/multiprocess.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/multiprocess.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,45 +0,0 @@ ---- Python-2.6.1/Modules/_multiprocessing/multiprocessing.h 2008-11-04 14:43:31.000000000 -0600 -+++ ./multiprocessing.h 2009-02-08 11:44:33.901496225 -0600 -@@ -39,6 +39,20 @@ - #endif - - /* -+ * Solaris 8 missing CMSG_SPACE and CMSG_LEN -+ */ -+#ifndef CMSG_SPACE -+# define CMSG_SPACE(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \ -+ _CMSG_HDR_ALIGN(l)) -+# warning "assuming 4-byte alignment for CMSG_SPACE" -+#endif /* CMSG_SPACE */ -+ -+#ifndef CMSG_LEN -+# define CMSG_LEN(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l)) -+# warning "assuming 4-byte alignment for CMSG_LEN" -+#endif /* CMSG_LEN */ -+ -+/* - * Issue 3110 - Solaris does not define SEM_VALUE_MAX - */ - #ifndef SEM_VALUE_MAX -Index: Python-2.6.2/Modules/_multiprocessing/multiprocessing.h -=================================================================== ---- Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (revision 66181) -+++ Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (working copy) -@@ -37,6 +37,17 @@ - #endif - - /* -+ * Issue 3110 - Solaris does not define SEM_VALUE_MAX -+ */ -+#ifndef SEM_VALUE_MAX -+# ifdef _SEM_VALUE_MAX -+# define SEM_VALUE_MAX _SEM_VALUE_MAX -+# else -+# define SEM_VALUE_MAX INT_MAX -+# endif -+#endif -+ -+/* - * Make sure Py_ssize_t available - */ - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,14 +0,0 @@ ---- Python-2.6.1/Include/pyport.h 2008-06-11 02:41:16.000000000 -0500 -+++ pyport.h 2009-02-08 18:17:58.936872246 -0600 -@@ -449,11 +449,6 @@ - in platform-specific #ifdefs. - **************************************************************************/ - --#ifdef SOLARIS --/* Unchecked */ --extern int gethostname(char *, int); --#endif -- - #ifdef __BEOS__ - /* Unchecked */ - /* It's in the libs, but not the headers... - [cjh] */ Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/python-config-in.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/python-config-in.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/python-config-in.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,10 +0,0 @@ ---- Python-2.6.1/Misc/python-config.in.orig 2009-03-02 12:51:22.272566712 -0600 -+++ Python-2.6.1/Misc/python-config.in 2009-03-02 12:50:38.306680748 -0600 -@@ -49,5 +49,7 @@ - # shared library in prefix/lib/. - if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): - libs.insert(0, '-L' + getvar('LIBPL')) -+ if opt == '--ldflags': -+ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib') - print ' '.join(libs) - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff 2013-07-17 08:01:49 UTC (rev 21513) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff 2013-07-17 08:39:16 UTC (rev 21514) @@ -1,39 +0,0 @@ ---- Python-2.6.2/setup.py.o 2009-07-29 15:44:48.389269300 -0500 -+++ Python-2.6.2/setup.py 2009-07-29 15:43:32.509619500 -0500 -@@ -309,9 +309,9 @@ - return sys.platform - - def detect_modules(self): -- # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ # Ensure that /opt/csw is always used -+ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') -+ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -989,7 +989,7 @@ - # we do not build this one. Otherwise this build will pick up - # the more recent berkeleydb's db.h file first in the include path - # when attempting to compile and it will fail. -- f = "/usr/include/db.h" -+ f = "/opt/csw/include/db_185.h" - if os.path.exists(f) and not db_incs: - data = open(f).read() - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) -@@ -1300,6 +1300,14 @@ - ) - libraries = [] - -+ elif host_platform == 'sunos5': -+ macros = dict( # Solaris -+ HAVE_SEM_OPEN=0, # Not Implemented -+ HAVE_SEM_TIMEDWAIT=0, # Not Implemented -+ HAVE_FD_TRANSFER=1, -+ ) -+ libraries = ['rt'] -+ - else: # Linux and other unices - macros = dict( - HAVE_SEM_OPEN=1, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jul 17 16:56:03 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 17 Jul 2013 14:56:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21515] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 21515 http://gar.svn.sourceforge.net/gar/?rev=21515&view=rev Author: cgrzemba Date: 2013-07-17 14:56:00 +0000 (Wed, 17 Jul 2013) Log Message: ----------- libxml2/trunk: add patch for build for python 2.6.8 Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-07-17 08:39:16 UTC (rev 21514) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-07-17 14:56:00 UTC (rev 21515) @@ -14,6 +14,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(DISTNAME).tar.gz # PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch +PATCHFILES = 0002-fix-PyCapsulate-for-python-version-less-2.7.patch sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw Added: csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch 2013-07-17 14:56:00 UTC (rev 21515) @@ -0,0 +1,17 @@ +--- a/python/libxml_wrap.h ++++ b/python/libxml_wrap.h +@@ -34,13 +34,13 @@ + #define PyBytes_AsString PyString_AsString + #define PyBytes_AS_STRING PyString_AS_STRING + #define PyBytes_GET_SIZE PyString_GET_SIZE ++#endif + + #define PyCapsule_New PyCObject_FromVoidPtrAndDesc + #define PyCapsule_CheckExact PyCObject_Check + #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o)) + + #endif +-#endif + + /** + * ATTRIBUTE_UNUSED: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jul 17 17:02:54 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 17 Jul 2013 15:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21516] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 21516 http://gar.svn.sourceforge.net/gar/?rev=21516&view=rev Author: cgrzemba Date: 2013-07-17 15:02:54 +0000 (Wed, 17 Jul 2013) Log Message: ----------- libxml2/trunk: add bug reference Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-07-17 14:56:00 UTC (rev 21515) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-07-17 15:02:54 UTC (rev 21516) @@ -14,6 +14,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(DISTNAME).tar.gz # PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch +# see Bug: https://www.opencsw.org/mantis/view.php?id=5093 PATCHFILES = 0002-fix-PyCapsulate-for-python-version-less-2.7.patch sysconfdir = /etc/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Jul 17 18:21:35 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 17 Jul 2013 16:21:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21517] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 21517 http://gar.svn.sourceforge.net/gar/?rev=21517&view=rev Author: jake_goerzen Date: 2013-07-17 16:21:33 +0000 (Wed, 17 Jul 2013) Log Message: ----------- dovecot: upgrade to version 2.2.4 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-07-17 15:02:54 UTC (rev 21516) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-07-17 16:21:33 UTC (rev 21517) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.1.17 +VERSION = 2.2.4 GARTYPE = v2 DESCRIPTION = Secure IMAP server @@ -14,7 +14,7 @@ endef SPKG_SOURCEURL = http://dovecot.org/ -MASTER_SITES = http://dovecot.org/releases/2.1/ +MASTER_SITES = http://dovecot.org/releases/2.2/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-07-17 15:02:54 UTC (rev 21516) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-07-17 16:21:33 UTC (rev 21517) @@ -1 +1 @@ -d4414771f3cd524a608b8dae03913d4c dovecot-2.1.17.tar.gz +984cfc921a83c580c52c86e128e9dac2 dovecot-2.2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Jul 17 21:19:52 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 17 Jul 2013 19:19:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21518] csw/mgar/pkg/liblqr/trunk Message-ID: Revision: 21518 http://gar.svn.sourceforge.net/gar/?rev=21518&view=rev Author: lblume Date: 2013-07-17 19:19:48 +0000 (Wed, 17 Jul 2013) Log Message: ----------- liblqr/trunk: Bump version to 0.4.2; dependencies cleanup; use GCC4 Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile csw/mgar/pkg/liblqr/trunk/checksums Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2013-07-17 16:21:33 UTC (rev 21517) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2013-07-17 19:19:48 UTC (rev 21518) @@ -1,5 +1,5 @@ NAME = liblqr -VERSION = 0.4.1 +VERSION = 0.4.2 GARTYPE = v2 DESCRIPTION = A seam-carving C/C++ library called Liquid Rescale. @@ -10,14 +10,8 @@ DISTNAME = $(NAME)-1-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 -# Otherwise the inline functions are not exported and are missing during linkage -PATCHFILES += inline.diff +GARCOMPILER = GCC4 -# The compilation succeeds on Solaris 9 without any of these, disable for now. -#PATCHFILES += examples.diff -#PATCHFILES += lqr_carver.c.diff - -# New glib2 is only available on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 VENDOR_URL = http://liblqr.wikidot.com/ @@ -25,8 +19,8 @@ PACKAGES += CSWliblqr1-0 SPKG_DESC_CSWliblqr1-0 = A seam-carving C/C++ library called Liquid Rescale, liblqr-1.so.0 PKGFILES_CSWliblqr1-0 += $(call pkgfiles_lib,liblqr-1.so.0) -RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibgcc-s1 OBSOLETED_BY_CSWliblqr1-0 += CSWliblqr PACKAGES += CSWliblqr-dev Modified: csw/mgar/pkg/liblqr/trunk/checksums =================================================================== --- csw/mgar/pkg/liblqr/trunk/checksums 2013-07-17 16:21:33 UTC (rev 21517) +++ csw/mgar/pkg/liblqr/trunk/checksums 2013-07-17 19:19:48 UTC (rev 21518) @@ -1 +1 @@ -0e24ed3c9fcdcb111062640764d7b87a liblqr-1-0.4.1.tar.bz2 +915643d993da97e10665d48c0bf8f3d0 liblqr-1-0.4.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jul 18 11:18:18 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Jul 2013 09:18:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21519] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 21519 http://gar.svn.sourceforge.net/gar/?rev=21519&view=rev Author: cgrzemba Date: 2013-07-18 09:18:11 +0000 (Thu, 18 Jul 2013) Log Message: ----------- netsnmp/trunk: fix init scripts: Mantis 0005094 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-17 19:19:48 UTC (rev 21518) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-18 09:18:11 UTC (rev 21519) @@ -21,7 +21,6 @@ DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -REINPLACE_USRLOCAL = dist/snmp*init.d REINPLACE_USRLOCAL += perl/TrapReceiver/TrapReceiver.pm REINPLACE_USRLOCAL += local/ipf-mod.pl REINPLACE_USRLOCAL += local/traptoemail @@ -31,6 +30,8 @@ # Patch for python module PATCHFILES += Makefile.in.diff PATCHFILES += setup-py.patch +PATCHFILES += 0001-remove-linux-specials.patch +PATCHFILES += 0001-remove-linux-specials-2nd.patch VENDOR_URL = http://www.net-snmp.org/ @@ -200,7 +201,7 @@ ginstall -d $(DESTDIR)/$(sysconfdir)/snmp ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmpd ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmptrapd - ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd + ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd.conf @$(MAKECOOKIE) #post-install-isa-sparcv8: Added: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch 2013-07-18 09:18:11 UTC (rev 21519) @@ -0,0 +1,36 @@ +From bfb169f465df815ce2858acfd9d813b42606aea0 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Thu, 18 Jul 2013 11:00:52 +0200 +Subject: [PATCH] remove linux specials 2nd + +--- + dist/snmptrapd-init.d | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d +index 8225242..7e3c98c 100644 +--- a/dist/snmptrapd-init.d ++++ b/dist/snmptrapd-init.d +@@ -6,18 +6,9 @@ + # chkconfig: - 25 75 + # description: snmptrapd is net-snmp SNMPTRAP daemon. + +-# Source function library. +-. /etc/rc.d/init.d/functions +- +-# Source networking configuration. +-. /etc/sysconfig/network +- +-# Check that networking is up. +-[ "${NETWORKING}" = "no" ] && exit 0 +- + RETVAL=0 + name="snmptrapd" +-prog="/usr/local/sbin/snmptrapd" ++prog="/opt/csw/sbin/snmptrapd" + + [ -x $prog ] || exit 0 + +-- +1.8.3.1 + Added: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch 2013-07-18 09:18:11 UTC (rev 21519) @@ -0,0 +1,39 @@ +From c45b6c9eafe714fb4f2fbaf2ebeecd1e2213dc0f Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Thu, 18 Jul 2013 10:58:52 +0200 +Subject: [PATCH] remove linux specials + +--- + dist/snmpd-init.d | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/dist/snmpd-init.d b/dist/snmpd-init.d +index bd15b00..2ea583f 100755 +--- a/dist/snmpd-init.d ++++ b/dist/snmpd-init.d +@@ -6,20 +6,11 @@ + # chkconfig: - 26 74 + # description: snmpd is net-snmp SNMP daemon. + +-# Source function library. +-. /etc/rc.d/init.d/functions +- +-# Source networking configuration. +-. /etc/sysconfig/network +- +-# Check that networking is up. +-[ "${NETWORKING}" = "no" ] && exit 0 +- + RETVAL=0 + name="snmpd" +-prog="/usr/local/sbin/snmpd" ++prog="/opt/csw/sbin/snmpd" + +-[ -x $prog -a -f /usr/local/share/snmp/snmpd.conf ] || exit 0 ++[ -x $prog -a -f /etc/opt/csw/snmp/snmpd.conf ] || exit 0 + + start() { + # Start daemons. +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jul 18 11:18:50 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 18 Jul 2013 09:18:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21520] csw/mgar/pkg/autogen/trunk Message-ID: Revision: 21520 http://gar.svn.sourceforge.net/gar/?rev=21520&view=rev Author: pfelecan Date: 2013-07-18 09:18:45 +0000 (Thu, 18 Jul 2013) Log Message: ----------- autogen/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile csw/mgar/pkg/autogen/trunk/checksums Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 09:18:11 UTC (rev 21519) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 09:18:45 UTC (rev 21520) @@ -2,7 +2,7 @@ NAME = autogen -VERSION = 5.17.4 +VERSION = 5.18 GARTYPE = v2 DESCRIPTION = The Automated Text and Program Generation Tool @@ -14,7 +14,7 @@ endef MASTER_SITES = $(GNU_MIRROR)/rel$(VERSION)/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.xz PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -113,7 +113,7 @@ include gar/category.mk -PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) +PATH := /opt/csw/gnu:$(PATH) build-nominal: cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) Modified: csw/mgar/pkg/autogen/trunk/checksums =================================================================== --- csw/mgar/pkg/autogen/trunk/checksums 2013-07-18 09:18:11 UTC (rev 21519) +++ csw/mgar/pkg/autogen/trunk/checksums 2013-07-18 09:18:45 UTC (rev 21520) @@ -1 +1 @@ -09f074cba57610bf4ef1147e01c8ae90 autogen-5.17.4.tar.gz +ef49893d65a490f4e1ae0a4d816cf6aa autogen-5.18.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jul 18 12:45:58 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Jul 2013 10:45:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21521] csw/mgar/pkg/evince/trunk Message-ID: Revision: 21521 http://gar.svn.sourceforge.net/gar/?rev=21521&view=rev Author: cgrzemba Date: 2013-07-18 10:45:52 +0000 (Thu, 18 Jul 2013) Log Message: ----------- evince/trunk: update library dependence Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-07-18 09:18:45 UTC (rev 21520) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-07-18 10:45:52 UTC (rev 21521) @@ -90,7 +90,6 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2 RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2 RUNTIME_DEP_PKGS_CSWevince += CSWlibdjvulibre21 -RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib5 RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibintl8 RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo2 @@ -106,6 +105,8 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib8 +RUNTIME_DEP_PKGS_CSWevince += CSWlibkpathsea6 # RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 # RUNTIME_DEP_PKGS_CSWevince += CSWnautilus # RUNTIME_DEP_PKGS_CSWevince += CSWdbus @@ -249,8 +250,13 @@ include gar/category.mk pre-configure-modulated: - cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force - cd $(WORKSRC) && autoreconf + ( cd $(WORKSRC); \ + [ -f ltmain.sh ] && rm ltmain.sh || true; \ + libtoolize --copy --force; \ + aclocal-1.13 --force; \ + autoconf --force; \ + autoheader --force; \ + automake-1.13 --add-missing --copy --force-missing ) @$(MAKECOOKIE) PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-18 10:45:52 UTC (rev 21521) @@ -0,0 +1,13 @@ +diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc +index fef0738..fe53c5a 100644 +--- a/backend/pdf/ev-poppler.cc ++++ b/backend/pdf/ev-poppler.cc +@@ -1986,7 +1986,7 @@ pdf_selection_get_selected_text (EvSelection *selection, + r.x2 = points->x2; + r.y2 = height - points->y1; + +- retval = poppler_page_get_text (poppler_page, ++ retval = poppler_page_get_selected_text (poppler_page, + (PopplerSelectionStyle)style, + &r); + 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 Jul 18 13:12:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Jul 2013 11:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21522] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 21522 http://gar.svn.sourceforge.net/gar/?rev=21522&view=rev Author: wahwah Date: 2013-07-18 11:12:36 +0000 (Thu, 18 Jul 2013) Log Message: ----------- lang-python/python/trunk: /opt/csw/lib/python (no version) is a really bad idea Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-18 10:45:52 UTC (rev 21521) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-18 11:12:36 UTC (rev 21522) @@ -42,7 +42,17 @@ PATCHFILES += modules.diff PATCHFILES += multiprocess.diff PATCHFILES += pyport.diff + +# This patch is an abomination. It should have never been done. +# e.g.: # http://lists.opencsw.org/pipermail/users/2012-October/009332.html +# +# The only reason it is still here is that once done it's really hard to undo, +# because it affects every single python module and python package, so to +# change this you have to rebuild the whole Python world. +# +# I really hope we never ever do this again. PATCHFILES += site.diff + PATCHFILES += python-config-in.diff PATCHFILES += setup.diff PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Jul 18 13:22:49 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 18 Jul 2013 12:22:49 +0100 Subject: [csw-devel] SF.net SVN: gar:[21514] csw/mgar/pkg/lang-python/python/branches/python-2.7 In-Reply-To: References: Message-ID: In general, I'd try to patch as little as possible. There are a lot of patches in this build, maybe not all are actually necessary. For the 2.7 build, I would start with a completely clean build with no patches and only patch when something is actually broken. Many issues from 2.6 are fixed in 2.7 trunk and no patches are necessary any more. 2013/7/17 > > Revision: 21514 > http://gar.svn.sourceforge.net/gar/?rev=21514&view=rev > Author: pfelecan > Date: 2013-07-17 08:39:16 +0000 (Wed, 17 Jul 2013) > Log Message: > ----------- > lang-python/python/branches/python-2.7: > - transformed the majority of old style patches to gar style patches > and adapt to the 2.7 sources Right, this is what I think is a generally bad idea. Many of the 2.6 patches are unnecessary. > - explore using a non versioned destination directory in order to > aleviate the transition from the previous version The unversioned directory is a bad, bad, horrible idea. > Modified Paths: > -------------- > csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile > > Added Paths: > ----------- > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch > > Removed Paths: > ------------- > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/faqwiz.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/makesetup.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/modules.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/multiprocess.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/python-config-in.diff > csw/mgar/pkg/lang-python/python/branches/python-2.7/files/setup.diff > > Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-17 08:01:49 UTC (rev 21513) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-17 08:39:16 UTC (rev 21514) > @@ -38,25 +38,38 @@ > DISTFILES += pyport.h > > # Patches > -PATCHFILES += faqwiz.diff > -PATCHFILES += makesetup.diff > -PATCHFILES += modules.diff > -PATCHFILES += multiprocess.diff > -PATCHFILES += pyport.diff > -# This patch needs to go away > -# PATCHFILES += site.diff > -PATCHFILES += python-config-in.diff > -PATCHFILES += setup.diff > -# PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch > +PATCHFILES += 0001-setup.patch > +PATCHFILES += 0002-faqwiz.patch > +PATCHFILES += 0003-makesetup.patch > +PATCHFILES += 0004-modules.patch > +PATCHFILES += 0005-multiprocess.patch > +PATCHFILES += 0006-python-config-in.patch > +PATCHFILES += 0007-pyport.patch > +# after experiments and failures I think that with the upstream > +# byzantine build system using a generic /opt/csw/lib/python directory > +# is not such a good idea, e.g. there are interferences in early > +# stages of the build when not all shared objects are built, > +# e.g. cStringIO, and the system falls back on the 2.6 provided one, > +# if the previous version is installed, and havoc ensues... Building > +# without previous Python installed works. > +PATCHFILES += 0008-site.patch > > +# TODO: evaluate the following patches from this branch files directory: > +# 0001-FFI_DEFAULT_ABI-to-use-__i386.patch > +# getpass.patch > +# patch_2.diff.txt > +# and review the complement patches from the trunk's files directory > + > # The test for sunaudiodev fails. Not that it's a good practice to skip > # tests. > #SKIPTEST = 1 > TEST_SCRIPTS = custom > > -BUILD64 = 1 > +# for a faster turn-around: > +#BUILD64 = 1 > > GARCOMPILER = GNU > +GARFLAVOR = DBG > EXTRA_INC += $(prefix)/bdb47/include > EXTRA_LIB += $(prefix)/bdb47/lib > > @@ -79,7 +92,6 @@ > 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 > @@ -145,16 +157,16 @@ > RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) > > # Don't merge test files. > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.* > -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.* > +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.* No, no! This is horrible, pleas do not do the /opt/csw/lib/ > > BUILD_DEP_PKGS += CSWlibffi-dev > BUILD_DEP_PKGS += CSWggettext-dev > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,111 @@ > +From d2205faf194d7cc3adfc11a0f8f58e6e75f4da7a Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 11:43:50 +0200 > +Subject: [PATCH] setup > + > +based on the 2.6 site.diff with adaptations > +--- > + setup.py | 36 ++++++++++++++++++++++-------------- > + 1 file changed, 22 insertions(+), 14 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index 716f08e..fc58444 100644 > +--- a/setup.py > ++++ b/setup.py > +@@ -436,9 +436,9 @@ class PyBuildExt(build_ext): > + os.unlink(tmpfile) > + > + def detect_modules(self): > +- # Ensure that /usr/local is always used > +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') > +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') Maybe /usr/local should stay? Is there a reason to remove it? > ++ # Ensure that /opt/csw is always used > ++ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') > ++ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') > + self.add_gcc_paths() > + self.add_multiarch_paths() > + > +@@ -783,7 +783,7 @@ class PyBuildExt(build_ext): > + libraries=math_libs) ) > + # Detect SSL support for the socket module (via _ssl) > + search_for_ssl_incs_in = [ > +- '/usr/local/ssl/include', As above. > ++ '/opt/csw/ssl/include', > + '/usr/contrib/ssl/include/' > + ] > + ssl_incs = find_file('openssl/ssl.h', inc_dirs, > +@@ -795,7 +795,7 @@ class PyBuildExt(build_ext): > + if krb5_h: > + ssl_incs += krb5_h > + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, > +- ['/usr/local/ssl/lib', > ++ ['/opt/csw/ssl/lib', > + '/usr/contrib/ssl/lib/' > + ] ) > + > +@@ -920,10 +920,10 @@ class PyBuildExt(build_ext): > + # top of the normal inc_dirs. > + db_inc_paths = [ > + '/usr/include/db4', > +- '/usr/local/include/db4', > ++ '/opt/csw/include/db4', > + '/opt/sfw/include/db4', > + '/usr/include/db3', > +- '/usr/local/include/db3', > ++ '/opt/csw/include/db3', > + '/opt/sfw/include/db3', > + # Fink defaults (http://fink.sourceforge.net/) > + '/sw/include/db4', > +@@ -933,8 +933,8 @@ class PyBuildExt(build_ext): > + for x in gen_db_minor_ver_nums(4): > + db_inc_paths.append('/usr/include/db4%d' % x) > + db_inc_paths.append('/usr/include/db4.%d' % x) > +- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) > +- db_inc_paths.append('/usr/local/include/db4%d' % x) > ++ db_inc_paths.append('/opt/csw/BerkeleyDB.4.%d/include' % x) > ++ db_inc_paths.append('/opt/csw/include/db4%d' % x) > + db_inc_paths.append('/pkg/db-4.%d/include' % x) > + db_inc_paths.append('/opt/db-4.%d/include' % x) > + # MacPorts default (http://www.macports.org/) > +@@ -942,8 +942,8 @@ class PyBuildExt(build_ext): > + # 3.x minor number specific paths > + for x in gen_db_minor_ver_nums(3): > + db_inc_paths.append('/usr/include/db3%d' % x) > +- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) > +- db_inc_paths.append('/usr/local/include/db3%d' % x) > ++ db_inc_paths.append('/opt/csw/BerkeleyDB.3.%d/include' % x) > ++ db_inc_paths.append('/opt/csw/include/db3%d' % x) > + db_inc_paths.append('/pkg/db-3.%d/include' % x) > + db_inc_paths.append('/opt/db-3.%d/include' % x) > + > +@@ -1094,9 +1094,9 @@ class PyBuildExt(build_ext): > + sqlite_inc_paths = [ '/usr/include', > + '/usr/include/sqlite', > + '/usr/include/sqlite3', > +- '/usr/local/include', > +- '/usr/local/include/sqlite', > +- '/usr/local/include/sqlite3', > ++ '/opt/csw/include', > ++ '/opt/csw/include/sqlite', > ++ '/opt/csw/include/sqlite3', > + ] > + if cross_compiling: > + sqlite_inc_paths = [] > +@@ -1555,6 +1555,14 @@ class PyBuildExt(build_ext): > + macros = dict() > + libraries = [] > + > ++ elif host_platform == 'sunos5': > ++ macros = dict( # Solaris > ++ HAVE_SEM_OPEN=0, # Not Implemented > ++ HAVE_SEM_TIMEDWAIT=0, # Not Implemented I'd check if these are unimplemented in Solaris 10, or maybe this patch is a carryover from Solaris 9 and not necessary any more? > ++ HAVE_FD_TRANSFER=1, > ++ ) > ++ libraries = ['rt'] > ++ > + else: # Linux and other unices > + macros = dict() > + libraries = ['rt'] > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,26 @@ > +From 0dc3e5cd576a09af3d88a00c473291b7c2cb0d3f Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 12:58:31 +0200 > +Subject: [PATCH] faqwiz > + > +based on faqwiz.diff from 2.6 > +--- > + Tools/faqwiz/faqconf.py | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py > +index d1acd80..05d060a 100644 > +--- a/Tools/faqwiz/faqconf.py > ++++ b/Tools/faqwiz/faqconf.py > +@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" # Name for feedback > + 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 > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,35 @@ > +From 337c51f7a5c0f68561d415aefc7ba889a3897a13 Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 13:49:06 +0200 > +Subject: [PATCH] makesetup > + > +based on makesetup from 2.6 > +--- > + Modules/makesetup | 9 +++++++-- > + 1 file changed, 7 insertions(+), 2 deletions(-) > + > +diff --git a/Modules/makesetup b/Modules/makesetup > +index 8862c36..c28e3a8 100755 > +--- a/Modules/makesetup > ++++ b/Modules/makesetup > +@@ -214,10 +214,15 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | > + glmodule.c) ;; > + /*) ;; > + \$*) ;; > +- *) src='$(srcdir)/'"$srcdir/$src";; > ++ *) src='$(srcdir)/'"$srcdir/$src";; > + esac > + case $doconfig in > +- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; > ++ no) case $src in > ++ *bsddb.*) > ++ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; > ++ *) > ++ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; > ++ esac;; > + *) > + cc="$cc \$(PY_CFLAGS)";; > + esac > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,30 @@ > +From 74b002eee8ef49739c50073c20233dab2bacc25b Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 14:05:03 +0200 > +Subject: [PATCH] modules > + > +based on modules.diff from 2.6 > +--- > + Modules/Setup.dist | 5 +++-- > + 1 file changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/Modules/Setup.dist b/Modules/Setup.dist > +index 2ad1aa3..04f7bc1 100644 > +--- a/Modules/Setup.dist > ++++ b/Modules/Setup.dist > +@@ -367,9 +367,10 @@ GLHACK=-Dclear=__GLclear > + # > + # First, look at Setup.config; configure may have set this for you. > + > +-#_curses _cursesmodule.c -lcurses -ltermcap > ++*shared* > ++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap > + # Wrapper for the panel library that's part of ncurses and SYSV curses. > +-#_curses_panel _curses_panel.c -lpanel -lncurses > ++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap > + > + > + # Generic (SunOS / SVR4) dynamic loading module. > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,56 @@ > +From b4da8e66d1a74bad609e0b6f585670a4180d0bb0 Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 14:16:24 +0200 > +Subject: [PATCH] multiprocess > + > +based on multiprocess.diff from 2.6 > +--- > + Modules/_multiprocessing/multiprocessing.h | 25 +++++++++++++++++++++++++ > + 1 file changed, 25 insertions(+) > + > +diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h > +index 14425de..c9fd187 100644 > +--- a/Modules/_multiprocessing/multiprocessing.h > ++++ b/Modules/_multiprocessing/multiprocessing.h > +@@ -48,6 +48,20 @@ > + #endif > + > + /* > ++ * Solaris 8 missing CMSG_SPACE and CMSG_LEN This patch is for Solaris 8 and probably not necessary. > ++ */ > ++#ifndef CMSG_SPACE > ++# define CMSG_SPACE(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \ > ++ _CMSG_HDR_ALIGN(l)) > ++# warning "assuming 4-byte alignment for CMSG_SPACE" > ++#endif /* CMSG_SPACE */ > ++ > ++#ifndef CMSG_LEN > ++# define CMSG_LEN(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l)) > ++# warning "assuming 4-byte alignment for CMSG_LEN" > ++#endif /* CMSG_LEN */ > ++ > ++/* > + * Issue 3110 - Solaris does not define SEM_VALUE_MAX > + */ > + #ifndef SEM_VALUE_MAX > +@@ -64,6 +78,17 @@ > + > + > + /* > ++ * Issue 3110 - Solaris does not define SEM_VALUE_MAX > ++ */ It might not apply to Solaris 10. > ++#ifndef SEM_VALUE_MAX > ++# ifdef _SEM_VALUE_MAX > ++# define SEM_VALUE_MAX _SEM_VALUE_MAX > ++# else > ++# define SEM_VALUE_MAX INT_MAX > ++# endif > ++#endif > ++ > ++/* > + * Make sure Py_ssize_t available > + */ > + > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,24 @@ > +From 220ff3d78b11ae5e1f00c42f20b77d8898156ca1 Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 14:41:26 +0200 > +Subject: [PATCH] python config in > + > +based on python-config-in.diff from 2.6 with adaptations > +--- > + Misc/python-config.in | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/Misc/python-config.in b/Misc/python-config.in > +index ca9857a..40d5357 100644 > +--- a/Misc/python-config.in > ++++ b/Misc/python-config.in > +@@ -53,5 +53,6 @@ for opt in opt_flags: > + libs.insert(0, '-L' + getvar('LIBPL')) > + if not getvar('PYTHONFRAMEWORK'): > + libs.extend(getvar('LINKFORSHARED').split()) > ++ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib') > + print ' '.join(libs) > + > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,29 @@ > +From 9a42a63a00b689fa655a0b9323b72eade67e0de9 Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Mon, 15 Jul 2013 14:51:36 +0200 > +Subject: [PATCH] pyport > + > +based on pyport.diff from 2.6 > +--- > + Include/pyport.h | 5 ----- > + 1 file changed, 5 deletions(-) > + > +diff --git a/Include/pyport.h b/Include/pyport.h > +index 85e852f..c1fea29 100644 > +--- a/Include/pyport.h > ++++ b/Include/pyport.h > +@@ -640,11 +640,6 @@ Please be conservative with adding new ones, document them and enclose them > + in platform-specific #ifdefs. > + **************************************************************************/ > + > +-#ifdef SOLARIS > +-/* Unchecked */ > +-extern int gethostname(char *, int); > +-#endif Is this still necessary in 2.7? It didn't seem to be when I was building it. > +- > + #ifdef __BEOS__ > + /* Unchecked */ > + /* It's in the libs, but not the headers... - [cjh] */ > +-- > +1.8.3.1 > + > > Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch (rev 0) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-17 08:39:16 UTC (rev 21514) > @@ -0,0 +1,161 @@ > +From aba7368c957a565f1f2b3770aaef3fe950816a1b Mon Sep 17 00:00:00 2001 > +From: Peter Felecan > +Date: Tue, 16 Jul 2013 16:59:44 +0200 > +Subject: [PATCH] site > + > +based on site.diff from 2.6 with adaptations > +--- > + Lib/distutils/sysconfig.py | 2 +- > + Lib/site.py | 2 +- > + Lib/sysconfig.py | 32 ++++++++++++++++---------------- > + Lib/trace.py | 4 ++-- > + Makefile.pre.in | 6 +++--- > + Modules/getpath.c | 6 +++--- > + 6 files changed, 26 insertions(+), 26 deletions(-) > + > +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py > +index 0c726d9..a9ada72 100644 > +--- a/Lib/distutils/sysconfig.py > ++++ b/Lib/distutils/sysconfig.py > +@@ -120,7 +120,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): > + > + if os.name == "posix": > + libpython = os.path.join(prefix, > +- "lib", "python" + get_python_version()) > ++ "lib", "python") > + if standard_lib: > + return libpython > + else: > +diff --git a/Lib/site.py b/Lib/site.py > +index f1b0ae8..be21919 100644 > +--- a/Lib/site.py > ++++ b/Lib/site.py > +@@ -289,7 +289,7 @@ def getsitepackages(): > + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) > + elif os.sep == '/': > + sitepackages.append(os.path.join(prefix, "lib", > +- "python" + sys.version[:3], > ++ "python", This is the source of most of our Python woe. Please kill it with fire. > + "site-packages")) > + sitepackages.append(os.path.join(prefix, "lib", "site-python")) > + else: > +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py > +index aa69351..b177b61 100644 > +--- a/Lib/sysconfig.py > ++++ b/Lib/sysconfig.py > +@@ -7,12 +7,12 @@ from os.path import pardir, realpath > + > + _INSTALL_SCHEMES = { > + 'posix_prefix': { > +- 'stdlib': '{base}/lib/python{py_version_short}', > +- 'platstdlib': '{platbase}/lib/python{py_version_short}', > +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', > +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', > +- 'include': '{base}/include/python{py_version_short}', > +- 'platinclude': '{platbase}/include/python{py_version_short}', > ++ 'stdlib': '{base}/lib/python', > ++ 'platstdlib': '{platbase}/lib/python', > ++ 'purelib': '{base}/lib/python/site-packages', > ++ 'platlib': '{platbase}/lib/python/site-packages', > ++ 'include': '{base}/include/python', > ++ 'platinclude': '{platbase}/include/python', These I'm not sure about. Are they necessary? It's likely they're not. > + 'scripts': '{base}/bin', > + 'data': '{base}', > + }, > +@@ -47,11 +47,11 @@ _INSTALL_SCHEMES = { > + 'data' : '{base}', > + }, > + 'os2_home': { > +- 'stdlib': '{userbase}/lib/python{py_version_short}', > +- 'platstdlib': '{userbase}/lib/python{py_version_short}', > +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', > +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', > +- 'include': '{userbase}/include/python{py_version_short}', > ++ 'stdlib': '{userbase}/lib/python', > ++ 'platstdlib': '{userbase}/lib/python', > ++ 'purelib': '{userbase}/lib/python/site-packages', > ++ 'platlib': '{userbase}/lib/python/site-packages', > ++ 'include': '{userbase}/include/python', > + 'scripts': '{userbase}/bin', > + 'data' : '{userbase}', > + }, > +@@ -65,11 +65,11 @@ _INSTALL_SCHEMES = { > + 'data' : '{userbase}', > + }, > + 'posix_user': { > +- 'stdlib': '{userbase}/lib/python{py_version_short}', > +- 'platstdlib': '{userbase}/lib/python{py_version_short}', > +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', > +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', > +- 'include': '{userbase}/include/python{py_version_short}', > ++ 'stdlib': '{userbase}/lib/python', > ++ 'platstdlib': '{userbase}/lib/python', > ++ 'purelib': '{userbase}/lib/python/site-packages', > ++ 'platlib': '{userbase}/lib/python/site-packages', > ++ 'include': '{userbase}/include/python', > + 'scripts': '{userbase}/bin', > + 'data' : '{userbase}', > + }, Maciej From pfelecan at users.sourceforge.net Thu Jul 18 13:24:57 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 18 Jul 2013 11:24:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21523] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 21523 http://gar.svn.sourceforge.net/gar/?rev=21523&view=rev Author: pfelecan Date: 2013-07-18 11:24:52 +0000 (Thu, 18 Jul 2013) Log Message: ----------- autogen/trunk: veryfied and validated overrides Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 11:12:36 UTC (rev 21522) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 11:24:52 UTC (rev 21523) @@ -55,7 +55,6 @@ RUNTIME_DEP_PKGS_CSWautogen += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWautogen += CSWlibz1 RUNTIME_DEP_PKGS_CSWautogen += CSWlibintl8 -CHECKPKG_OVERRIDES_CSWautogen += file-with-bad-content|/usr/share|root/opt/csw/share/autogen/mdoc2texi CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgc.so.1 CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgen.so.1 CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libguile-2.0.so.22 @@ -85,8 +84,6 @@ CATALOGNAME_CSWautogendoc = autogen_doc_stub ARCHALL_CSWautogen-doc = 1 CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/autogen.info-1 -CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/autogen/autogen.ps -CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/autogen/autogen.dvi PACKAGES += CSWlibopts25 CATALOGNAME_CSWlibopts25 = libopts25 @@ -97,8 +94,8 @@ RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibintl8 CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libintl.so.8 PACKAGES += CSWautogen-dev CATALOGNAME_CSWautogen-dev = autogen_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jul 18 13:40:32 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 18 Jul 2013 11:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21524] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 21524 http://gar.svn.sourceforge.net/gar/?rev=21524&view=rev Author: pfelecan Date: 2013-07-18 11:40:32 +0000 (Thu, 18 Jul 2013) Log Message: ----------- autogen/trunk: re-verified and validated overrides Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 11:24:52 UTC (rev 21523) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-07-18 11:40:32 UTC (rev 21524) @@ -83,7 +83,6 @@ OBSOLETED_BY_CSWautogen-doc = CSWautogendoc CATALOGNAME_CSWautogendoc = autogen_doc_stub ARCHALL_CSWautogen-doc = 1 -CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/autogen.info-1 PACKAGES += CSWlibopts25 CATALOGNAME_CSWlibopts25 = libopts25 @@ -93,7 +92,7 @@ OBSOLETED_BY_CSWlibopts25 = CSWautogenrt RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libgcc_s.so.1 CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libgen.so.1 CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libintl.so.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jul 18 15:10:34 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Jul 2013 13:10:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21525] csw/mgar/pkg/evince/trunk Message-ID: Revision: 21525 http://gar.svn.sourceforge.net/gar/?rev=21525&view=rev Author: cgrzemba Date: 2013-07-18 13:10:30 +0000 (Thu, 18 Jul 2013) Log Message: ----------- evince/trunk: add patch for poppler version > 0.17 Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-07-18 11:40:32 UTC (rev 21524) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-07-18 13:10:30 UTC (rev 21525) @@ -22,6 +22,7 @@ STRIP_LIBTOOL = 1 PATCHFILES += 0001-honor-aclocal_flags.patch +PATCHFILES += 0002-poppler-api-changed.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -249,15 +250,15 @@ include gar/category.mk -pre-configure-modulated: - ( cd $(WORKSRC); \ - [ -f ltmain.sh ] && rm ltmain.sh || true; \ - libtoolize --copy --force; \ - aclocal-1.13 --force; \ - autoconf --force; \ - autoheader --force; \ - automake-1.13 --add-missing --copy --force-missing ) - @$(MAKECOOKIE) +# pre-configure: +# ( cd $(WORKSRC); \ +# [ -f ltmain.sh ] && rm ltmain.sh || true; \ +# libtoolize --copy --force; \ +## aclocal-1.11 --force; \ +# autoconf --force; \ +# autoheader --force; \ +# automake-1.11 --add-missing --copy --force-missing ) +# @$(MAKECOOKIE) PATH := /opt/csw/gnu:$(PATH) AM_DEFAULT_VERBOSITY := 1 Modified: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-18 11:40:32 UTC (rev 21524) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-18 13:10:30 UTC (rev 21525) @@ -1,5 +1,3 @@ -diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc -index fef0738..fe53c5a 100644 --- a/backend/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc @@ -1986,7 +1986,7 @@ pdf_selection_get_selected_text (EvSelection *selection, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Jul 18 16:13:45 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 18 Jul 2013 14:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21526] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 21526 http://gar.svn.sourceforge.net/gar/?rev=21526&view=rev Author: lblume Date: 2013-07-18 14:13:44 +0000 (Thu, 18 Jul 2013) Log Message: ----------- ImageMagick/trunk: Bump revision to -6; Switch compiler to GCC; disable Perl as it is not GCC compatible Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-18 13:10:30 UTC (rev 21525) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-07-18 14:13:44 UTC (rev 21526) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.8.6 -GARSUBREV = 5 +GARSUBREV = 6 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -53,26 +53,27 @@ RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgcc-s1 -# For some reason, on sparc only, this gets linked against glib2 -# Override is for x86 only -CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibglib2-0-0 - PACKAGES += CSWlibmagickwand6q16hdri1 CATALOGNAME_CSWlibmagickwand6q16hdri1 = libmagickwand6q16hdri1 SPKG_DESC_CSWlibmagickwand6q16hdri1 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.1 PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1\.0\.0) PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgcc-s1 -PACKAGES += CSWlibmagick++6q16hdri1 -CATALOGNAME_CSWlibmagick++6q16hdri1 = libmagick++6q16hdri1 -PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1\.0\.0) -PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibmagick++6q16hdri1 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickcore6q16hdri1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickwand6q16hdri1 +PACKAGES += CSWlibmagick++6q16hdri2 +CATALOGNAME_CSWlibmagick++6q16hdri2 = libmagick++6q16hdri2 +PKGFILES_CSWlibmagick++6q16hdri2 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.2\.0\.0) +PKGFILES_CSWlibmagick++6q16hdri2 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibmagick++6q16hdri2 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.2 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibstdc++6 PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries @@ -83,7 +84,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri2 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl PACKAGES += CSWimagemagick @@ -110,21 +111,22 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjasper1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgcc-s1 -PACKAGES += CSWpm-image-magick -SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick -PKGFILES_CSWpm-image-magick += $(libdir)/perl/.* -PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl +#PACKAGES += CSWpm-image-magick +#SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick +#PKGFILES_CSWpm-image-magick += $(libdir)/perl/.* +#PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl -RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl -RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore6q16hdri1 +#RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl +#RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore6q16hdri1 # No binary in that package, since no 64 bit perl -CHECKPKG_OVERRIDES_CSWpm-image-magick += 64-bit-binaries-missing +#CHECKPKG_OVERRIDES_CSWpm-image-magick += 64-bit-binaries-missing REINPLACE_USRLOCAL += config/mime.xml -EXTRA_LINKER_FLAGS = -lsocket -lnsl +EXTRA_LINKER_FLAGS = -Bdirect -lsocket -lnsl EXTRA_LD_OPTIONS = -z nolazyload # We especially don't want ISALIST for the above /usr/openwin/lib @@ -148,10 +150,12 @@ CONFIGURE_ARGS += --with-wmf CONFIGURE_ARGS += --with-rsvg +# Disable perl completely for now +CONFIGURE_ARGS += --without-perl # Until graphviz and perl is 64bit +CONFIGURE_ARGS-64 += --without-gvc #CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl -CONFIGURE_ARGS-64 += --without-gvc -CONFIGURE_ARGS += --without-perl +#CONFIGURE_ARGS-64 += --without-perl CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) # One test is failing: Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2013-07-18 13:10:30 UTC (rev 21525) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2013-07-18 14:13:44 UTC (rev 21526) @@ -1 +1 @@ -ee6e195d18012fb6b2bd82634ea51fd1 ImageMagick-6.8.6-5.tar.xz +ddd46cdf8f6eb22deee14d4fee267796 ImageMagick-6.8.6-6.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jul 18 17:01:11 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Jul 2013 15:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21527] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 21527 http://gar.svn.sourceforge.net/gar/?rev=21527&view=rev Author: cgrzemba Date: 2013-07-18 15:01:07 +0000 (Thu, 18 Jul 2013) Log Message: ----------- netsnmp/trunk: 2nd attempt to fix the init script Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch Removed Paths: ------------- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-18 14:13:44 UTC (rev 21526) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-18 15:01:07 UTC (rev 21527) @@ -31,7 +31,6 @@ PATCHFILES += Makefile.in.diff PATCHFILES += setup-py.patch PATCHFILES += 0001-remove-linux-specials.patch -PATCHFILES += 0001-remove-linux-specials-2nd.patch VENDOR_URL = http://www.net-snmp.org/ Deleted: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch 2013-07-18 14:13:44 UTC (rev 21526) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials-2nd.patch 2013-07-18 15:01:07 UTC (rev 21527) @@ -1,36 +0,0 @@ -From bfb169f465df815ce2858acfd9d813b42606aea0 Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Thu, 18 Jul 2013 11:00:52 +0200 -Subject: [PATCH] remove linux specials 2nd - ---- - dist/snmptrapd-init.d | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) - -diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d -index 8225242..7e3c98c 100644 ---- a/dist/snmptrapd-init.d -+++ b/dist/snmptrapd-init.d -@@ -6,18 +6,9 @@ - # chkconfig: - 25 75 - # description: snmptrapd is net-snmp SNMPTRAP daemon. - --# Source function library. --. /etc/rc.d/init.d/functions -- --# Source networking configuration. --. /etc/sysconfig/network -- --# Check that networking is up. --[ "${NETWORKING}" = "no" ] && exit 0 -- - RETVAL=0 - name="snmptrapd" --prog="/usr/local/sbin/snmptrapd" -+prog="/opt/csw/sbin/snmptrapd" - - [ -x $prog ] || exit 0 - --- -1.8.3.1 - Modified: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch 2013-07-18 14:13:44 UTC (rev 21526) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch 2013-07-18 15:01:07 UTC (rev 21527) @@ -1,17 +1,18 @@ -From c45b6c9eafe714fb4f2fbaf2ebeecd1e2213dc0f Mon Sep 17 00:00:00 2001 +From 449bf468f7d928c06c1ce893b36ba100e92abd1b Mon Sep 17 00:00:00 2001 From: Carsten Grzemba -Date: Thu, 18 Jul 2013 10:58:52 +0200 -Subject: [PATCH] remove linux specials +Date: Thu, 18 Jul 2013 16:59:00 +0200 +Subject: [PATCH] remove-linux-specials --- - dist/snmpd-init.d | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) + dist/snmpd-init.d | 17 ++++------------- + dist/snmptrapd-init.d | 15 +++------------ + 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dist/snmpd-init.d b/dist/snmpd-init.d -index bd15b00..2ea583f 100755 +index bd15b00..ba4140b 100755 --- a/dist/snmpd-init.d +++ b/dist/snmpd-init.d -@@ -6,20 +6,11 @@ +@@ -6,25 +6,16 @@ # chkconfig: - 26 74 # description: snmpd is net-snmp SNMP daemon. @@ -34,6 +35,62 @@ start() { # Start daemons. + echo -n $"Starting $name: " +- daemon $prog ++ $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name +@@ -34,7 +25,7 @@ start() { + stop() { + # Stop daemons. + echo -n $"Shutting down $name: " +- killproc $prog ++ pkill `basename $prog` + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name +diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d +index 8225242..b61debc 100644 +--- a/dist/snmptrapd-init.d ++++ b/dist/snmptrapd-init.d +@@ -6,25 +6,16 @@ + # chkconfig: - 25 75 + # description: snmptrapd is net-snmp SNMPTRAP daemon. + +-# Source function library. +-. /etc/rc.d/init.d/functions +- +-# Source networking configuration. +-. /etc/sysconfig/network +- +-# Check that networking is up. +-[ "${NETWORKING}" = "no" ] && exit 0 +- + RETVAL=0 + name="snmptrapd" +-prog="/usr/local/sbin/snmptrapd" ++prog="/opt/csw/sbin/snmptrapd" + + [ -x $prog ] || exit 0 + + start() { + # Start daemons. + echo -n $"Starting $name: " +- daemon $prog ++ $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name +@@ -34,7 +25,7 @@ start() { + stop() { + # Stop daemons. + echo -n $"Shutting down $name: " +- killproc $prog ++ pkill `basename $prog` + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name -- 1.8.3.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jul 18 17:20:11 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 18 Jul 2013 15:20:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21528] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21528 http://gar.svn.sourceforge.net/gar/?rev=21528&view=rev Author: pfelecan Date: 2013-07-18 15:20:11 +0000 (Thu, 18 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: - revert all patches - keep a versioned installation tree Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-18 15:01:07 UTC (rev 21527) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-18 15:20:11 UTC (rev 21528) @@ -7,7 +7,7 @@ UVER = 2_7 PVER = python$(VER) # I wish to replace 2.6 by 2.7: -#CVER = 27 +CVER = 27 # Known issues: # @@ -38,27 +38,27 @@ DISTFILES += pyport.h # Patches -PATCHFILES += 0001-setup.patch -PATCHFILES += 0002-faqwiz.patch -PATCHFILES += 0003-makesetup.patch -PATCHFILES += 0004-modules.patch -PATCHFILES += 0005-multiprocess.patch -PATCHFILES += 0006-python-config-in.patch -PATCHFILES += 0007-pyport.patch -# after experiments and failures I think that with the upstream -# byzantine build system using a generic /opt/csw/lib/python directory -# is not such a good idea, e.g. there are interferences in early -# stages of the build when not all shared objects are built, -# e.g. cStringIO, and the system falls back on the 2.6 provided one, -# if the previous version is installed, and havoc ensues... Building -# without previous Python installed works. -PATCHFILES += 0008-site.patch +# PATCHFILES += 0001-setup.patch +# PATCHFILES += 0002-faqwiz.patch +# PATCHFILES += 0003-makesetup.patch +# PATCHFILES += 0004-modules.patch +# PATCHFILES += 0005-multiprocess.patch +# PATCHFILES += 0006-python-config-in.patch +# PATCHFILES += 0007-pyport.patch +# # after experiments and failures I think that with the upstream +# # byzantine build system using a generic /opt/csw/lib/python directory +# # is not such a good idea, e.g. there are interferences in early +# # stages of the build when not all shared objects are built, +# # e.g. cStringIO, and the system falls back on the 2.6 provided one, +# # if the previous version is installed, and havoc ensues... Building +# # without previous Python installed works. +# PATCHFILES += 0008-site.patch -# TODO: evaluate the following patches from this branch files directory: -# 0001-FFI_DEFAULT_ABI-to-use-__i386.patch -# getpass.patch -# patch_2.diff.txt -# and review the complement patches from the trunk's files directory +# # TODO: evaluate the following patches from this branch files directory: +# # 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +# # getpass.patch +# # patch_2.diff.txt +# # and review the complement patches from the trunk's files directory # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. @@ -157,16 +157,16 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) # Don't merge test files. -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.* BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWggettext-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jul 19 09:37:22 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 19 Jul 2013 07:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21529] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 21529 http://gar.svn.sourceforge.net/gar/?rev=21529&view=rev Author: pfelecan Date: 2013-07-19 07:37:08 +0000 (Fri, 19 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: - delete old patches - add unversioned tree at the end of the modules search path Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch Removed Paths: ------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-19 07:37:08 UTC (rev 21529) @@ -6,7 +6,6 @@ DVER = 2-7 UVER = 2_7 PVER = python$(VER) -# I wish to replace 2.6 by 2.7: CVER = 27 # Known issues: @@ -37,29 +36,8 @@ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += pyport.h -# Patches -# PATCHFILES += 0001-setup.patch -# PATCHFILES += 0002-faqwiz.patch -# PATCHFILES += 0003-makesetup.patch -# PATCHFILES += 0004-modules.patch -# PATCHFILES += 0005-multiprocess.patch -# PATCHFILES += 0006-python-config-in.patch -# PATCHFILES += 0007-pyport.patch -# # after experiments and failures I think that with the upstream -# # byzantine build system using a generic /opt/csw/lib/python directory -# # is not such a good idea, e.g. there are interferences in early -# # stages of the build when not all shared objects are built, -# # e.g. cStringIO, and the system falls back on the 2.6 provided one, -# # if the previous version is installed, and havoc ensues... Building -# # without previous Python installed works. -# PATCHFILES += 0008-site.patch +PATCHFILES += 0001-manage-previous-site-package.patch -# # TODO: evaluate the following patches from this branch files directory: -# # 0001-FFI_DEFAULT_ABI-to-use-__i386.patch -# # getpass.patch -# # patch_2.diff.txt -# # and review the complement patches from the trunk's files directory - # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. #SKIPTEST = 1 Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,29 +0,0 @@ -From a793e4025581c9840eb053d57368aa74cb8e3e87 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 20 May 2010 18:07:22 +0200 -Subject: [PATCH] FFI_DEFAULT_ABI to use __i386 - ---- - Modules/_ctypes/libffi/src/x86/ffitarget.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/_ctypes/libffi/src/x86/ffitarget.h b/Modules/_ctypes/libffi/src/x86/ffitarget.h -index 8178d06..d54d210 100644 ---- a/Modules/_ctypes/libffi/src/x86/ffitarget.h -+++ b/Modules/_ctypes/libffi/src/x86/ffitarget.h -@@ -54,10 +54,10 @@ typedef enum ffi_abi { - #endif - - /* ---- Intel x86 and AMD x86-64 - */ --#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) -+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__)) - FFI_SYSV, - FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ --#ifdef __i386__ -+#if defined(__i386__) || defined(__i386) - FFI_DEFAULT_ABI = FFI_SYSV, - #else - FFI_DEFAULT_ABI = FFI_UNIX64, --- -1.7.1 - Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -0,0 +1,25 @@ +From 6e0c0e2e1d3fd1284b4c002c04898dc5da6cf859 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 18 Jul 2013 17:46:39 +0200 +Subject: [PATCH] manage previous site package + +this is to support the transition between an unversiond installation tree +--- + Lib/site.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/site.py b/Lib/site.py +index f1b0ae8..ebe09e3 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -292,6 +292,7 @@ def getsitepackages(): + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) ++ sitepackages.append(os.path.join(prefix, "lib", "python")) + else: + sitepackages.append(prefix) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) +-- +1.8.3.1 + Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,111 +0,0 @@ -From d2205faf194d7cc3adfc11a0f8f58e6e75f4da7a Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 11:43:50 +0200 -Subject: [PATCH] setup - -based on the 2.6 site.diff with adaptations ---- - setup.py | 36 ++++++++++++++++++++++-------------- - 1 file changed, 22 insertions(+), 14 deletions(-) - -diff --git a/setup.py b/setup.py -index 716f08e..fc58444 100644 ---- a/setup.py -+++ b/setup.py -@@ -436,9 +436,9 @@ class PyBuildExt(build_ext): - os.unlink(tmpfile) - - def detect_modules(self): -- # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ # Ensure that /opt/csw is always used -+ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') -+ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') - self.add_gcc_paths() - self.add_multiarch_paths() - -@@ -783,7 +783,7 @@ class PyBuildExt(build_ext): - libraries=math_libs) ) - # Detect SSL support for the socket module (via _ssl) - search_for_ssl_incs_in = [ -- '/usr/local/ssl/include', -+ '/opt/csw/ssl/include', - '/usr/contrib/ssl/include/' - ] - ssl_incs = find_file('openssl/ssl.h', inc_dirs, -@@ -795,7 +795,7 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -+ ['/opt/csw/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) - -@@ -920,10 +920,10 @@ class PyBuildExt(build_ext): - # top of the normal inc_dirs. - db_inc_paths = [ - '/usr/include/db4', -- '/usr/local/include/db4', -+ '/opt/csw/include/db4', - '/opt/sfw/include/db4', - '/usr/include/db3', -- '/usr/local/include/db3', -+ '/opt/csw/include/db3', - '/opt/sfw/include/db3', - # Fink defaults (http://fink.sourceforge.net/) - '/sw/include/db4', -@@ -933,8 +933,8 @@ class PyBuildExt(build_ext): - for x in gen_db_minor_ver_nums(4): - db_inc_paths.append('/usr/include/db4%d' % x) - db_inc_paths.append('/usr/include/db4.%d' % x) -- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) -- db_inc_paths.append('/usr/local/include/db4%d' % x) -+ db_inc_paths.append('/opt/csw/BerkeleyDB.4.%d/include' % x) -+ db_inc_paths.append('/opt/csw/include/db4%d' % x) - db_inc_paths.append('/pkg/db-4.%d/include' % x) - db_inc_paths.append('/opt/db-4.%d/include' % x) - # MacPorts default (http://www.macports.org/) -@@ -942,8 +942,8 @@ class PyBuildExt(build_ext): - # 3.x minor number specific paths - for x in gen_db_minor_ver_nums(3): - db_inc_paths.append('/usr/include/db3%d' % x) -- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) -- db_inc_paths.append('/usr/local/include/db3%d' % x) -+ db_inc_paths.append('/opt/csw/BerkeleyDB.3.%d/include' % x) -+ db_inc_paths.append('/opt/csw/include/db3%d' % x) - db_inc_paths.append('/pkg/db-3.%d/include' % x) - db_inc_paths.append('/opt/db-3.%d/include' % x) - -@@ -1094,9 +1094,9 @@ class PyBuildExt(build_ext): - sqlite_inc_paths = [ '/usr/include', - '/usr/include/sqlite', - '/usr/include/sqlite3', -- '/usr/local/include', -- '/usr/local/include/sqlite', -- '/usr/local/include/sqlite3', -+ '/opt/csw/include', -+ '/opt/csw/include/sqlite', -+ '/opt/csw/include/sqlite3', - ] - if cross_compiling: - sqlite_inc_paths = [] -@@ -1555,6 +1555,14 @@ class PyBuildExt(build_ext): - macros = dict() - libraries = [] - -+ elif host_platform == 'sunos5': -+ macros = dict( # Solaris -+ HAVE_SEM_OPEN=0, # Not Implemented -+ HAVE_SEM_TIMEDWAIT=0, # Not Implemented -+ HAVE_FD_TRANSFER=1, -+ ) -+ libraries = ['rt'] -+ - else: # Linux and other unices - macros = dict() - libraries = ['rt'] --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,26 +0,0 @@ -From 0dc3e5cd576a09af3d88a00c473291b7c2cb0d3f Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 12:58:31 +0200 -Subject: [PATCH] faqwiz - -based on faqwiz.diff from 2.6 ---- - Tools/faqwiz/faqconf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py -index d1acd80..05d060a 100644 ---- a/Tools/faqwiz/faqconf.py -+++ b/Tools/faqwiz/faqconf.py -@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" # Name for feedback - 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 --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,35 +0,0 @@ -From 337c51f7a5c0f68561d415aefc7ba889a3897a13 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 13:49:06 +0200 -Subject: [PATCH] makesetup - -based on makesetup from 2.6 ---- - Modules/makesetup | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Modules/makesetup b/Modules/makesetup -index 8862c36..c28e3a8 100755 ---- a/Modules/makesetup -+++ b/Modules/makesetup -@@ -214,10 +214,15 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | - glmodule.c) ;; - /*) ;; - \$*) ;; -- *) src='$(srcdir)/'"$srcdir/$src";; -+ *) src='$(srcdir)/'"$srcdir/$src";; - esac - case $doconfig in -- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ no) case $src in -+ *bsddb.*) -+ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ *) -+ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; -+ esac;; - *) - cc="$cc \$(PY_CFLAGS)";; - esac --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,30 +0,0 @@ -From 74b002eee8ef49739c50073c20233dab2bacc25b Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 14:05:03 +0200 -Subject: [PATCH] modules - -based on modules.diff from 2.6 ---- - Modules/Setup.dist | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Modules/Setup.dist b/Modules/Setup.dist -index 2ad1aa3..04f7bc1 100644 ---- a/Modules/Setup.dist -+++ b/Modules/Setup.dist -@@ -367,9 +367,10 @@ GLHACK=-Dclear=__GLclear - # - # First, look at Setup.config; configure may have set this for you. - --#_curses _cursesmodule.c -lcurses -ltermcap -+*shared* -+_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap - # Wrapper for the panel library that's part of ncurses and SYSV curses. --#_curses_panel _curses_panel.c -lpanel -lncurses -+_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap - - - # Generic (SunOS / SVR4) dynamic loading module. --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,56 +0,0 @@ -From b4da8e66d1a74bad609e0b6f585670a4180d0bb0 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 14:16:24 +0200 -Subject: [PATCH] multiprocess - -based on multiprocess.diff from 2.6 ---- - Modules/_multiprocessing/multiprocessing.h | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h -index 14425de..c9fd187 100644 ---- a/Modules/_multiprocessing/multiprocessing.h -+++ b/Modules/_multiprocessing/multiprocessing.h -@@ -48,6 +48,20 @@ - #endif - - /* -+ * Solaris 8 missing CMSG_SPACE and CMSG_LEN -+ */ -+#ifndef CMSG_SPACE -+# define CMSG_SPACE(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \ -+ _CMSG_HDR_ALIGN(l)) -+# warning "assuming 4-byte alignment for CMSG_SPACE" -+#endif /* CMSG_SPACE */ -+ -+#ifndef CMSG_LEN -+# define CMSG_LEN(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l)) -+# warning "assuming 4-byte alignment for CMSG_LEN" -+#endif /* CMSG_LEN */ -+ -+/* - * Issue 3110 - Solaris does not define SEM_VALUE_MAX - */ - #ifndef SEM_VALUE_MAX -@@ -64,6 +78,17 @@ - - - /* -+ * Issue 3110 - Solaris does not define SEM_VALUE_MAX -+ */ -+#ifndef SEM_VALUE_MAX -+# ifdef _SEM_VALUE_MAX -+# define SEM_VALUE_MAX _SEM_VALUE_MAX -+# else -+# define SEM_VALUE_MAX INT_MAX -+# endif -+#endif -+ -+/* - * Make sure Py_ssize_t available - */ - --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,24 +0,0 @@ -From 220ff3d78b11ae5e1f00c42f20b77d8898156ca1 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 14:41:26 +0200 -Subject: [PATCH] python config in - -based on python-config-in.diff from 2.6 with adaptations ---- - Misc/python-config.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Misc/python-config.in b/Misc/python-config.in -index ca9857a..40d5357 100644 ---- a/Misc/python-config.in -+++ b/Misc/python-config.in -@@ -53,5 +53,6 @@ for opt in opt_flags: - libs.insert(0, '-L' + getvar('LIBPL')) - if not getvar('PYTHONFRAMEWORK'): - libs.extend(getvar('LINKFORSHARED').split()) -+ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib') - print ' '.join(libs) - --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,29 +0,0 @@ -From 9a42a63a00b689fa655a0b9323b72eade67e0de9 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Mon, 15 Jul 2013 14:51:36 +0200 -Subject: [PATCH] pyport - -based on pyport.diff from 2.6 ---- - Include/pyport.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Include/pyport.h b/Include/pyport.h -index 85e852f..c1fea29 100644 ---- a/Include/pyport.h -+++ b/Include/pyport.h -@@ -640,11 +640,6 @@ Please be conservative with adding new ones, document them and enclose them - in platform-specific #ifdefs. - **************************************************************************/ - --#ifdef SOLARIS --/* Unchecked */ --extern int gethostname(char *, int); --#endif -- - #ifdef __BEOS__ - /* Unchecked */ - /* It's in the libs, but not the headers... - [cjh] */ --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,161 +0,0 @@ -From aba7368c957a565f1f2b3770aaef3fe950816a1b Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Tue, 16 Jul 2013 16:59:44 +0200 -Subject: [PATCH] site - -based on site.diff from 2.6 with adaptations ---- - Lib/distutils/sysconfig.py | 2 +- - Lib/site.py | 2 +- - Lib/sysconfig.py | 32 ++++++++++++++++---------------- - Lib/trace.py | 4 ++-- - Makefile.pre.in | 6 +++--- - Modules/getpath.c | 6 +++--- - 6 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 0c726d9..a9ada72 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -120,7 +120,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "lib", "python") - if standard_lib: - return libpython - else: -diff --git a/Lib/site.py b/Lib/site.py -index f1b0ae8..be21919 100644 ---- a/Lib/site.py -+++ b/Lib/site.py -@@ -289,7 +289,7 @@ def getsitepackages(): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", -- "python" + sys.version[:3], -+ "python", - "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index aa69351..b177b61 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -7,12 +7,12 @@ from os.path import pardir, realpath - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -- 'include': '{base}/include/python{py_version_short}', -- 'platinclude': '{platbase}/include/python{py_version_short}', -+ 'stdlib': '{base}/lib/python', -+ 'platstdlib': '{platbase}/lib/python', -+ 'purelib': '{base}/lib/python/site-packages', -+ 'platlib': '{platbase}/lib/python/site-packages', -+ 'include': '{base}/include/python', -+ 'platinclude': '{platbase}/include/python', - 'scripts': '{base}/bin', - 'data': '{base}', - }, -@@ -47,11 +47,11 @@ _INSTALL_SCHEMES = { - 'data' : '{base}', - }, - 'os2_home': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'include': '{userbase}/include/python{py_version_short}', -+ 'stdlib': '{userbase}/lib/python', -+ 'platstdlib': '{userbase}/lib/python', -+ 'purelib': '{userbase}/lib/python/site-packages', -+ 'platlib': '{userbase}/lib/python/site-packages', -+ 'include': '{userbase}/include/python', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', - }, -@@ -65,11 +65,11 @@ _INSTALL_SCHEMES = { - 'data' : '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'include': '{userbase}/include/python{py_version_short}', -+ 'stdlib': '{userbase}/lib/python', -+ 'platstdlib': '{userbase}/lib/python', -+ 'purelib': '{userbase}/lib/python/site-packages', -+ 'platlib': '{userbase}/lib/python/site-packages', -+ 'include': '{userbase}/include/python', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', - }, -diff --git a/Lib/trace.py b/Lib/trace.py -index 38a13e2..a54e9e7 100644 ---- a/Lib/trace.py -+++ b/Lib/trace.py -@@ -755,10 +755,10 @@ def main(argv=None): - - s = s.replace("$prefix", - os.path.join(sys.prefix, "lib", -- "python" + sys.version[:3])) -+ "python")) - s = s.replace("$exec_prefix", - os.path.join(sys.exec_prefix, "lib", -- "python" + sys.version[:3])) -+ "python")) - s = os.path.normpath(s) - ignore_dirs.append(s) - continue -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9d55550..b723a50 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -109,11 +109,11 @@ CONFINCLUDEDIR= $(exec_prefix)/include - SCRIPTDIR= $(prefix)/lib - - # Detailed destination directories --BINLIBDEST= $(LIBDIR)/python$(VERSION) --LIBDEST= $(SCRIPTDIR)/python$(VERSION) -+BINLIBDEST= $(LIBDIR)/python -+LIBDEST= $(SCRIPTDIR)/python - INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) - CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) --LIBP= $(LIBDIR)/python$(VERSION) -+LIBP= $(LIBDIR)/python - - # Symbols used for using shared libraries - SO= @SO@ -diff --git a/Modules/getpath.c b/Modules/getpath.c -index de96d47..9a88383 100644 ---- a/Modules/getpath.c -+++ b/Modules/getpath.c -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib/python:" \ -+ EXEC_PREFIX "/lib/python/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib/python"; - - static void - reduce(char *dir) --- -1.8.3.1 - Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,30 +0,0 @@ ---- release26-maint/Lib/getpass.py 2009/11/01 16:17:0676014 -+++ release26-maint/Lib/getpass.py 2009/11/01 18:31:1376015 -@@ -62,12 +62,16 @@ - try: - old = termios.tcgetattr(fd) # a copy to save - new = old[:] -- new[3] &= ~termios.ECHO # 3 == 'lflags' -+ new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags' -+ tcsetattr_flags = termios.TCSAFLUSH -+ if hasattr(termios, 'TCSASOFT'): -+ tcsetattr_flags |= termios.TCSASOFT - try: -- termios.tcsetattr(fd, termios.TCSADRAIN, new) -+ termios.tcsetattr(fd, tcsetattr_flags, new) - passwd = _raw_input(prompt, stream, input=input) - finally: -- termios.tcsetattr(fd, termios.TCSADRAIN, old) -+ termios.tcsetattr(fd, tcsetattr_flags, old) -+ stream.flush() # issue7208 - except termios.error, e: - if passwd is not None: - # _raw_input succeeded. The final tcsetattr failed. Reraise -@@ -125,6 +129,7 @@ - if prompt: - stream.write(prompt) - stream.flush() -+ # NOTE: The Python C API calls flockfile() (and unlock) during readline. - line = input.readline() - if not line: - raise EOFError Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,63 +0,0 @@ -diff -ur Python-2.6.4/Modules/posixmodule.c Python-2.6.4.patched/Modules/posixmodule.c ---- Python-2.6.4/Modules/posixmodule.c 2009-09-16 16:06:36.000000000 -0400 -+++ Python-2.6.4.patched/Modules/posixmodule.c 2010-01-22 10:00:18.000000000 -0500 -@@ -3634,11 +3634,12 @@ - int result; - _PyImport_AcquireLock(); - pid = fork1(); -+ if (pid == 0) -+ PyOS_AfterFork(); -+ - result = _PyImport_ReleaseLock(); - if (pid == -1) - return posix_error(); -- if (pid == 0) -- PyOS_AfterFork(); - if (result < 0) { - /* Don't clobber the OSError if the fork failed. */ - PyErr_SetString(PyExc_RuntimeError, -@@ -3663,11 +3664,12 @@ - int result; - _PyImport_AcquireLock(); - pid = fork(); -+ if (pid == 0) -+ PyOS_AfterFork(); -+ - result = _PyImport_ReleaseLock(); - if (pid == -1) - return posix_error(); -- if (pid == 0) -- PyOS_AfterFork(); - if (result < 0) { - /* Don't clobber the OSError if the fork failed. */ - PyErr_SetString(PyExc_RuntimeError, -@@ -3781,11 +3783,12 @@ - - _PyImport_AcquireLock(); - pid = forkpty(&master_fd, NULL, NULL, NULL); -+ if (pid == 0) -+ PyOS_AfterFork(); -+ - result = _PyImport_ReleaseLock(); - if (pid == -1) - return posix_error(); -- if (pid == 0) -- PyOS_AfterFork(); - if (result < 0) { - /* Don't clobber the OSError if the fork failed. */ - PyErr_SetString(PyExc_RuntimeError, -diff -ur Python-2.6.4/Python/import.c Python-2.6.4.patched/Python/import.c ---- Python-2.6.4/Python/import.c 2009-09-16 16:06:36.000000000 -0400 -+++ Python-2.6.4.patched/Python/import.c 2010-01-26 07:03:14.000000000 -0500 -@@ -303,10 +303,9 @@ - void - _PyImport_ReInitLock(void) - { --#ifdef _AIX - if (import_lock != NULL) - import_lock = PyThread_allocate_lock(); --#endif -+ import_lock_thread = PyThread_get_thread_ident(); - } - - #endif Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff 2013-07-18 15:20:11 UTC (rev 21528) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff 2013-07-19 07:37:08 UTC (rev 21529) @@ -1,77 +0,0 @@ ---- Python-2.6.2/Lib/site.py.o 2009-05-16 10:26:13.235499624 -0500 -+++ Python-2.6.2/Lib/site.py 2009-05-16 10:29:16.772710013 -0500 -@@ -266,9 +266,10 @@ - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': - sitedirs.append(os.path.join(prefix, "lib", -- "python" + sys.version[:3], -+ "python", - "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) -+ sitedirs.append("/opt/csw/lib/python2.3/site-packages") - else: - sitedirs.append(prefix) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) ---- Python-2.6.2/Lib/distutils/command/install.py.o 2009-05-16 10:29:46.625564211 -0500 -+++ Python-2.6.2/Lib/distutils/command/install.py 2009-05-16 10:31:26.296866583 -0500 -@@ -41,8 +41,8 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib/python/site-packages', -+ 'platlib': '$platbase/lib/python/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Python-2.6.2/Makefile.pre.in.o 2009-05-16 10:35:14.566752156 -0500 -+++ Python-2.6.2/Makefile.pre.in 2009-05-16 10:35:55.162080324 -0500 -@@ -94,11 +94,11 @@ - SCRIPTDIR= $(prefix)/lib - - # Detailed destination directories --BINLIBDEST= $(LIBDIR)/python$(VERSION) --LIBDEST= $(SCRIPTDIR)/python$(VERSION) -+BINLIBDEST= $(LIBDIR)/python -+LIBDEST= $(SCRIPTDIR)/python - INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) - CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) --LIBP= $(LIBDIR)/python$(VERSION) -+LIBP= $(LIBDIR)/python - - # Symbols used for using shared libraries - SO= @SO@ ---- Python-2.6.2/Modules/getpath.c.o 2009-05-16 10:44:29.756720713 -0500 -+++ Python-2.6.2/Modules/getpath.c 2009-05-16 10:45:33.735370122 -0500 -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib/python:" \ -+ EXEC_PREFIX "/lib/python/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib/python"; - - static void - reduce(char *dir) ---- Python-2.6.2/Lib/distutils/sysconfig.py.o 2009-05-16 10:48:24.271739485 -0500 -+++ Python-2.6.2/Lib/distutils/sysconfig.py 2009-05-16 10:49:21.413202445 -0500 -@@ -116,7 +116,7 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "lib", "python") - if standard_lib: - return libpython - else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jul 19 10:44:19 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 19 Jul 2013 08:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21530] csw/mgar/pkg/lang-python/python/branches/python-2.7 /files/0001-manage-previous-site-package.patch Message-ID: Revision: 21530 http://gar.svn.sourceforge.net/gar/?rev=21530&view=rev Author: pfelecan Date: 2013-07-19 08:44:14 +0000 (Fri, 19 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: correct the addition unversioned tree at the end of the modules search path Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-19 07:37:08 UTC (rev 21529) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-19 08:44:14 UTC (rev 21530) @@ -1,6 +1,6 @@ -From 6e0c0e2e1d3fd1284b4c002c04898dc5da6cf859 Mon Sep 17 00:00:00 2001 +From 5dc1c90d3d8c5491baacf565d77f0557bbcae7df Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Thu, 18 Jul 2013 17:46:39 +0200 +Date: Fri, 19 Jul 2013 10:34:14 +0200 Subject: [PATCH] manage previous site package this is to support the transition between an unversiond installation tree @@ -9,14 +9,14 @@ 1 file changed, 1 insertion(+) diff --git a/Lib/site.py b/Lib/site.py -index f1b0ae8..ebe09e3 100644 +index f1b0ae8..1ea2596 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -292,6 +292,7 @@ def getsitepackages(): "python" + sys.version[:3], "site-packages")) sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ sitepackages.append(os.path.join(prefix, "lib", "python")) ++ sitepackages.append(os.path.join(prefix, "lib", "python/site-packages")) else: sitepackages.append(prefix) sitepackages.append(os.path.join(prefix, "lib", "site-packages")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jul 21 10:41:57 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 21 Jul 2013 08:41:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21531] csw/mgar/pkg/gsl/trunk Message-ID: Revision: 21531 http://gar.svn.sourceforge.net/gar/?rev=21531&view=rev Author: pfelecan Date: 2013-07-21 08:41:48 +0000 (Sun, 21 Jul 2013) Log Message: ----------- gsl/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/gsl/trunk/Makefile csw/mgar/pkg/gsl/trunk/checksums Modified: csw/mgar/pkg/gsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsl/trunk/Makefile 2013-07-19 08:44:14 UTC (rev 21530) +++ csw/mgar/pkg/gsl/trunk/Makefile 2013-07-21 08:41:48 UTC (rev 21531) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = gsl -VERSION = 1.15 +VERSION = 1.16 GARTYPE = v2 DESCRIPTION = GNU Scientific Library Modified: csw/mgar/pkg/gsl/trunk/checksums =================================================================== --- csw/mgar/pkg/gsl/trunk/checksums 2013-07-19 08:44:14 UTC (rev 21530) +++ csw/mgar/pkg/gsl/trunk/checksums 2013-07-21 08:41:48 UTC (rev 21531) @@ -1 +1 @@ -494ffefd90eef4ada678c306bab4030b gsl-1.15.tar.gz +e49a664db13d81c968415cd53f62bc8b gsl-1.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jul 21 13:39:46 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 21 Jul 2013 11:39:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21532] csw/mgar/pkg/gsl/trunk/Makefile Message-ID: Revision: 21532 http://gar.svn.sourceforge.net/gar/?rev=21532&view=rev Author: pfelecan Date: 2013-07-21 11:39:42 +0000 (Sun, 21 Jul 2013) Log Message: ----------- gsl/trunk: verified and validated overrides Modified Paths: -------------- csw/mgar/pkg/gsl/trunk/Makefile Modified: csw/mgar/pkg/gsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsl/trunk/Makefile 2013-07-21 08:41:48 UTC (rev 21531) +++ csw/mgar/pkg/gsl/trunk/Makefile 2013-07-21 11:39:42 UTC (rev 21532) @@ -46,8 +46,6 @@ PKGFILES_CSWgsl-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWgsl-dev = CSWlibgsl0 RUNTIME_DEP_PKGS_CSWgsl-dev += CSWlibgslcblas0 -ARCHALL_CSWgsl-dev = 1 -CHECKPKG_OVERRIDES_CSWgsl-dev += archall-devel-package PACKAGES += CSWgsl-doc CATALOGNAME_CSWgsl-doc = gsl_doc @@ -55,15 +53,6 @@ OBSOLETED_BY_CSWgsl-doc = CSWgsldoc CATALOGNAME_CSWgsldoc = gsl_doc_stub ARCHALL_CSWgsldoc = 1 -CHECKPKG_OVERRIDES_CSWgsl-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/gsl-ref.info-3 -CHECKPKG_OVERRIDES_CSWgsl-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/gsl-ref.info-1 -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-6|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-3|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-2|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-5|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-1|CSWgsl-doc|CSWgsldoc -CHECKPKG_OVERRIDES_CSWgsl-doc += file-collision|/opt/csw/share/info/gsl-ref.info-4|CSWgsl-doc|CSWgsldoc ARCHALL_CSWgsl-doc = 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 Mon Jul 22 10:13:34 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Jul 2013 08:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21533] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 21533 http://gar.svn.sourceforge.net/gar/?rev=21533&view=rev Author: wahwah Date: 2013-07-22 08:13:19 +0000 (Mon, 22 Jul 2013) Log Message: ----------- lang-python/python/trunk: Switch to the 2.6 versioned directory. Support modules in the unversioned one. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-21 11:39:42 UTC (rev 21532) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-22 08:13:19 UTC (rev 21533) @@ -51,7 +51,10 @@ # change this you have to rebuild the whole Python world. # # I really hope we never ever do this again. -PATCHFILES += site.diff +# PATCHFILES += site.diff +# +# Let's try to break free: +PATCHFILES += 0015-Look-for-modules-in-the-unversioned-directory.patch PATCHFILES += python-config-in.diff PATCHFILES += setup.diff @@ -102,6 +105,15 @@ CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python/lib-dynload/_hashlib.so|but|never|used CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +# With the versioned directory: +CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/test/test_subprocess.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/test/test_posixpath.py +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_hashlib.so|but|never|used + + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared @@ -167,31 +179,41 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) # Don't merge test files. -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/unittest/test.* - BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWlibgdbm-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +# Allow to choose the default Python version. +# Python 2.6 is the default one as of 2013-07-21. +ALTERNATIVES_CSWpython$(CVER) = python-2.6 +ALTERNATIVE_python-2.6 = $(bindir)/python python-symlink $(bindir)/python2.6 2600 +EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python + # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk CATALOGNAME_CSWidle$(CVER) = idle CATALOGNAME_CSWpython$(CVER) = python -CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev +CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk 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)-dev = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) LICENSE = LICENSE @@ -208,10 +230,11 @@ GARCOMPILER = SOS12U3 + include gar/category.mk EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" -EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) post-configure-modulated: @@ -230,8 +253,8 @@ post-merge-modulated: # Some checks # Prevent things like https://www.opencsw.org/mantis/view.php?id=5040 - test ! -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket_failed.so - test -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket.so + test ! -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket_failed.so + test -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket.so # This is post-merge-modulated, which should not work. But it does. ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h Added: csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch 2013-07-22 08:13:19 UTC (rev 21533) @@ -0,0 +1,26 @@ +From d8a8549dd74e0da789fba02a444b7c617f86f420 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 22 Jul 2013 01:08:16 +0200 +Subject: [PATCH] Look for modules in the unversioned directory. + +--- + Lib/site.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Lib/site.py b/Lib/site.py +index 9afbc09..598d8a8 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -268,6 +268,9 @@ def addsitepackages(known_paths): + sitedirs.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) ++ # To find modules in the unversioned directory. ++ sitedirs.append(os.path.join(prefix, "lib", ++ "python", "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", "site-python")) + else: + sitedirs.append(prefix) +-- +1.8.3.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 Jul 22 10:15:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Jul 2013 08:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[21534] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21534 http://gar.svn.sourceforge.net/gar/?rev=21534&view=rev Author: wahwah Date: 2013-07-22 08:15:23 +0000 (Mon, 22 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: merge some changes from 2.6; add alternatives Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-22 08:13:19 UTC (rev 21533) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-22 08:15:23 UTC (rev 21534) @@ -44,7 +44,10 @@ TEST_SCRIPTS = custom # for a faster turn-around: -#BUILD64 = 1 +# +# For the current 64-bit building issue: http://bugs.python.org/issue18083 +# A possible fix is to rename plat-linux to plat- +# BUILD64 = 1 GARCOMPILER = GNU GARFLAVOR = DBG @@ -57,8 +60,7 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -# EXTRA_LINKER_FLAGS += -L$(libdir)/ffi -# The above doesn't work; we need to put the flag in front of LINKER_FLAGS. +PREPEND_LINKER_FLAGS += -L$(libdir)/ffi BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -153,6 +155,12 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev +# Allow to choose the default Python version. +# Python 2.6 is the default one as of 2013-07-21. +ALTERNATIVES_CSWpython$(CVER) = python-2.7 +ALTERNATIVE_python-symlink = $(bindir)/python python-symlink $(bindir)/python2.7 270 +EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python + # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk @@ -185,7 +193,7 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm -CHECKPKG_OVERRIDES_CSWpython27 += file-with-bad-content +CHECKPKG_OVERRIDES_CSWpython$(CVER) += file-with-bad-content # To avoid file collisions with CSWpython: EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' @@ -193,37 +201,34 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' -#EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 -CHECKPKG_OVERRIDES_CSWpython27-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27-tk += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 # 64-bit overrides -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 -CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 -CHECKPKG_OVERRIDES_CSWpython27 += missing-dependency|CSWlibffi4 -CHECKPKG_OVERRIDES_CSWpython27-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython27-tk += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWlibffi4 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 include gar/category.mk -LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS) - post-configure-modulated: for f in Modules/Setup \ Makefile \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Jul 22 10:27:37 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 22 Jul 2013 09:27:37 +0100 Subject: [csw-devel] SF.net SVN: gar:[21530] csw/mgar/pkg/lang-python/python/branches/python-2.7 /files/0001-manage-previous-site-package.patch In-Reply-To: References: Message-ID: 2013/7/19 : > --- a/Lib/site.py > +++ b/Lib/site.py > @@ -292,6 +292,7 @@ def getsitepackages(): > "python" + sys.version[:3], > "site-packages")) > sitepackages.append(os.path.join(prefix, "lib", "site-python")) > -+ sitepackages.append(os.path.join(prefix, "lib", "python")) > ++ sitepackages.append(os.path.join(prefix, "lib", "python/site-packages")) It's a minor nitpick: the intention between os.path.join is that you do not use the directory separator. See two lines above for an example. It's supposed to be something like this: sitepackages.append(os.path.join(prefix, "lib", "python", "site-packages")) From pfelecan at users.sourceforge.net Mon Jul 22 11:00:59 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 22 Jul 2013 09:00:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21535] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 21535 http://gar.svn.sourceforge.net/gar/?rev=21535&view=rev Author: pfelecan Date: 2013-07-22 09:00:50 +0000 (Mon, 22 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: - use a cleaner join as suggested by Maciej - don't use a debugging flavor Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-22 08:15:23 UTC (rev 21534) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-22 09:00:50 UTC (rev 21535) @@ -50,7 +50,7 @@ # BUILD64 = 1 GARCOMPILER = GNU -GARFLAVOR = DBG + EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-22 08:15:23 UTC (rev 21534) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-22 09:00:50 UTC (rev 21535) @@ -1,6 +1,6 @@ -From 5dc1c90d3d8c5491baacf565d77f0557bbcae7df Mon Sep 17 00:00:00 2001 +From dc6b9371110febac2cd49e7284ad238262014a46 Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Fri, 19 Jul 2013 10:34:14 +0200 +Date: Mon, 22 Jul 2013 10:53:42 +0200 Subject: [PATCH] manage previous site package this is to support the transition between an unversiond installation tree @@ -9,14 +9,14 @@ 1 file changed, 1 insertion(+) diff --git a/Lib/site.py b/Lib/site.py -index f1b0ae8..1ea2596 100644 +index f1b0ae8..04fb5f2 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -292,6 +292,7 @@ def getsitepackages(): "python" + sys.version[:3], "site-packages")) sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ sitepackages.append(os.path.join(prefix, "lib", "python/site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib", "python", "site-packages")) else: sitepackages.append(prefix) sitepackages.append(os.path.join(prefix, "lib", "site-packages")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Jul 22 12:02:41 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Jul 2013 10:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21536] csw/mgar/pkg/gts/trunk/Makefile Message-ID: Revision: 21536 http://gar.svn.sourceforge.net/gar/?rev=21536&view=rev Author: lblume Date: 2013-07-22 10:02:40 +0000 (Mon, 22 Jul 2013) Log Message: ----------- gts/trunk: Split and do 64 bit Modified Paths: -------------- csw/mgar/pkg/gts/trunk/Makefile Modified: csw/mgar/pkg/gts/trunk/Makefile =================================================================== --- csw/mgar/pkg/gts/trunk/Makefile 2013-07-22 09:00:50 UTC (rev 21535) +++ csw/mgar/pkg/gts/trunk/Makefile 2013-07-22 10:02:40 UTC (rev 21536) @@ -18,8 +18,7 @@ SPKG_SOURCEURL = http://gts.sourceforge.net/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GCC4 # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES @@ -33,6 +32,32 @@ PATCHFILES = gts-fabsf.diff -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 +PACKAGES += CSWlibgts0-7-5 +CATALOGNAME_CSWlibgts0-7-5 = libgts0_7_5 +PKGFILES_CSWlibgts0-7-5 += $(call baseisadirs,$(libdir),libgts-0\.7\.so\.5\.0\.1) +PKGFILES_CSWlibgts0-7-5 += $(call baseisadirs,$(libdir),libgts-0\.7\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibgts0-7-5 += $(DESCRIPTION), libgts-0.7.so.5 +RUNTIME_DEP_PKGS_CSWlibgts0-7-5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgts0-7-5 += CSWlibglib2-0-0 + +PACKAGES += CSWgts-dev +CATALOGNAME_CSWgts-dev = gts_dev +SPKG_DESC_CSWgts-dev += $(DESCRIPTION), development files +PKGFILES_CSWgts-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWgts-dev += CSWlibgts0-7-5 + +PACKAGES += CSWgts +CATALOGNAME_CSWgts = gts +SPKG_DESC_CSWgts += $(DESCRIPTION), utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgts += CSWlibgts0-7-5 +RUNTIME_DEP_PKGS_CSWgts += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgts += CSWlibnetpbm10 + +# Some scripts are not +x +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jul 22 13:20:00 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 22 Jul 2013 11:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21537] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 21537 http://gar.svn.sourceforge.net/gar/?rev=21537&view=rev Author: cgrzemba Date: 2013-07-22 11:19:59 +0000 (Mon, 22 Jul 2013) Log Message: ----------- netsnmp/trunk: fix init script Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netsnmp/trunk/files/0001-fixing-init-scripts.patch Removed Paths: ------------- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-22 10:02:40 UTC (rev 21536) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-22 11:19:59 UTC (rev 21537) @@ -30,7 +30,7 @@ # Patch for python module PATCHFILES += Makefile.in.diff PATCHFILES += setup-py.patch -PATCHFILES += 0001-remove-linux-specials.patch +PATCHFILES += 0001-fixing-init-scripts.patch VENDOR_URL = http://www.net-snmp.org/ @@ -38,8 +38,8 @@ BUILD_DEP_PKGS = CSWpysetuptools PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -INITSMF = $(sysconfdir)/init.d/snmpd -INITSMF += $(sysconfdir)/init.d/snmptrapd +INITSMF = $(sysconfdir)/init.d/netsnmpd +INITSMF += $(sysconfdir)/init.d/netsnmptrapd PACKAGES += CSWnetsnmp-dev CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev @@ -198,8 +198,8 @@ post-install: ginstall -d $(DESTDIR)/$(sysconfdir)/init.d ginstall -d $(DESTDIR)/$(sysconfdir)/snmp - ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmpd - ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmptrapd + ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/$(sysconfdir)/init.d/netsnmpd + ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/$(sysconfdir)/init.d/netsnmptrapd ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd.conf @$(MAKECOOKIE) Added: csw/mgar/pkg/netsnmp/trunk/files/0001-fixing-init-scripts.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-fixing-init-scripts.patch (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-fixing-init-scripts.patch 2013-07-22 11:19:59 UTC (rev 21537) @@ -0,0 +1,170 @@ +From a3fb8b0eaa2b8105120b689240cb64f66e80c89b Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Mon, 22 Jul 2013 12:13:13 +0200 +Subject: [PATCH] fixing init scripts + +--- + dist/snmpd-init.d | 43 +++++++++++++++++++++---------------------- + dist/snmptrapd-init.d | 31 ++++++++++--------------------- + 2 files changed, 31 insertions(+), 43 deletions(-) + +diff --git a/dist/snmpd-init.d b/dist/snmpd-init.d +index bd15b00..9e25f6c 100755 +--- a/dist/snmpd-init.d ++++ b/dist/snmpd-init.d +@@ -6,38 +6,29 @@ + # chkconfig: - 26 74 + # description: snmpd is net-snmp SNMP daemon. + +-# Source function library. +-. /etc/rc.d/init.d/functions +- +-# Source networking configuration. +-. /etc/sysconfig/network +- +-# Check that networking is up. +-[ "${NETWORKING}" = "no" ] && exit 0 +- + RETVAL=0 +-name="snmpd" +-prog="/usr/local/sbin/snmpd" +- +-[ -x $prog -a -f /usr/local/share/snmp/snmpd.conf ] || exit 0 ++prog="/opt/csw/sbin/snmpd" ++name=`basename $prog` + + start() { ++ [ -x $prog -a -f /etc/opt/csw/snmp/snmpd.conf ] || exit 1 ++ + # Start daemons. +- echo -n $"Starting $name: " +- daemon $prog ++ echo -n "Starting $name: " ++ $prog + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name ++ [ $RETVAL -eq 0 ] && touch /var/run/daemon/$name + return $RETVAL + } + + stop() { + # Stop daemons. +- echo -n $"Shutting down $name: " +- killproc $prog ++ echo -n "Shutting down $name: " ++ pkill -z `zonename` -x $name + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ++ [ $RETVAL -eq 0 ] && rm -f /var/run/daemon/$name + return $RETVAL + } + +@@ -50,8 +41,16 @@ case "$1" in + stop + ;; + status) +- status $name ++ [ -x $prog ] || (RETVAL=$?; echo "$prog not executable") ++ [ -f /etc/opt/csw/snmp/snmpd.conf ] || (RETVAL=$?; echo "configfile missing") ++ ++ pgrep -l -z `zonename` -x $name + RETVAL=$? ++ if [ $RETVAL -eq 0 ]; then ++ echo "$name running" ++ else ++ echo "$name not running" ++ fi + ;; + restart|reload) + stop +@@ -59,14 +58,14 @@ case "$1" in + RETVAL=$? + ;; + condrestart) +- if [ -f /var/lock/subsys/$name ]; then ++ if [ -f /var/run/daemon/$name ]; then + stop + start + RETVAL=$? + fi + ;; + *) +- echo $"Usage: $0 {start|stop|restart|condrestart|status}" ++ echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 + esac + +diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d +index 8225242..160ce5b 100644 +--- a/dist/snmptrapd-init.d ++++ b/dist/snmptrapd-init.d +@@ -6,38 +6,27 @@ + # chkconfig: - 25 75 + # description: snmptrapd is net-snmp SNMPTRAP daemon. + +-# Source function library. +-. /etc/rc.d/init.d/functions +- +-# Source networking configuration. +-. /etc/sysconfig/network +- +-# Check that networking is up. +-[ "${NETWORKING}" = "no" ] && exit 0 +- + RETVAL=0 +-name="snmptrapd" +-prog="/usr/local/sbin/snmptrapd" +- +-[ -x $prog ] || exit 0 ++prog="/opt/csw/sbin/snmptrapd" ++name=`basename $prog` + + start() { + # Start daemons. +- echo -n $"Starting $name: " +- daemon $prog ++ echo -n "Starting $name: " ++ $prog + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name ++ [ $RETVAL -eq 0 ] && touch /var/run/daemon/$name + return $RETVAL + } + + stop() { + # Stop daemons. +- echo -n $"Shutting down $name: " +- killproc $prog ++ echo -n "Shutting down $name: " ++ pkill -z `zonename` -x $name + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name ++ [ $RETVAL -eq 0 ] && rm -f /var/run/daemon/$name + return $RETVAL + } + +@@ -50,7 +39,7 @@ case "$1" in + stop + ;; + status) +- status $name ++ pgrep -l -z `zonename` -x $name + RETVAL=$? + ;; + restart|reload) +@@ -59,7 +48,7 @@ case "$1" in + RETVAL=$? + ;; + condrestart) +- if [ -f /var/lock/subsys/$name ]; then ++ if [ -f /var/run/daemon/$name ]; then + stop + start + RETVAL=$? +-- +1.8.3.1 + Deleted: csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch 2013-07-22 10:02:40 UTC (rev 21536) +++ csw/mgar/pkg/netsnmp/trunk/files/0001-remove-linux-specials.patch 2013-07-22 11:19:59 UTC (rev 21537) @@ -1,96 +0,0 @@ -From 449bf468f7d928c06c1ce893b36ba100e92abd1b Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Thu, 18 Jul 2013 16:59:00 +0200 -Subject: [PATCH] remove-linux-specials - ---- - dist/snmpd-init.d | 17 ++++------------- - dist/snmptrapd-init.d | 15 +++------------ - 2 files changed, 7 insertions(+), 25 deletions(-) - -diff --git a/dist/snmpd-init.d b/dist/snmpd-init.d -index bd15b00..ba4140b 100755 ---- a/dist/snmpd-init.d -+++ b/dist/snmpd-init.d -@@ -6,25 +6,16 @@ - # chkconfig: - 26 74 - # description: snmpd is net-snmp SNMP daemon. - --# Source function library. --. /etc/rc.d/init.d/functions -- --# Source networking configuration. --. /etc/sysconfig/network -- --# Check that networking is up. --[ "${NETWORKING}" = "no" ] && exit 0 -- - RETVAL=0 - name="snmpd" --prog="/usr/local/sbin/snmpd" -+prog="/opt/csw/sbin/snmpd" - --[ -x $prog -a -f /usr/local/share/snmp/snmpd.conf ] || exit 0 -+[ -x $prog -a -f /etc/opt/csw/snmp/snmpd.conf ] || exit 0 - - start() { - # Start daemons. - echo -n $"Starting $name: " -- daemon $prog -+ $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name -@@ -34,7 +25,7 @@ start() { - stop() { - # Stop daemons. - echo -n $"Shutting down $name: " -- killproc $prog -+ pkill `basename $prog` - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name -diff --git a/dist/snmptrapd-init.d b/dist/snmptrapd-init.d -index 8225242..b61debc 100644 ---- a/dist/snmptrapd-init.d -+++ b/dist/snmptrapd-init.d -@@ -6,25 +6,16 @@ - # chkconfig: - 25 75 - # description: snmptrapd is net-snmp SNMPTRAP daemon. - --# Source function library. --. /etc/rc.d/init.d/functions -- --# Source networking configuration. --. /etc/sysconfig/network -- --# Check that networking is up. --[ "${NETWORKING}" = "no" ] && exit 0 -- - RETVAL=0 - name="snmptrapd" --prog="/usr/local/sbin/snmptrapd" -+prog="/opt/csw/sbin/snmptrapd" - - [ -x $prog ] || exit 0 - - start() { - # Start daemons. - echo -n $"Starting $name: " -- daemon $prog -+ $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name -@@ -34,7 +25,7 @@ start() { - stop() { - # Stop daemons. - echo -n $"Shutting down $name: " -- killproc $prog -+ pkill `basename $prog` - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name --- -1.8.3.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jul 22 16:44:16 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 22 Jul 2013 14:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21538] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 21538 http://gar.svn.sourceforge.net/gar/?rev=21538&view=rev Author: cgrzemba Date: 2013-07-22 14:44:11 +0000 (Mon, 22 Jul 2013) Log Message: ----------- netsnmp/trunk: add reinplace_userlocal for net-snmp-cert Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-22 11:19:59 UTC (rev 21537) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-07-22 14:44:11 UTC (rev 21538) @@ -24,6 +24,7 @@ REINPLACE_USRLOCAL += perl/TrapReceiver/TrapReceiver.pm REINPLACE_USRLOCAL += local/ipf-mod.pl REINPLACE_USRLOCAL += local/traptoemail +REINPLACE_USRSHARE += local/net-snmp-cert # Patch for perl modules PATCHFILES = perl_makefiles.diff @@ -97,7 +98,7 @@ EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc PACKAGES += CSWpy-netsnmp -OBSOLETED_BY_CSWpy-netsnmp = CSWnetsnmp-py +# OBSOLETED_BY_CSWpy-netsnmp = CSWnetsnmp-py SPKG_DESC_CSWpy-netsnmp += $(DESCRIPTION), Python binding PKGFILES_CSWpy-netsnmp = $(libdir)/python.* RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 23 11:20:40 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 23 Jul 2013 09:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21539] csw/mgar/pkg/evince/trunk Message-ID: Revision: 21539 http://gar.svn.sourceforge.net/gar/?rev=21539&view=rev Author: cgrzemba Date: 2013-07-23 09:20:33 +0000 (Tue, 23 Jul 2013) Log Message: ----------- evince/trunk: fix ltmain.sh for norunpath Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-07-22 14:44:11 UTC (rev 21538) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-07-23 09:20:33 UTC (rev 21539) @@ -23,6 +23,7 @@ PATCHFILES += 0001-honor-aclocal_flags.patch PATCHFILES += 0002-poppler-api-changed.patch +PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -38,11 +39,11 @@ # EXTRA_CFLAGS_DBG = -g # EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) # EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK -EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO -EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 +EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO -norunpath +EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 -xnorunpath EXTRA_LD_OPTIONS = -lm -EXTRA_LINKER_FLAGS = -norunpath -xnorunpath +# EXTRA_LINKER_FLAGS = -norunpath -xnorunpath # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. Added: csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch 2013-07-23 09:20:33 UTC (rev 21539) @@ -0,0 +1,34 @@ +From 37170963829a6dcbf6f303113671168a3984a106 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 23 Jul 2013 09:43:29 +0200 +Subject: [PATCH] add norunpath to allowed compiler flags ltmain.sh + +--- + ltmain.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index b36c4ad..bc79f69 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath|-xnorunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -5095,7 +5095,7 @@ func_mode_link () + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do +- for search_ext in .la $std_shrext .so .a; do ++ for search_ext in $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 23 14:36:23 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 23 Jul 2013 12:36:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21540] csw/mgar/pkg/evince/trunk/files Message-ID: Revision: 21540 http://gar.svn.sourceforge.net/gar/?rev=21540&view=rev Author: cgrzemba Date: 2013-07-23 12:36:21 +0000 (Tue, 23 Jul 2013) Log Message: ----------- evince/trunk: fix poppler api 2nd attempt Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Removed Paths: ------------- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Deleted: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 09:20:33 UTC (rev 21539) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 12:36:21 UTC (rev 21540) @@ -1,11 +0,0 @@ ---- a/backend/pdf/ev-poppler.cc -+++ b/backend/pdf/ev-poppler.cc -@@ -1986,7 +1986,7 @@ pdf_selection_get_selected_text (EvSelection *selection, - r.x2 = points->x2; - r.y2 = height - points->y1; - -- retval = poppler_page_get_text (poppler_page, -+ retval = poppler_page_get_selected_text (poppler_page, - (PopplerSelectionStyle)style, - &r); - Added: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 12:36:21 UTC (rev 21540) @@ -0,0 +1,39 @@ +From c7c832fdb52b64d32e2554daf52f8834b906fc7f Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 23 Jul 2013 14:31:15 +0200 +Subject: [PATCH] poppler api changed + +--- + backend/pdf/ev-poppler.cc | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc +index fef0738..671d39b 100644 +--- a/backend/pdf/ev-poppler.cc ++++ b/backend/pdf/ev-poppler.cc +@@ -1974,21 +1974,12 @@ pdf_selection_get_selected_text (EvSelection *selection, + EvRectangle *points) + { + PopplerPage *poppler_page; +- PopplerRectangle r; +- double height; + char *retval; + + poppler_page = POPPLER_PAGE (rc->page->backend_page); +- +- poppler_page_get_size (poppler_page, NULL, &height); +- r.x1 = points->x1; +- r.y1 = height - points->y2; +- r.x2 = points->x2; +- r.y2 = height - points->y1; +- + retval = poppler_page_get_text (poppler_page, + (PopplerSelectionStyle)style, +- &r); ++ (PopplerRectangle *)points); + + return retval; + } +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 23 14:55:00 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 23 Jul 2013 12:55:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21541] csw/mgar/pkg/evince/trunk/files/ 0002-poppler-api-changed.patch Message-ID: Revision: 21541 http://gar.svn.sourceforge.net/gar/?rev=21541&view=rev Author: cgrzemba Date: 2013-07-23 12:55:00 +0000 (Tue, 23 Jul 2013) Log Message: ----------- evince/trunk: fix poppler api 3th attempt Modified Paths: -------------- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Modified: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 12:36:21 UTC (rev 21540) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 12:55:00 UTC (rev 21541) @@ -27,7 +27,7 @@ - r.x2 = points->x2; - r.y2 = height - points->y1; - - retval = poppler_page_get_text (poppler_page, + retval = poppler_page_get_selected_text (poppler_page, (PopplerSelectionStyle)style, - &r); + (PopplerRectangle *)points); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 23 15:29:20 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 23 Jul 2013 13:29:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21542] csw/mgar/pkg/evince/trunk/files/ 0002-poppler-api-changed.patch Message-ID: Revision: 21542 http://gar.svn.sourceforge.net/gar/?rev=21542&view=rev Author: cgrzemba Date: 2013-07-23 13:29:20 +0000 (Tue, 23 Jul 2013) Log Message: ----------- evince/trunk: fix poppler api 4th attempt Modified Paths: -------------- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch Modified: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 12:55:00 UTC (rev 21541) +++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch 2013-07-23 13:29:20 UTC (rev 21542) @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc -index fef0738..671d39b 100644 +index fef0738..e5380ad 100644 --- a/backend/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc @@ -1974,21 +1974,12 @@ pdf_selection_get_selected_text (EvSelection *selection, @@ -27,7 +27,8 @@ - r.x2 = points->x2; - r.y2 = height - points->y1; - - retval = poppler_page_get_selected_text (poppler_page, +- retval = poppler_page_get_text (poppler_page, ++ retval = poppler_page_get_selected_text (poppler_page, (PopplerSelectionStyle)style, - &r); + (PopplerRectangle *)points); @@ -36,4 +37,3 @@ } -- 1.8.3.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jul 23 16:39:53 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 23 Jul 2013 14:39:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21543] csw/mgar/pkg/evince/trunk Message-ID: Revision: 21543 http://gar.svn.sourceforge.net/gar/?rev=21543&view=rev Author: cgrzemba Date: 2013-07-23 14:39:49 +0000 (Tue, 23 Jul 2013) Log Message: ----------- evince/trunk: add fix poppler api core dump on free of linearized Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/evince/trunk/files/0001-fix-poppler-api-linearized-problem.patch Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2013-07-23 13:29:20 UTC (rev 21542) +++ csw/mgar/pkg/evince/trunk/Makefile 2013-07-23 14:39:49 UTC (rev 21543) @@ -24,6 +24,7 @@ PATCHFILES += 0001-honor-aclocal_flags.patch PATCHFILES += 0002-poppler-api-changed.patch PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch +PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/evince/trunk/files/0001-fix-poppler-api-linearized-problem.patch =================================================================== --- csw/mgar/pkg/evince/trunk/files/0001-fix-poppler-api-linearized-problem.patch (rev 0) +++ csw/mgar/pkg/evince/trunk/files/0001-fix-poppler-api-linearized-problem.patch 2013-07-23 14:39:49 UTC (rev 21543) @@ -0,0 +1,41 @@ +From c0353a442793dc139da3b4be79162523c0e0dafb Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Tue, 23 Jul 2013 16:20:01 +0200 +Subject: [PATCH] fix poppler api linearized problem + +--- + backend/pdf/ev-poppler.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc +index e5380ad..dd2cab3 100644 +--- a/backend/pdf/ev-poppler.cc ++++ b/backend/pdf/ev-poppler.cc +@@ -685,6 +685,7 @@ pdf_document_get_info (EvDocument *document) + PopplerPermissions permissions; + EvPage *page; + char *metadata; ++ gboolean linearized; + + info = g_new0 (EvDocumentInfo, 1); + +@@ -721,7 +722,7 @@ pdf_document_get_info (EvDocument *document) + "producer", &(info->producer), + "creation-date", &(info->creation_date), + "mod-date", &(info->modified_date), +- "linearized", &(info->linearized), ++ "linearized", &linearized, + "metadata", &metadata, + NULL); + +@@ -826,6 +827,7 @@ pdf_document_get_info (EvDocument *document) + /* translators: this is the document security state */ + info->security = g_strdup (_("No")); + } ++ info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No")); + + return info; + } +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Jul 23 17:05:48 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 23 Jul 2013 15:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk Message-ID: Revision: 21544 http://gar.svn.sourceforge.net/gar/?rev=21544&view=rev Author: lblume Date: 2013-07-23 15:05:47 +0000 (Tue, 23 Jul 2013) Log Message: ----------- tiff/trunk: Bump version to 4.0.3; switch compiler to GCC4; clean up deps Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile csw/mgar/pkg/tiff/trunk/checksums Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2013-07-23 14:39:49 UTC (rev 21543) +++ csw/mgar/pkg/tiff/trunk/Makefile 2013-07-23 15:05:47 UTC (rev 21544) @@ -1,5 +1,5 @@ -NAME = tiff -VERSION = 3.9.5 +NAME = tiff +VERSION = 4.0.3 GARTYPE = v2 DESCRIPTION = Lib and tools for Tag Image File Format @@ -15,49 +15,42 @@ LICENSE = COPYRIGHT +GARCOMPILER = GCC4 + PACKAGES = CSWtiff SPKG_DESC_CSWtiff += Tools for Tag Image File Format manipulation PKGFILES_CSWtiff += $(bindir)/.* PKGFILES_CSWtiff += $(mandir)/man1/.* -RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWtiff += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWtiff += CSWjbigkit +RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWtiff += CSWfreeglut RUNTIME_DEP_PKGS_CSWtiff += CSWmesa -RUNTIME_DEP_PKGS_CSWtiff += CSWlibz1 -# There are legacy packages dependencing on CSWtiff who have not a SONAME binding and -# require libtiff.so to be available -RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff-dev -CHECKPKG_OVERRIDES_CSWtiff += surplus-dependency|CSWlibtiff-dev +PACKAGES += CSWlibtiff5 +SPKG_DESC_CSWlibtiff5 = Tag Image File Format library for C, libtiff.so.5 +PKGFILES_CSWlibtiff5 += $(call pkgfiles_lib,libtiff.so.5) +RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibjbig2 +RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibz1 -PACKAGES += CSWlibtiff3 -SPKG_DESC_CSWlibtiff3 = Tag Image File Format library for C, libtiff.so.3 -PKGFILES_CSWlibtiff3 += $(call pkgfiles_lib,libtiff.so.3) -RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWjbigkit -RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibz1 +PACKAGES += CSWlibtiffxx5 +SPKG_DESC_CSWlibtiffxx5 = Tag Image File Format library for C++, libtiffcxx.so.5 +PKGFILES_CSWlibtiffxx5 += $(call pkgfiles_lib,libtiffxx.so.5) +RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibstdc++6 -PACKAGES += CSWlibtiffxx3 -SPKG_DESC_CSWlibtiffxx3 = Tag Image File Format library for C++, libtiffcxx.so.3 -PKGFILES_CSWlibtiffxx3 += $(call pkgfiles_lib,libtiffxx.so.3) -RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWjbigkit -RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibtiff3 - PACKAGES += CSWlibtiff-dev -SPKG_DESC_CSWlibtiff-dev += Development files for libtiff.so.3 and libtiffxx.so.3 +SPKG_DESC_CSWlibtiff-dev += Development files for libtiff.so.5 and libtiffxx.so.5 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiffxx3 +RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiffxx5 -# There are docs only -CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/ChangeLog -CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/html/build.html +# Ensure linking against the currently built lib and not the existing one +# (for libtiffxx) +EXTRA_LD_OPTIONS += -L$(abspath $(WORKSRC))/libtiff/.libs -EXTRA_LINKER_FLAGS += -norunpath - BUILD64 = 1 ISAEXEC = 1 @@ -65,11 +58,6 @@ CONFIGURE_ARGS += --with-docdir=$(docdir)/tiff CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --with-zlib-include-dir=$(includedir) -CONFIGURE_ARGS += --with-zlib-lib-dir=$(libdir) -CONFIGURE_ARGS += --with-jpeg-include-dir=$(includedir) -CONFIGURE_ARGS += --with-jpeg-lib-dir=$(libdir) -CONFIGURE_ARGS += --with-jbig-include-dir=$(includedir) -CONFIGURE_ARGS += --with-jbig-lib-dir=$(libdir) +CONFIGURE_ARGS += --enable-maintainer-mode include gar/category.mk Modified: csw/mgar/pkg/tiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tiff/trunk/checksums 2013-07-23 14:39:49 UTC (rev 21543) +++ csw/mgar/pkg/tiff/trunk/checksums 2013-07-23 15:05:47 UTC (rev 21544) @@ -1 +1 @@ -8fc7ce3b4e1d0cc8a319336967815084 tiff-3.9.5.tar.gz +051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Tue Jul 23 17:09:48 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Tue, 23 Jul 2013 17:09:48 +0200 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk In-Reply-To: (lblume@users.sourceforge.net's message of "Tue, 23 Jul 2013 15:05:48 +0000") References: Message-ID: lblume at users.sourceforge.net writes: > +GARCOMPILER = GCC4 saying GARCOMPILER = GNU is just more generic > +CONFIGURE_ARGS += --enable-maintainer-mode why do you enable that? -- Peter From laurent at opencsw.org Tue Jul 23 19:32:38 2013 From: laurent at opencsw.org (Laurent Blume) Date: Tue, 23 Jul 2013 19:32:38 +0200 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk In-Reply-To: References: Message-ID: <51EEBE36.6030700@opencsw.org> On 2013-07-23 5:09 PM, Peter FELECAN wrote: > lblume at users.sourceforge.net writes: > >> +GARCOMPILER = GCC4 > > saying GARCOMPILER = GNU is just more generic Fair enough. To be honest, I don't quite understand the rationale behind it. In fact, I'm becoming convinced a generic compiler choice is just not what I want. A decent default (when no GARCOMPILER is given) is good, but when I set one, I want to know exactly which one I meant and tested, without having to remember 2 years from now what the generic was at the time. And when GCC5 becomes the default anyway, every recipe with GNU in it will have to be carefully reviewd, and packages rebuilt when ABI are incompatible. So why bother? >> +CONFIGURE_ARGS += --enable-maintainer-mode > > why do you enable that? > Because it seems fitting, as I'm maintaining the package :-) I've not checked in details what it does, but it's in the howto-release, it doesn't break anything, so looks good to me. Laurent From pfelecan at opencsw.org Tue Jul 23 20:38:31 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Tue, 23 Jul 2013 20:38:31 +0200 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk In-Reply-To: <51EEBE36.6030700@opencsw.org> (Laurent Blume's message of "Tue, 23 Jul 2013 19:32:38 +0200") References: <51EEBE36.6030700@opencsw.org> Message-ID: Laurent Blume writes: > On 2013-07-23 5:09 PM, Peter FELECAN wrote: >> lblume at users.sourceforge.net writes: >> >>> +GARCOMPILER = GCC4 >> >> saying GARCOMPILER = GNU is just more generic > > Fair enough. To be honest, I don't quite understand the rationale behind > it. In fact, I'm becoming convinced a generic compiler choice is just > not what I want. > A decent default (when no GARCOMPILER is given) is good, but when I set > one, I want to know exactly which one I meant and tested, without having > to remember 2 years from now what the generic was at the time. And when > GCC5 becomes the default anyway, every recipe with GNU in it will have > to be carefully reviewd, and packages rebuilt when ABI are incompatible. > So why bother? The reverse is true also. GCC doesn't change ABI's so often, quite rarely. If you look in our recipes, what I proposed is the more frequent form and it a good thing like that. >>> +CONFIGURE_ARGS += --enable-maintainer-mode >> >> why do you enable that? >> > > Because it seems fitting, as I'm maintaining the package :-) > I've not checked in details what it does, but it's in the howto-release, > it doesn't break anything, so looks good to me. Are you maintaining the upstream project? From my point of view you're packaging it, which is quite different. If you look at what means "maintainer mode" in GNU standards you'll be quite surprised. This is why I think that such an option is to be activated only exceptionally in our situation. -- Peter From laurent at opencsw.org Tue Jul 23 21:17:58 2013 From: laurent at opencsw.org (Laurent Blume) Date: Tue, 23 Jul 2013 21:17:58 +0200 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk In-Reply-To: References: <51EEBE36.6030700@opencsw.org> Message-ID: <51EED6E6.600@opencsw.org> On 23/07/2013 20:38, Peter FELECAN wrote: > The reverse is true also. GCC doesn't change ABI's so often, quite > rarely. If you look in our recipes, what I proposed is the more frequent > form and it a good thing like that. I lived through the bad times of GCC3.x, so I guess I got a bit burnt back then. > Are you maintaining the upstream project? From my point of view you're > packaging it, which is quite different. If you look at what means > "maintainer mode" in GNU standards you'll be quite surprised. This is > why I think that such an option is to be activated only exceptionally in > our situation. Well, feel free to enlighten me. I admit I've not been able to find much information about it, so since you know better, do tell, or give some reference. The help says that: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer Since I believe what I'm doing is not casual installer stuff, it seems adequate. What would it break? Thanks, Laurent From lblume at users.sourceforge.net Tue Jul 23 23:22:07 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 23 Jul 2013 21:22:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21545] csw/mgar/pkg/gd/trunk Message-ID: Revision: 21545 http://gar.svn.sourceforge.net/gar/?rev=21545&view=rev Author: lblume Date: 2013-07-23 21:22:03 +0000 (Tue, 23 Jul 2013) Log Message: ----------- gd/trunk: Bump version to 2.1.0; fix some dependencies; switch to GCC4 Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gd/trunk/checksums Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2013-07-23 15:05:47 UTC (rev 21544) +++ csw/mgar/pkg/gd/trunk/Makefile 2013-07-23 21:22:03 UTC (rev 21545) @@ -1,5 +1,5 @@ -NAME = gd -VERSION = 2.0.36RC1 +NAME = gd +VERSION = 2.1.0 GARTYPE = v2 DESCRIPTION = A library used for dynamic image creation @@ -12,45 +12,51 @@ applications of GD involve web site development. endef -MASTER_SITES = http://www.libgd.org/releases/ -# Master site down. This version archived at: http://www.graphviz.org/pub/tmp/gd-2.0.36RC1.tar.gz -# Contact: ellson at opencsw.org -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = https://bitbucket.org/libgd/gd-libgd/downloads/ +DISTNAME = lib$(NAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.xz -PATCHFILES += gdkanji.c.patch +GARCOMPILER = GCC4 +BUILD_DEP_PKGS += CSWpkgconfig + PACKAGES = CSWgd CATALOGNAME_CSWgd = gd SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2 +RUNTIME_DEP_PKGS_CSWgd += CSWlibgd3 -PACKAGES += CSWlibgd2 -CATALOGNAME_CSWlibgd2 = libgd2 -SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2 -PKGFILES_CSWlibgd2 += $(call pkgfiles_lib,libgd.so.2) -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibxpm4 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibz1 +PACKAGES += CSWlibgd3 +CATALOGNAME_CSWlibgd3 = libgd3 +SPKG_DESC_CSWlibgd3 = A library used for dynamic image creation providing libgd.so.3 +PKGFILES_CSWlibgd3 += $(call pkgfiles_lib,libgd.so.3) +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibxpm4 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgd3 += CSWlibtiff5 PACKAGES += CSWlibgd-dev CATALOGNAME_CSWlibgd-dev = libgd_dev -SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.2 +SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.3 PKGFILES_CSWlibgd-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2 +RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd3 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype # This is evaluated twice, quote properly EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\" -BUILD64_LIBS_ONLY = 1 +# For the success of the test for iconv +EXTRA_LINKER_FLAGS = -liconv + +BUILD64 = 1 +ISAEXEC = 1 + STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -65,9 +71,11 @@ # GD does not have a testsuite TEST_SCRIPTS = -# This is ok as there are a number of search pathes for fonts in there. -# We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list. -CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h +# This is ok as it comes from a default error message +CHECKPKG_OVERRIDES_CSWgd += file-with-bad-content|/usr/share|root/opt/csw/bin/amd64/annotate +CHECKPKG_OVERRIDES_CSWgd += file-with-bad-content|/usr/share|root/opt/csw/bin/pentium_pro/annotate +CHECKPKG_OVERRIDES_CSWgd += file-with-bad-content|/usr/share|root/opt/csw/bin/sparcv8plus/annotate +CHECKPKG_OVERRIDES_CSWgd += file-with-bad-content|/usr/share|root/opt/csw/bin/sparcv9/annotate include gar/category.mk @@ -80,10 +88,3 @@ $(WORKSRC)/gd.h @$(MAKECOOKIE) -# The shipped libtool doesn't know about Sun Studio C++ compiler 'CC' -pre-configure-modulated: -# grm -f $(WORKSRC)/config/ltmain.sh -# gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh -# cd $(WORKSRC) && aclocal && automake - @$(MAKECOOKIE) - Modified: csw/mgar/pkg/gd/trunk/checksums =================================================================== --- csw/mgar/pkg/gd/trunk/checksums 2013-07-23 15:05:47 UTC (rev 21544) +++ csw/mgar/pkg/gd/trunk/checksums 2013-07-23 21:22:03 UTC (rev 21545) @@ -1,2 +1 @@ -1eb8ddb8d9fc77f7502bb6cbcd706c08 gdkanji.c.patch -39ac48e6d5e0012a3bd2248a0102f209 gd-2.0.36RC1.tar.gz +03588159bf4faab9079849c8d709acc6 libgd-2.1.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Jul 23 23:52:08 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 23 Jul 2013 21:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21546] csw/mgar/pkg/libwebp/trunk/Makefile Message-ID: Revision: 21546 http://gar.svn.sourceforge.net/gar/?rev=21546&view=rev Author: lblume Date: 2013-07-23 21:52:04 +0000 (Tue, 23 Jul 2013) Log Message: ----------- libwebp/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/libwebp/trunk/Makefile Modified: csw/mgar/pkg/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-23 21:22:03 UTC (rev 21545) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-23 21:52:04 UTC (rev 21546) @@ -35,11 +35,13 @@ RUNTIME_DEP_PKGS_CSWwebp += CSWlibwebp4 RUNTIME_DEP_PKGS_CSWwebp += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWwebp += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWwebp += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWwebp += CSWlibtiff5 ISAEXEC = 1 BUILD64 = 1 +EXTRA_LD_OPTIONS = -z ignore -Bdirect + include gar/category.mk post-extract-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Jul 24 00:05:04 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 23 Jul 2013 22:05:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21547] csw/mgar/pkg/gd/trunk/Makefile Message-ID: Revision: 21547 http://gar.svn.sourceforge.net/gar/?rev=21547&view=rev Author: lblume Date: 2013-07-23 22:05:04 +0000 (Tue, 23 Jul 2013) Log Message: ----------- gd/trunk: Add linking options Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2013-07-23 21:52:04 UTC (rev 21546) +++ csw/mgar/pkg/gd/trunk/Makefile 2013-07-23 22:05:04 UTC (rev 21547) @@ -53,6 +53,7 @@ # For the success of the test for iconv EXTRA_LINKER_FLAGS = -liconv +EXTRA_LD_OPTIONS = -z ignore -Bdirect BUILD64 = 1 ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Wed Jul 24 10:01:31 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 24 Jul 2013 10:01:31 +0200 Subject: [csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk In-Reply-To: <51EED6E6.600@opencsw.org> (Laurent Blume's message of "Tue, 23 Jul 2013 21:17:58 +0200") References: <51EEBE36.6030700@opencsw.org> <51EED6E6.600@opencsw.org> Message-ID: Laurent Blume writes: > On 23/07/2013 20:38, Peter FELECAN wrote: >> The reverse is true also. GCC doesn't change ABI's so often, quite >> rarely. If you look in our recipes, what I proposed is the more frequent >> form and it a good thing like that. > > I lived through the bad times of GCC3.x, so I guess I got a bit burnt > back then. Can you enlighten me with a sustaining reference to these ABI issues? >> Are you maintaining the upstream project? From my point of view you're >> packaging it, which is quite different. If you look at what means >> "maintainer mode" in GNU standards you'll be quite surprised. This is >> why I think that such an option is to be activated only exceptionally in >> our situation. > > Well, feel free to enlighten me. I admit I've not been able to find > much information about it, so since you know better, do tell, or give > some reference. > > The help says that: > --enable-maintainer-mode > enable make rules and dependencies not useful (and > sometimes confusing) to the casual installer > > Since I believe what I'm doing is not casual installer stuff, it seems > adequate. What would it break? http://www.gnu.org/software/automake/manual/automake.html#maintainer_002dmode After reading this, do you feel more empowered to use this option? You should understand that, initially, I was just making collegial observations which you are free to follow or not. -- Peter From lblume at users.sourceforge.net Wed Jul 24 21:37:17 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 24 Jul 2013 19:37:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21548] csw/mgar/pkg/leptonica/trunk/Makefile Message-ID: Revision: 21548 http://gar.svn.sourceforge.net/gar/?rev=21548&view=rev Author: lblume Date: 2013-07-24 19:37:15 +0000 (Wed, 24 Jul 2013) Log Message: ----------- leptonica/trunk: Rebuilt with deps cleanup Modified Paths: -------------- csw/mgar/pkg/leptonica/trunk/Makefile Modified: csw/mgar/pkg/leptonica/trunk/Makefile =================================================================== --- csw/mgar/pkg/leptonica/trunk/Makefile 2013-07-23 22:05:04 UTC (rev 21547) +++ csw/mgar/pkg/leptonica/trunk/Makefile 2013-07-24 19:37:15 UTC (rev 21548) @@ -10,18 +10,14 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 LICENSE = README.html -# *Sigh* -CHECKPKG_OVERRIDES_CSWliblept-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblept_dev/license -CHECKPKG_OVERRIDES_CSWleptonica += file-with-bad-content|/usr/local|root/opt/csw/share/doc/leptonica/license -CHECKPKG_OVERRIDES_CSWliblept3 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblept3/license PACKAGES += CSWliblept3 SPKG_DESC_CSWliblept3 = An open source C library for efficient image processing and image analysis operations, liblept.so.3 PKGFILES_CSWliblept3 += $(call pkgfiles_lib,liblept.so.3) -RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibwebp0 -RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibwebp4 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibgif4 @@ -34,12 +30,6 @@ SPKG_DESC_CSWleptonica = Tools for efficient image processing and image analysis operations # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWleptonica += CSWliblept3 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibwebp0 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibz1 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWleptonica += CSWlibgif4 # This is used in the sourcecode, but not set anywhere EXTRA_CPPFLAGS += -D__SOLARIS__ 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 Jul 25 00:32:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 24 Jul 2013 22:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21549] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21549 http://gar.svn.sourceforge.net/gar/?rev=21549&view=rev Author: wahwah Date: 2013-07-24 22:32:11 +0000 (Wed, 24 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: Adjustments to make it play nice with 2.6 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-24 19:37:15 UTC (rev 21548) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-24 22:32:11 UTC (rev 21549) @@ -50,9 +50,10 @@ # BUILD64 = 1 GARCOMPILER = GNU +# GARFLAVOR = DBG -EXTRA_INC += $(prefix)/bdb47/include -EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_INC += $(prefix)/bdb48/include +EXTRA_LIB += $(prefix)/bdb48/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 @@ -88,9 +89,9 @@ PACKAGES += CSWlibpython$(DVER)-1-0 -PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0) PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*) SPKG_DESC_CSWlibpython$(DVER)-1-0 += $(DESCRIPTION), libpython2.7.so.1.0 +RUNTIME_DEP_PKGS_CSWlibpython$(DVER)-1-0 += CSWlibgcc-s1 PACKAGES += CSWpython$(CVER)-dev SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python @@ -119,18 +120,21 @@ 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) += CSWbdb48 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) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 + +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 @@ -157,8 +161,12 @@ # Allow to choose the default Python version. # Python 2.6 is the default one as of 2013-07-21. -ALTERNATIVES_CSWpython$(CVER) = python-2.7 -ALTERNATIVE_python-symlink = $(bindir)/python python-symlink $(bindir)/python2.7 270 +ALTERNATIVES_CSWpython$(CVER) = python-$(VER) +ALTERNATIVE_python-$(VER) = $(bindir)/python python-symlink python$(VER) 270 +# TODO(maciej): Implement alternatives for the man page. +# ALTERNATIVES_CSWpython$(CVER) = python-man-$(VER) +# ALTERNATIVE_python-man-$(VER) = $(mandir)/man1/python.1 python-man-symlink python$(VER) 270 + EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python # This could be handled by automatic dependency detection @@ -201,31 +209,34 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' +# Needs to be turned into alternatives. +EXTRA_PAX_ARGS += -s ',^\.$(mandir)/man1/python.1,$(mandir)/man1/python.1-$(VER),' EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|but|never|used # 64-bit overrides -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWlibffi4 -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncurses.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel_failed.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_tkinter.so|but|never|used include gar/category.mk @@ -247,6 +258,10 @@ $(MAKECOOKIE) post-merge-modulated: + # Some checks + # Prevent things like https://www.opencsw.org/mantis/view.php?id=5040 + test ! -f $(PKGROOT)/opt/csw/lib/python$(VER)/lib-dynload/_socket_failed.so + test -f $(PKGROOT)/opt/csw/lib/python$(VER)/lib-dynload/_socket.so echo "This is post-merge-modulated, which should not work. But it does." ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jul 25 11:37:59 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 25 Jul 2013 09:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21550] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21550 http://gar.svn.sourceforge.net/gar/?rev=21550&view=rev Author: pfelecan Date: 2013-07-25 09:37:53 +0000 (Thu, 25 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: correct alternative target Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-24 22:32:11 UTC (rev 21549) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-25 09:37:53 UTC (rev 21550) @@ -162,7 +162,7 @@ # Allow to choose the default Python version. # Python 2.6 is the default one as of 2013-07-21. ALTERNATIVES_CSWpython$(CVER) = python-$(VER) -ALTERNATIVE_python-$(VER) = $(bindir)/python python-symlink python$(VER) 270 +ALTERNATIVE_python-$(VER) = $(bindir)/python python-symlink $(bindir)/python$(VER) 270 # TODO(maciej): Implement alternatives for the man page. # ALTERNATIVES_CSWpython$(CVER) = python-man-$(VER) # ALTERNATIVE_python-man-$(VER) = $(mandir)/man1/python.1 python-man-symlink python$(VER) 270 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu Jul 25 11:39:59 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 25 Jul 2013 09:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21551] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21551 http://gar.svn.sourceforge.net/gar/?rev=21551&view=rev Author: slowfranklin Date: 2013-07-25 09:39:59 +0000 (Thu, 25 Jul 2013) Log Message: ----------- tracker/trunk: Update libtiff Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-07-25 09:37:53 UTC (rev 21550) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-07-25 09:39:59 UTC (rev 21551) @@ -75,7 +75,7 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Jul 25 11:40:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 25 Jul 2013 09:40:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21552] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21552 http://gar.svn.sourceforge.net/gar/?rev=21552&view=rev Author: lblume Date: 2013-07-25 09:40:58 +0000 (Thu, 25 Jul 2013) Log Message: ----------- wxwidgets/trunk: Rebuild with new libtiff Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-07-25 09:39:59 UTC (rev 21551) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-07-25 09:40:58 UTC (rev 21552) @@ -41,7 +41,7 @@ RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibmspack0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango @@ -111,7 +111,7 @@ EXTRA_CFLAGS += -xnorunpath EXTRA_CXXFLAGS += -norunpath EXTRA_LDFLAGS += -norunpath -EXTRA_LD_OPTIONS += -z nolazyload -B direct -lCrun -lCstd +EXTRA_LD_OPTIONS += -z nolazyload -z ignore -Bdirect -lCrun -lCstd # wxWidget contains a bunch of .so, let's keep them together as one big # happy family 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 Jul 25 15:22:18 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Jul 2013 13:22:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21553] csw/mgar/pkg/awstats/trunk Message-ID: Revision: 21553 http://gar.svn.sourceforge.net/gar/?rev=21553&view=rev Author: dmichelsen Date: 2013-07-25 13:22:13 +0000 (Thu, 25 Jul 2013) Log Message: ----------- awstats/trunk: Update to 7.1 Modified Paths: -------------- csw/mgar/pkg/awstats/trunk/Makefile csw/mgar/pkg/awstats/trunk/checksums Modified: csw/mgar/pkg/awstats/trunk/Makefile =================================================================== --- csw/mgar/pkg/awstats/trunk/Makefile 2013-07-25 09:40:58 UTC (rev 21552) +++ csw/mgar/pkg/awstats/trunk/Makefile 2013-07-25 13:22:13 UTC (rev 21553) @@ -1,5 +1,5 @@ NAME = awstats -VERSION = 7.0 +VERSION = 7.1 GARTYPE = v2 DESCRIPTION = Featureful tool for web, ftp and mail server statistics Modified: csw/mgar/pkg/awstats/trunk/checksums =================================================================== --- csw/mgar/pkg/awstats/trunk/checksums 2013-07-25 09:40:58 UTC (rev 21552) +++ csw/mgar/pkg/awstats/trunk/checksums 2013-07-25 13:22:13 UTC (rev 21553) @@ -1 +1 @@ -3e8e09b9ebe74513bb34290dbcd37b45 awstats-7.0.tar.gz +9ee8cb9c89295a519638ae1cf6a4e1e2 awstats-7.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 Thu Jul 25 22:40:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Jul 2013 20:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21554] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 21554 http://gar.svn.sourceforge.net/gar/?rev=21554&view=rev Author: wahwah Date: 2013-07-25 20:40:11 +0000 (Thu, 25 Jul 2013) Log Message: ----------- cswclassutils/trunk: Better diagnostics for compilation issues. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-25 13:22:13 UTC (rev 21553) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-25 20:40:11 UTC (rev 21554) @@ -25,10 +25,10 @@ TMPDIR=/var/opt/csw/cswclassutils -[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR" +mkdir -p "$TMPDIR" TMPPY=$TMPDIR/pycomp.$$.`date +%Y%m%d%H%M%S`.py -cat < $TMPPY +cat > $TMPPY < Revision: 21555 http://gar.svn.sourceforge.net/gar/?rev=21555&view=rev Author: wahwah Date: 2013-07-26 08:25:53 +0000 (Fri, 26 Jul 2013) Log Message: ----------- cswclassutils/trunk: tabs, grr. why were tabs used here? Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-25 20:40:11 UTC (rev 21554) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-26 08:25:53 UTC (rev 21555) @@ -51,9 +51,9 @@ ] for f in pyfiles: - try: - py_compile.compile(f, doraise=True) - except py_compile.PyCompileError as e: + try: + py_compile.compile(f, doraise=True) + except py_compile.PyCompileError as e: print 'Error compiling %s: %s' % (f, e) EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Jul 26 11:11:11 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Jul 2013 09:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21556] csw/mgar/pkg/gd/trunk/Makefile Message-ID: Revision: 21556 http://gar.svn.sourceforge.net/gar/?rev=21556&view=rev Author: lblume Date: 2013-07-26 09:11:03 +0000 (Fri, 26 Jul 2013) Log Message: ----------- gd/trunk: Remove useless line Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2013-07-26 08:25:53 UTC (rev 21555) +++ csw/mgar/pkg/gd/trunk/Makefile 2013-07-26 09:11:03 UTC (rev 21556) @@ -53,7 +53,6 @@ # For the success of the test for iconv EXTRA_LINKER_FLAGS = -liconv -EXTRA_LD_OPTIONS = -z ignore -Bdirect BUILD64 = 1 ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Jul 26 11:35:50 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Jul 2013 09:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21557] csw/mgar/pkg/libwebp/trunk/Makefile Message-ID: Revision: 21557 http://gar.svn.sourceforge.net/gar/?rev=21557&view=rev Author: lblume Date: 2013-07-26 09:35:40 +0000 (Fri, 26 Jul 2013) Log Message: ----------- libwebp/trunk: Remove useless line Modified Paths: -------------- csw/mgar/pkg/libwebp/trunk/Makefile Modified: csw/mgar/pkg/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-26 09:11:03 UTC (rev 21556) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2013-07-26 09:35:40 UTC (rev 21557) @@ -40,8 +40,6 @@ ISAEXEC = 1 BUILD64 = 1 -EXTRA_LD_OPTIONS = -z ignore -Bdirect - include gar/category.mk post-extract-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Jul 26 12:19:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Jul 2013 10:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21558] csw/mgar/pkg/djvulibre/trunk Message-ID: Revision: 21558 http://gar.svn.sourceforge.net/gar/?rev=21558&view=rev Author: lblume Date: 2013-07-26 10:19:30 +0000 (Fri, 26 Jul 2013) Log Message: ----------- djvulibre/trunk: Bump version to 3.5.25.3; clean up deps Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile csw/mgar/pkg/djvulibre/trunk/checksums Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2013-07-26 09:35:40 UTC (rev 21557) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2013-07-26 10:19:30 UTC (rev 21558) @@ -1,5 +1,6 @@ NAME = djvulibre -VERSION = 3.5.24 +VERSION = 3.5.25 +GARSUBREV = 3 GARTYPE = v2 DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools @@ -7,8 +8,8 @@ endef SF_PROJECT = djvu -MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(SF_MIRRORS)DjVuLibre/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).$(GARSUBREV).tar.gz PATCHFILES += ddjvu.cpp.patch VENDOR_URL = http://djvu.sourceforge.net/ @@ -19,23 +20,19 @@ CATALOGNAME_CSWdjvulibre = djvulibre SPKG_DESC_CSWdjvulibre += DjVu standalone viewer and ommandline tools # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre21 # This is for legacy package expecting to find libdjvulibre.so.15 when pulling in CSWdjvulibre RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre15 CHECKPKG_OVERRIDES_CSWdjvulibre += surplus-dependency|CSWlibdjvulibre15 -# What is this for? -CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/share|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime -CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/local|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime - PACKAGES += CSWlibdjvulibre21 SPKG_DESC_CSWlibdjvulibre21 += DjVu library, libdjvulibre.so.21 PKGFILES_CSWlibdjvulibre21 += $(call pkgfiles_lib,libdjvulibre.so.21) OBSOLETED_BY_CSWlibdjvulibre21 += CSWdjvulibrert CATALOGNAME_CSWdjvulibrert = djvulibre_rt_stub RUNTIME_DEP_PKGS_CSWlibdjvulibre21 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibdjvulibre21 += CSWlibiconv2 PACKAGES += CSWlibdjvulibre-dev SPKG_DESC_CSWlibdjvulibre-dev += Development files for libdjvulibre.so.21 @@ -56,6 +53,8 @@ REINPLACE_WITH = |-norunpath$$1 REINPLACE_FILES += config/ltmain.sh +EXTRA_LINKER_FLAGS += -liconv + BUILD64 = 1 ISAEXEC = 1 Modified: csw/mgar/pkg/djvulibre/trunk/checksums =================================================================== --- csw/mgar/pkg/djvulibre/trunk/checksums 2013-07-26 09:35:40 UTC (rev 21557) +++ csw/mgar/pkg/djvulibre/trunk/checksums 2013-07-26 10:19:30 UTC (rev 21558) @@ -1 +1 @@ -af83d27af5083198432a178d22b259c5 djvulibre-3.5.24.tar.gz +5f45d6cd5700b4dd31b1eb963482089b djvulibre-3.5.25.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Jul 26 14:10:10 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Jul 2013 12:10:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21559] csw/mgar/pkg/windowmaker/trunk Message-ID: Revision: 21559 http://gar.svn.sourceforge.net/gar/?rev=21559&view=rev Author: lblume Date: 2013-07-26 12:10:08 +0000 (Fri, 26 Jul 2013) Log Message: ----------- windowmaker/trunk: Bump to 0.95.4; clean up deps Modified Paths: -------------- csw/mgar/pkg/windowmaker/trunk/Makefile csw/mgar/pkg/windowmaker/trunk/checksums Modified: csw/mgar/pkg/windowmaker/trunk/Makefile =================================================================== --- csw/mgar/pkg/windowmaker/trunk/Makefile 2013-07-26 10:19:30 UTC (rev 21558) +++ csw/mgar/pkg/windowmaker/trunk/Makefile 2013-07-26 12:10:08 UTC (rev 21559) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = windowmaker -VERSION = 0.95.2 +VERSION = 0.95.4 GARTYPE = v2 DESCRIPTION = X11 window manager @@ -29,12 +29,10 @@ PKGFILES_CSWlibwings2 += $(call baseisadirs,$(libdir),libWINGs\.so\.2(\.\d+)*) SPKG_DESC_CSWlibwings2 += $(DESCRIPTION), libWINGs.so.2 RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibwraster3 RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibwutil2 RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWlibwings2 += CSWlibxrender PACKAGES += CSWlibwutil2 PKGFILES_CSWlibwutil2 += $(call baseisadirs,$(libdir),libWUtil\.so\.2(\.\d+)*) @@ -46,12 +44,12 @@ PACKAGES += CSWlibwraster3 PKGFILES_CSWlibwraster3 += $(call baseisadirs,$(libdir),libwraster\.so\.3(\.\d+)*) SPKG_DESC_CSWlibwraster3 += $(DESCRIPTION), libwraster.so.3 -RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWxpm -RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibwraster3 += CSWlibxpm4 PACKAGES += CSWwindowmaker-dev SPKG_DESC_CSWwindowmaker-dev += $(DESCRIPTION), development files @@ -59,28 +57,27 @@ RUNTIME_DEP_PKGS_CSWwindowmaker-dev += CSWlibwutil2 RUNTIME_DEP_PKGS_CSWwindowmaker-dev += CSWlibwraster3 RUNTIME_DEP_PKGS_CSWwindowmaker-dev += CSWlibwings2 +RUNTIME_DEP_PKGS_CSWwindowmaker-dev += CSWwindowmaker PACKAGES += CSWwindowmaker SPKG_DESC_CSWwindowmaker = $(DESCRIPTION) OBSOLETED_BY_CSWwindowmaker = CSWwmaker INCOMPATIBLE_PKGS_CSWwindowmaker = CSWwmaker -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWemacscommon +RUNTIME_DEP_PKGS_CSWwindowmaker += CSWemacs-common RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibwings2 RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibwraster3 RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibwutil2 RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibxrender RUNTIME_DEP_PKGS_CSWwindowmaker += CSWperl -RUNTIME_DEP_PKGS_CSWwindowmaker += CSWxpm +RUNTIME_DEP_PKGS_CSWwindowmaker += CSWlibgcc-s1 + # Documentation CHECKPKG_OVERRIDES_CSWwindowmaker += file-with-bad-content +# Main library file +CHECKPKG_OVERRIDES_CSWwindowmaker += shared-lib-pkgname-mismatch|file=opt/csw/lib/libWMaker.so.1.0.1|soname=libWMaker.so.1|pkgname=CSWwindowmaker|expected=CSWlibwmaker1 + include gar/category.mk post-configure-modulated: Modified: csw/mgar/pkg/windowmaker/trunk/checksums =================================================================== --- csw/mgar/pkg/windowmaker/trunk/checksums 2013-07-26 10:19:30 UTC (rev 21558) +++ csw/mgar/pkg/windowmaker/trunk/checksums 2013-07-26 12:10:08 UTC (rev 21559) @@ -1 +1 @@ -ae62bad9c4dee504066e0f172b565ff0 WindowMaker-0.95.2.tar.gz +640b8ea5b1a875440aa48eaab09c5f00 WindowMaker-0.95.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jul 26 14:18:16 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 26 Jul 2013 12:18:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21560] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 21560 http://gar.svn.sourceforge.net/gar/?rev=21560&view=rev Author: pfelecan Date: 2013-07-26 12:18:09 +0000 (Fri, 26 Jul 2013) Log Message: ----------- qt4-gcc/trunk: - version bump (upstream doesn't make available the 4.8.4) - new sub-package: qt4_private_dev Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/checksums Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-26 12:10:08 UTC (rev 21559) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-07-26 12:18:09 UTC (rev 21560) @@ -1,7 +1,7 @@ # $Id$ NAME = qt -VERSION = 4.8.4 +VERSION = 4.8.5 GARTYPE = v2 MAJOR = $(basename $(basename $(VERSION))) @@ -76,7 +76,7 @@ CONFIGURE_ARGS += -verbose CONFIGURE_ARGS += -lfontconfig CONFIGURE_ARGS += -I$(includedir)/freetype2 -#endof debin args +#endof debian args CONFIGURE_ARGS += -no-qt3support CONFIGURE_ARGS += -no-xshape CONFIGURE_ARGS += -v @@ -344,10 +344,29 @@ ARCHALL_CSWqt4-doc = 1 CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content +PACKAGES += CSWqt4-private-dev +CATALOGNAME_CSWqt4-private-dev = qt4_private_dev +SPKG_DESC_CSWqt4-private-dev = $(DESCRIPTION), private development +PKGFILES_CSWqt4-private-dev += $(includedir)/QtCore/private/.* +PKGFILES_CSWqt4-private-dev += $(includedir)/QtDeclarative/private/.* +PKGFILES_CSWqt4-private-dev += $(includedir)/QtGui/private/.* +PKGFILES_CSWqt4-private-dev += $(includedir)/QtScript/private/.* +ARCHALL_CSWqt4-private-dev = 1 + include gar/category.mk +PATH:=:/opt/csw/gnu:$(PATH) + # pre-reconfigure-modulated: # cd $(WORKSRC) && gmake confclean # @$(MAKECOOKIE) -PATH:=$(PATH):/opt/csw/gcc4/bin + +# Ship private headers - ugly hack to build Qt Creator QML Designer; +# adapted from Debian rules +post-install: + gtar --directory=$(WORKSRC)/include/QtCore --create --file=- private | gtar --directory=$(DESTDIR)/$(includedir)/QtCore --extract --file=- + gtar --directory=$(WORKSRC)/include/QtDeclarative --create --file=- private | gtar --directory=$(DESTDIR)/$(includedir)/QtDeclarative --extract --file=- + gtar --directory=$(WORKSRC)/include/QtGui --create --file=- private | gtar --directory=$(DESTDIR)/$(includedir)/QtGui --extract --file=- + gtar --directory=$(WORKSRC)/include/QtScript --create --file=- private | gtar --directory=$(DESTDIR)/$(includedir)/QtScript --extract --file=- + $(MAKECOOKIE) Modified: csw/mgar/pkg/qt4-gcc/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/checksums 2013-07-26 12:10:08 UTC (rev 21559) +++ csw/mgar/pkg/qt4-gcc/trunk/checksums 2013-07-26 12:18:09 UTC (rev 21560) @@ -1 +1 @@ -89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz +1864987bdbb2f58f8ae8b350dfdbe133 qt-everywhere-opensource-src-4.8.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jul 27 22:37:07 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 27 Jul 2013 20:37:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21561] csw/mgar/pkg/git/trunk Message-ID: Revision: 21561 http://gar.svn.sourceforge.net/gar/?rev=21561&view=rev Author: bdwalton Date: 2013-07-27 20:37:03 +0000 (Sat, 27 Jul 2013) Log Message: ----------- git/trunk: version bump to 1.8.3.4 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 2013-07-26 12:18:09 UTC (rev 21560) +++ csw/mgar/pkg/git/trunk/Makefile 2013-07-27 20:37:03 UTC (rev 21561) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.8.3.1 +VERSION = 1.8.3.4 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2013-07-26 12:18:09 UTC (rev 21560) +++ csw/mgar/pkg/git/trunk/checksums 2013-07-27 20:37:03 UTC (rev 21561) @@ -1 +1 @@ -35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz +80eec3201a5d012913d287b85adaee8e git-1.8.3.4.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 Jul 28 12:05:10 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Jul 2013 10:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21562] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 21562 http://gar.svn.sourceforge.net/gar/?rev=21562&view=rev Author: rthurner Date: 2013-07-28 10:05:07 +0000 (Sun, 28 Jul 2013) Log Message: ----------- libserf, upgrade to serf-1.3 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-07-27 20:37:03 UTC (rev 21561) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-07-28 10:05:07 UTC (rev 21562) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.2.1 +VERSION = 1.3.0 DISTNAME = serf-$(VERSION) GARTYPE = v2 @@ -20,9 +20,9 @@ # openssl-1.0 only available for sol-10 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGES += CSWlibserf1-2 -CATALOGNAME_CSWlibserf1-2 = libserf1_2 -SPKG_DESC_CSWlibserf1-2 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 +PACKAGES += CSWlibserf1-3 +CATALOGNAME_CSWlibserf1-3 = libserf1_3 +SPKG_DESC_CSWlibserf1-3 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWbdb48 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibaprutil1-0 @@ -37,7 +37,7 @@ CATALOGNAME_CSWlibserf-dev = libserf_dev SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-2 +RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-3 EXTRA_LIB = $(prefix)/bdb48/lib Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2013-07-27 20:37:03 UTC (rev 21561) +++ csw/mgar/pkg/libserf/trunk/checksums 2013-07-28 10:05:07 UTC (rev 21562) @@ -1 +1 @@ -4f8e76c9c6567aee1d66aba49f76a58b serf-1.2.1.tar.bz2 +bb0dbf9494495db7e8b34eac99b2dc3a serf-1.3.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 Sun Jul 28 12:07:40 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Jul 2013 10:07:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21563] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 21563 http://gar.svn.sourceforge.net/gar/?rev=21563&view=rev Author: wahwah Date: 2013-07-28 10:07:40 +0000 (Sun, 28 Jul 2013) Log Message: ----------- pycompile: support for 2.6, 2.7 and 3.3 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:05:07 UTC (rev 21562) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:07:40 UTC (rev 21563) @@ -2,74 +2,134 @@ # # i.pycompile - Class action script for compiling pyo and pyc files # -# $Id: i.pycompile 5069 2009-05-27 17:36:24Z valholla $ +# $Id$ # # Written by Mike Watters # # 2009-05-25 First Release # 2009-10-14 Update to only compile package specific files (Ben Walton) # 2010-10-12 Update to ensure creation of TMPDIR (Ben Walton) +# 2012-07-28 Rewrite to support Python 2.6, 2.7 and 3.3. (Maciej Blizinski) # +set -u +set -e + # Force Path for the script to use PATH=/usr/bin:/usr/sbin:/opt/csw/bin -PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +PY_PREFIX=${PKG_INSTALL_ROOT:-}/opt/csw PY_BINDIR=${PY_PREFIX}/bin -PY_LIBDIR=${PY_PREFIX}/lib/python -#DEBUG = 1 # Uncomment to enable debug -if [ "${DEBUG}" ]; then - echo PACKAGE: $PKGINST +# Uncomment to enable debugging. In the debug mode, the script will not +# compile the files, but will save the information about which files would be +# compiled with which interpreter. +# DEBUG=1 +if [ "${DEBUG:-}" ]; then + echo PACKAGE: $PKGINST fi +HAVE_26=0 # fd=3 +HAVE_27=0 # fd=4 +HAVE_33=0 # fd=5 TMPDIR=/var/opt/csw/cswclassutils -mkdir -p "$TMPDIR" -TMPPY=$TMPDIR/pycomp.$$.`date +%Y%m%d%H%M%S`.py +mkdir -p "${TMPDIR}" +FIFODIR=`/usr/bin/mktemp -p "${TMPDIR}" -d -t cswpycompile-XXXXXX` -cat > $TMPPY < /tmp/python2.6-pycompile-input ) & + else + ( < "${fifo26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ + | xargs ${PY_BINDIR}/python2.6 -m py_compile ) & + fi + # Open a file descriptor for writing + exec 3>"${fifo26}" +fi +if [ -x "${PY_BINDIR}/python2.7" ]; then + HAVE_27=1 + fifo27="${FIFODIR}/pycompile2.7" + mkfifo "${fifo27}" + # We make the command read from the file descriptor directly. + if [ ${DEBUG:-} ]; then + ( < "${fifo27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ + > /tmp/python2.7-pycompile-input ) & + else + (< "${fifo27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ + | xargs ${PY_BINDIR}/python2.7 -m py_compile ) & + fi + # Open a file descriptor for writing + exec 4>"${fifo27}" +fi + +if [ -x "${PY_BINDIR}/python3.3" ]; then + HAVE_33=1 + fifo33="${FIFODIR}/pycompile3.3" + mkfifo "${fifo33}" + # We make the command read from the file descriptor directly. + if [ ${DEBUG:-} ]; then + ( < "${fifo33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ + > /tmp/python3.3-pycompile-input ) & + else + ( < "${fifo33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ + | xargs ${PY_BINDIR}/python3.3 -m py_compile ) & + fi + # Open a file descriptor for writing + exec 5>"${fifo33}" +fi + echo "Installing class ..." while read src dest; do - if [ "$DEBUG" ]; then - echo SRC: $src DEST: $dest + /usr/bin/cp -p $src $dest || exit 2 + echo "$dest" + + # Piping the destination file name to all available file descriptors. The + # grep processes will take care of filtering. + if [ ${HAVE_26} -eq 1 ]; then + echo "${dest}" >&3 fi + if [ ${HAVE_27} -eq 1 ]; then + echo "${dest}" >&4 + fi + if [ ${HAVE_33} -eq 1 ]; then + echo "${dest}" >&5 + fi - /usr/bin/cp -p $src $dest || exit 2 - echo $dest - - echo " \"$dest\"," >> $TMPPY done -cat <> $TMPPY - ] +if [ ${HAVE_26} -eq 1 ]; then + # Close the file descriptor. It will terminate the command. + exec 3>&- + rm "${fifo26}" +fi -for f in pyfiles: - try: - py_compile.compile(f, doraise=True) - except py_compile.PyCompileError as e: - print 'Error compiling %s: %s' % (f, e) +if [ ${HAVE_27} -eq 1 ]; then + # Close the file descriptor. It will terminate the command. + exec 4>&- + rm "${fifo27}" +fi -EOF - -if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then - echo "Could not find or execute ${PY_BINDIR}/python" - echo "Check your Python installation." - exit 2 +if [ ${HAVE_33} -eq 1 ]; then + # Close the file descriptor. It will terminate the command. + exec 5>&- + rm "${fifo33}" fi -echo "Compiling py files to normal bytecode ..." -${PY_BINDIR}/python -Wi -t $TMPPY +rmdir "$FIFODIR" -echo "Compiling py files to optimized bytecode ..." -${PY_BINDIR}/python -Wi -t -O $TMPPY +if [ ${DEBUG:-} ]; then + echo 'Inspect the following files /tmp/pythonX.X-pycompile-input' +fi -rm $TMPPY - exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile ___________________________________________________________________ Added: svn:keywords + Id 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 Jul 28 12:11:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Jul 2013 10:11:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21564] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 21564 http://gar.svn.sourceforge.net/gar/?rev=21564&view=rev Author: wahwah Date: 2013-07-28 10:11:41 +0000 (Sun, 28 Jul 2013) Log Message: ----------- cswclassutils/trunk: Human Error. Human Error. When I wrote 2012 I meant 2013. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:07:40 UTC (rev 21563) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:11:41 UTC (rev 21564) @@ -9,7 +9,7 @@ # 2009-05-25 First Release # 2009-10-14 Update to only compile package specific files (Ben Walton) # 2010-10-12 Update to ensure creation of TMPDIR (Ben Walton) -# 2012-07-28 Rewrite to support Python 2.6, 2.7 and 3.3. (Maciej Blizinski) +# 2013-07-28 Rewrite to support Python 2.6, 2.7 and 3.3. (Maciej Blizinski) # set -u 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 Jul 28 12:28:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Jul 2013 10:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21565] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 21565 http://gar.svn.sourceforge.net/gar/?rev=21565&view=rev Author: wahwah Date: 2013-07-28 10:28:58 +0000 (Sun, 28 Jul 2013) Log Message: ----------- cswclassutils/trunk: We have to wait until the interprer is installed. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:11:41 UTC (rev 21564) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 10:28:58 UTC (rev 21565) @@ -21,9 +21,7 @@ PY_PREFIX=${PKG_INSTALL_ROOT:-}/opt/csw PY_BINDIR=${PY_PREFIX}/bin -# Uncomment to enable debugging. In the debug mode, the script will not -# compile the files, but will save the information about which files would be -# compiled with which interpreter. +# Uncomment to enable debugging. # DEBUG=1 if [ "${DEBUG:-}" ]; then echo PACKAGE: $PKGINST @@ -35,57 +33,30 @@ TMPDIR=/var/opt/csw/cswclassutils mkdir -p "${TMPDIR}" -FIFODIR=`/usr/bin/mktemp -p "${TMPDIR}" -d -t cswpycompile-XXXXXX` +PYCOMPILETMPDIR=`/usr/bin/mktemp -p "${TMPDIR}" -d -t cswpycompile-XXXXXX` # We're unconditionally opening all available Python interpreters. It's not # optimal for efficiency, but easier to script. if [ -x "${PY_BINDIR}/python2.6" ]; then HAVE_26=1 - fifo26="${FIFODIR}/pycompile2.6" - mkfifo "${fifo26}" - # We make the command read from the file descriptor directly. - if [ ${DEBUG:-} ]; then - ( < "${fifo26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ - > /tmp/python2.6-pycompile-input ) & - else - ( < "${fifo26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ - | xargs ${PY_BINDIR}/python2.6 -m py_compile ) & - fi - # Open a file descriptor for writing - exec 3>"${fifo26}" + filelist26="${PYCOMPILETMPDIR}/pycompile2.6" + # Open a file descriptor for writing. + exec 3>"${filelist26}" fi if [ -x "${PY_BINDIR}/python2.7" ]; then HAVE_27=1 - fifo27="${FIFODIR}/pycompile2.7" - mkfifo "${fifo27}" - # We make the command read from the file descriptor directly. - if [ ${DEBUG:-} ]; then - ( < "${fifo27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ - > /tmp/python2.7-pycompile-input ) & - else - (< "${fifo27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ - | xargs ${PY_BINDIR}/python2.7 -m py_compile ) & - fi - # Open a file descriptor for writing - exec 4>"${fifo27}" + filelist27="${PYCOMPILETMPDIR}/pycompile2.7" + # Open a file descriptor for writing. + exec 4>"${filelist27}" fi if [ -x "${PY_BINDIR}/python3.3" ]; then HAVE_33=1 - fifo33="${FIFODIR}/pycompile3.3" - mkfifo "${fifo33}" - # We make the command read from the file descriptor directly. - if [ ${DEBUG:-} ]; then - ( < "${fifo33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ - > /tmp/python3.3-pycompile-input ) & - else - ( < "${fifo33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ - | xargs ${PY_BINDIR}/python3.3 -m py_compile ) & - fi + filelist33="${PYCOMPILETMPDIR}/pycompile3.3" # Open a file descriptor for writing - exec 5>"${fifo33}" + exec 5>"${filelist33}" fi echo "Installing class ..." @@ -109,24 +80,33 @@ done if [ ${HAVE_26} -eq 1 ]; then - # Close the file descriptor. It will terminate the command. + # Close the file descriptor. exec 3>&- - rm "${fifo26}" + # Run the compilation. + < "${filelist26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ + | xargs ${PY_BINDIR}/python2.6 -m py_compile + rm "${filelist26}" fi if [ ${HAVE_27} -eq 1 ]; then - # Close the file descriptor. It will terminate the command. + # Close the file descriptor. exec 4>&- - rm "${fifo27}" + # Run the compilation. + < "${filelist27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ + | xargs ${PY_BINDIR}/python2.7 -m py_compile + rm "${filelist27}" fi if [ ${HAVE_33} -eq 1 ]; then - # Close the file descriptor. It will terminate the command. + # Close the file descriptor. exec 5>&- - rm "${fifo33}" + # Run the compilation. + < "${filelist33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ + | xargs ${PY_BINDIR}/python3.3 -m py_compile + rm "${filelist33}" fi -rmdir "$FIFODIR" +rmdir "$PYCOMPILETMPDIR" if [ ${DEBUG:-} ]; then echo 'Inspect the following files /tmp/pythonX.X-pycompile-input' 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 Jul 28 17:35:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Jul 2013 15:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21566] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 21566 http://gar.svn.sourceforge.net/gar/?rev=21566&view=rev Author: wahwah Date: 2013-07-28 15:35:53 +0000 (Sun, 28 Jul 2013) Log Message: ----------- lang-python/python/branches/python-3.3: Use cswcompile since it now supports Python 3.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-07-28 10:28:58 UTC (rev 21565) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-07-28 15:35:53 UTC (rev 21566) @@ -53,10 +53,18 @@ # Installation paths are defined in: # http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114 # http://wiki.debian.org/Python/MultiArch -GARFLAVOR = DBG -BUILD64 = 1 -ISAEXEC = 1 +# GARFLAVOR = DBG +# BUILD64 = 1 +# ISAEXEC = 1 +# 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 +PREPEND_LINKER_FLAGS += -L$(libdir)/ffi + BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt @@ -73,9 +81,10 @@ # 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 -# Do not use 2.6 pycompile for 3.3. -# PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +# cswpycompile can how handle Python 3 files. +PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' PACKAGES = CSWidle$(CVER) @@ -215,4 +224,3 @@ # EXTRA_LINKER_FLAGS += $(libdir)/ffi # LDFLAGS += -L$(libdir)/ffi -LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS) 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 Jul 28 19:30:45 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Jul 2013 17:30:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21567] csw/mgar/pkg/git/trunk Message-ID: Revision: 21567 http://gar.svn.sourceforge.net/gar/?rev=21567&view=rev Author: bdwalton Date: 2013-07-28 17:30:43 +0000 (Sun, 28 Jul 2013) Log Message: ----------- git/trunk: update the tr workaround patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-07-28 15:35:53 UTC (rev 21566) +++ csw/mgar/pkg/git/trunk/Makefile 2013-07-28 17:30:43 UTC (rev 21567) @@ -117,7 +117,7 @@ # 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 -PATCHFILES += 0007-t0008-ignores-Work-around-broken-solaris-tr.patch +PATCHFILES += 0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-07-28 17:30:43 UTC (rev 21567) @@ -0,0 +1,90 @@ +From b1ceadb4298a86763b059ac5c9136f4a7e9bb6f2 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 28 Jul 2013 14:09:19 +0200 +Subject: [PATCH] Avoid difference in tr semantics between System V and BSD + +Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V +semantics for tr whereby string1's length is truncated to the length +of string2 if string2 is shorter. The BSD semantics, as used by GNU tr +see string2 padded to the length of string1 using the final character +in string2. POSIX explicitly doesn't specify the correct behavior +here, making both equally valid. + +This difference means that Solaris' native tr implementations produce +different results for tr ":\t\n" "\0" than GNU tr. This breaks a few +tests in t0008-ignores.sh. + +Possible fixes for this are to make string2 be "\0\0\0" or "[\0*]". + +Instead, use perl to perform these transliterations which means we +don't need to worry about the difference at all. Since we're replacing +tr with perl, we also use perl to replace the sed invocations used to +transform the files. + +Replace four identical transforms with a function named +broken_c_unquote. Replace the other two identical transforms with a +fuction named broken_c_unquote_verbose. + +Signed-off-by: Ben Walton +--- + t/t0008-ignores.sh | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh +index 9c1bde1..e455eb4 100755 +--- a/t/t0008-ignores.sh ++++ b/t/t0008-ignores.sh +@@ -37,6 +37,14 @@ test_stderr () { + test_cmp "$HOME/expected-stderr" "$HOME/stderr" + } + ++broken_c_unquote () { ++ perl -pe 's/^"//; s/\\//; s/"$//; tr/\n/\0/' "$@" ++} ++ ++broken_c_unquote_verbose () { ++ perl -pe 's/ "/ /; s/\\//; s/"$//; tr/:\t\n/\0/' "$@" ++} ++ + stderr_contains () { + regexp="$1" + if grep "$regexp" "$HOME/stderr" +@@ -517,12 +525,11 @@ cat <<-EOF >expected-verbose + $global_excludes:2:!globaltwo b/globaltwo + EOF + +-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ +- tr "\n" "\0" >stdin0 +-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ +- tr "\n" "\0" >expected-default0 +-sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ +- tr ":\t\n" "\0" >expected-verbose0 ++broken_c_unquote stdin >stdin0 ++ ++broken_c_unquote expected-default >expected-default0 ++ ++broken_c_unquote_verbose expected-verbose >expected-verbose0 + + test_expect_success '--stdin' ' + expect_from_stdin expected-verbose + $global_excludes:2:!globaltwo ../b/globaltwo + EOF + +-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ +- tr "\n" "\0" >stdin0 +-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ +- tr "\n" "\0" >expected-default0 +-sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ +- tr ":\t\n" "\0" >expected-verbose0 ++broken_c_unquote stdin >stdin0 ++ ++broken_c_unquote expected-default >expected-default0 ++ ++broken_c_unquote_verbose expected-verbose >expected-verbose0 + + test_expect_success '--stdin from subdirectory' ' + expect_from_stdin -Date: Sun, 16 Jun 2013 00:53:50 +0200 -Subject: [PATCH] t0008-ignores: Work around broken solaris tr - -The tr provided by solaris (both /usr/bin/ and /usr/xpg4/bin) fails -to handle the \0 as the substitution. Replace tr with an -equivalent perl invocation. - -Signed-off-by: Ben Walton ---- - t/t0008-ignores.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh -index 9c1bde1..bd6817b 100755 ---- a/t/t0008-ignores.sh -+++ b/t/t0008-ignores.sh -@@ -522,7 +522,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ - sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ - tr "\n" "\0" >expected-default0 - sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ -- tr ":\t\n" "\0" >expected-verbose0 -+ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 - - test_expect_success '--stdin' ' - expect_from_stdin expected-default0 - sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ -- tr ":\t\n" "\0" >expected-verbose0 -+ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 - - test_expect_success '--stdin from subdirectory' ' - expect_from_stdin (bdwalton@users.sourceforge.net's message of "Sun, 28 Jul 2013 17:30:45 +0000") References: Message-ID: bdwalton at users.sourceforge.net writes: > - test_expect_success '--stdin' ' > - expect_from_stdin -@@ -611,7 +611,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ > - sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ > - tr "\n" "\0" >expected-default0 > - sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ > -- tr ":\t\n" "\0" >expected-verbose0 > -+ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 > - > - test_expect_success '--stdin from subdirectory' ' > - expect_from_stdin References: Message-ID: On Sun, Jul 28, 2013 at 7:22 PM, Peter FELECAN wrote: > bdwalton at users.sourceforge.net writes: > >> - test_expect_success '--stdin' ' >> - expect_from_stdin > -@@ -611,7 +611,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ >> - sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ >> - tr "\n" "\0" >expected-default0 >> - sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ >> -- tr ":\t\n" "\0" >expected-verbose0 >> -+ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 >> - >> - test_expect_success '--stdin from subdirectory' ' >> - expect_from_stdin > It wouldn't be simpler to say gtr instead of tr or even more, without a > patch, adding to the recipe: > > PATH:=:/opt/csw/gnu:$(PATH) > > after > > include gar/category.mk > > and adding a build dependency on CSWgnulinks and the package containing gtr? Yes, it would, and that's how I used to build the package. At some point I got into a discussion on the git list about how I avoided the solaris userland and decided to fix the issues in git (thus making it more portable) instead of ignoring them. At that point, I dropped /opt/csw/gnu from the path and let the build system find all of the clunky old junk instead. Every now and then I hit a small snag like this but for the most part things actually run. In large part, this is due to the project standards avoiding bashisms and non-POSIX conventions (GNUisms) unless they slip through by mistake. Thanks -Ben From wahwah at users.sourceforge.net Mon Jul 29 00:08:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Jul 2013 22:08:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21568] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 21568 http://gar.svn.sourceforge.net/gar/?rev=21568&view=rev Author: wahwah Date: 2013-07-28 22:08:07 +0000 (Sun, 28 Jul 2013) Log Message: ----------- cswclassutils/trunk: Also compile to optimized bytecode. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 17:30:43 UTC (rev 21567) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2013-07-28 22:08:07 UTC (rev 21568) @@ -83,8 +83,11 @@ # Close the file descriptor. exec 3>&- # Run the compilation. + echo "Compiling .py files to bytecode (2.6, if any)." < "${filelist26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ | xargs ${PY_BINDIR}/python2.6 -m py_compile + < "${filelist26}" /usr/bin/egrep '/opt/csw/lib/python(2\.6)?/' \ + | xargs ${PY_BINDIR}/python2.6 -O -m py_compile rm "${filelist26}" fi @@ -92,8 +95,11 @@ # Close the file descriptor. exec 4>&- # Run the compilation. + echo "Compiling .py files to bytecode (2.7, if any)." < "${filelist27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ | xargs ${PY_BINDIR}/python2.7 -m py_compile + < "${filelist27}" /usr/bin/egrep '/opt/csw/lib/python2\.7/' \ + | xargs ${PY_BINDIR}/python2.7 -O -m py_compile rm "${filelist27}" fi @@ -101,15 +107,14 @@ # Close the file descriptor. exec 5>&- # Run the compilation. + echo "Compiling .py files to bytecode (3.3, if any)." < "${filelist33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ | xargs ${PY_BINDIR}/python3.3 -m py_compile + < "${filelist33}" /usr/bin/egrep '/opt/csw/lib/python3\.3/' \ + | xargs ${PY_BINDIR}/python3.3 -O -m py_compile rm "${filelist33}" fi rmdir "$PYCOMPILETMPDIR" -if [ ${DEBUG:-} ]; then - echo 'Inspect the following files /tmp/pythonX.X-pycompile-input' -fi - exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jul 29 00:54:20 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 28 Jul 2013 22:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21569] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 21569 http://gar.svn.sourceforge.net/gar/?rev=21569&view=rev Author: rthurner Date: 2013-07-28 22:54:20 +0000 (Sun, 28 Jul 2013) Log Message: ----------- libserf, 1st try to convert to SCONS, still not building Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-07-28 22:08:07 UTC (rev 21568) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-07-28 22:54:20 UTC (rev 21569) @@ -17,6 +17,11 @@ LICENSE = LICENSE VENDOR_URL = http://code.google.com/p/serf/ +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = serf +INSTALL_SCRIPTS = serf +TEST_SCRIPTS = + # openssl-1.0 only available for sol-10 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -41,8 +46,23 @@ EXTRA_LIB = $(prefix)/bdb48/lib -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config -CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config +SCONS_FLAGS += PREFIX=$(prefix) +SCONS_FLAGS += APR=$(bindir)/apr-1-config +SCONS_FLAGS += APU=$(bindir)/apu-1-config include gar/category.mk + +build-serf: + (cd $(WORKSRC); \ + scons \ + $(SCONS_FLAGS)) + @$(MAKECOOKIE) + +install-serf: + (cd $(WORKSRC); \ + scons \ + $(SCONS_FLAGS) \ + -Q --prefix=$(DESTDIR)$(BUILD_PREFIX) \ + install) + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jul 29 14:24:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Jul 2013 12:24:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21570] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 21570 http://gar.svn.sourceforge.net/gar/?rev=21570&view=rev Author: dmichelsen Date: 2013-07-29 12:24:28 +0000 (Mon, 29 Jul 2013) Log Message: ----------- xmlstarlet/trunk: Update to 1.5.0 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 2013-07-28 22:54:20 UTC (rev 21569) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2013-07-29 12:24:28 UTC (rev 21570) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.4.2 +VERSION = 1.5.0 DESCRIPTION = XML transformation utility define BLURB Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2013-07-28 22:54:20 UTC (rev 21569) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2013-07-29 12:24:28 UTC (rev 21570) @@ -1 +1 @@ -ee8df42efd2417f74a1f5e3b7fe9e023 xmlstarlet-1.4.2.tar.gz +0c6db295d0cf9ff0d439edb755b7e8f6 xmlstarlet-1.5.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jul 29 17:00:33 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Jul 2013 15:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21571] csw/mgar/pkg/bind/trunk Message-ID: Revision: 21571 http://gar.svn.sourceforge.net/gar/?rev=21571&view=rev Author: bonivart Date: 2013-07-29 15:00:32 +0000 (Mon, 29 Jul 2013) Log Message: ----------- bind/trunk: update to 9.9.3-p2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2013-07-29 12:24:28 UTC (rev 21570) +++ csw/mgar/pkg/bind/trunk/Makefile 2013-07-29 15:00:32 UTC (rev 21571) @@ -6,7 +6,7 @@ GARTYPE = v2 # Enable these for Px-releases -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2013-07-29 12:24:28 UTC (rev 21570) +++ csw/mgar/pkg/bind/trunk/checksums 2013-07-29 15:00:32 UTC (rev 21571) @@ -1 +1 @@ -cf9cd9238d7bc15f1b4a5a5fff90f0d4 bind-9.9.3-P1.tar.gz +943f6de6bfdfd821aa444242c02c1322 bind-9.9.3-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jul 29 17:15:33 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 29 Jul 2013 15:15:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21572] csw/mgar/gar/v2 Message-ID: Revision: 21572 http://gar.svn.sourceforge.net/gar/?rev=21572&view=rev Author: pfelecan Date: 2013-07-29 15:15:33 +0000 (Mon, 29 Jul 2013) Log Message: ----------- ./buildys/v2: start to support building for multiple Python interpreters. Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2013-07-29 15:00:32 UTC (rev 21571) +++ csw/mgar/gar/v2/categories/python/category.mk 2013-07-29 15:15:33 UTC (rev 21572) @@ -1,5 +1,5 @@ # Add a dependency to CSWpython -_EXTRA_GAR_PKGS += CSWpython +_EXTRA_GAR_PKGS += $(PYTHON_PACKAGE) # For the record, do not include the following line: # _MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* @@ -28,11 +28,11 @@ LICENSE ?= PKG-INFO SPKG_SOURCEURL ?= http://pypi.python.org/pypi/$(NAME) MASTER_SITES ?= $(PYPI_MIRROR) -PACKAGES ?= CSWpy-$(DASHED_NAME) +PACKAGES ?= $(PYTHON_MODULE_PACKAGE_PREFIX)$(DASHED_NAME) # for use in any references by specific recipes so it can be replaced easily # across the tree. this could later be parameterized for use by multiple # versions of python too. -SITE_PACKAGES = $(libdir)/python2.6/site-packages +SITE_PACKAGES = $(PYTHON_SITE_PACKAGES) include gar/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-07-29 15:00:32 UTC (rev 21571) +++ csw/mgar/gar/v2/gar.conf.mk 2013-07-29 15:15:33 UTC (rev 21572) @@ -869,6 +869,31 @@ INSTALL_SCRIPTS ?= $(WORKSRC)/Makefile +# +# Python configuration + +PYTHON_VERSION ?= 2_6 + +PYTHON_EXECUTABLE_2_6 = /opt/csw/bin/python2.6 +PYTHON_EXECUTABLE_2_7 = /opt/csw/bin/python2.7 +PYTHON_EXECUTABLE_3_3 = /opt/csw/bin/python3.3 +PYTHON_EXECUTABLE = $(PYTHON_EXECUTABLE_$(PYTHON_VERSION)) + +PYTHON_PACKAGE_2_6 = CSWpython +PYTHON_PACKAGE_2_7 = CSWpython27 +PYTHON_PACKAGE_3_3 = CSWpython33 +PYTHON_PACKAGE = $(PYTHON_PACKAGE_$(PYTHON_VERSION)) + +PYTHON_SITE_PACKAGES_2_6 = $(libdir)/python2.6/site-packages +PYTHON_SITE_PACKAGES_2_7 = $(libdir)/python2.7/site-packages +PYTHON_SITE_PACKAGES_3_3 = $(libdir)/python3.3/site-packages +PYTHON_SITE_PACKAGES = $(PYTHON_SITE_PACKAGES_$(PYTHON_VERSION)) + +PYTHON_MODULE_PACKAGE_PREFIX_2_6 = CSWpy- +PYTHON_MODULE_PACKAGE_PREFIX_2_7 = CSWpy- +PYTHON_MODULE_PACKAGE_PREFIX_3_3 = CSWpy33- +PYTHON_MODULE_PACKAGE_PREFIX = $(PYTHON_MODULE_PACKAGE_PREFIX_$(PYTHON_VERSION)) + # Global environment export PATH PKG_CONFIG_PATH Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-07-29 15:00:32 UTC (rev 21571) +++ csw/mgar/gar/v2/gar.lib.mk 2013-07-29 15:15:33 UTC (rev 21572) @@ -910,7 +910,7 @@ PYBUILD_CMD ?= build build-%/setup.py: @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" - @( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) + @( cd $* ; $(BUILD_ENV) $(PYTHON_EXECUTABLE) ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) ) @$(MAKECOOKIE) #################### CLEAN RULES #################### @@ -988,6 +988,7 @@ test-%/setup.py: @echo " ==> Running setup.py test in $*" @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) $(PYTHON_EXECUTABLE) ./setup.py test $(TEST_ARGS) ) @$(MAKECOOKIE) ################# INSTALL RULES #################### @@ -1035,7 +1036,7 @@ PYINSTALL_CMD ?= install install-%/setup.py: @echo " ==> Running setup.py $(PYINSTALL_CMD) in $*" - @( cd $* ; $(INSTALL_ENV) python ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) + @( cd $* ; $(INSTALL_ENV) $(PYTHON_EXECUTABLE) ./setup.py $(PYINSTALL_CMD) $(INSTALL_ARGS) ) @$(MAKECOOKIE) # pkg-config scripts 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 Jul 29 19:04:10 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 17:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21573] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 21573 http://gar.svn.sourceforge.net/gar/?rev=21573&view=rev Author: wahwah Date: 2013-07-29 17:04:08 +0000 (Mon, 29 Jul 2013) Log Message: ----------- integrate-catalogs: Small style changes Aligning function arguments. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2013-07-29 15:15:33 UTC (rev 21572) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2013-07-29 17:04:08 UTC (rev 21573) @@ -145,8 +145,9 @@ return dict((x[field], x) for x in d) -def GetCatalogs(catrel_from, catrel_to, include_downgrades, - include_version_changes): +def GetCatalogs(catrel_from, catrel_to, + include_version_changes, + include_downgrades): rest_client = rest.RestClient() def GetCatalog(rest_client, r_catrel, r_arch, r_osrel): key = r_catrel, r_arch, r_osrel @@ -284,11 +285,13 @@ for x in jsonable_catalogs) else: catalogs = GetCatalogs( - catrel_from, catrel_to, options.include_downgrades, - options.include_version_changes) + catrel_from, catrel_to, + options.include_version_changes, + options.include_downgrades) diffs_by_catalogname = ComposeDiffsByCatalogname( - catalogs, catrel_from, catrel_to, include_version_changes, - include_downgrades) + catalogs, catrel_from, catrel_to, + options.include_version_changes, + options.include_downgrades) bundles_by_md5 = {} bundles_missing = set() cp = rest.CachedPkgstats("pkgstats") 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 Jul 29 23:35:00 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 21:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21574] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 21574 http://gar.svn.sourceforge.net/gar/?rev=21574&view=rev Author: wahwah Date: 2013-07-29 21:34:58 +0000 (Mon, 29 Jul 2013) Log Message: ----------- checkpkg: Small comment cleanup 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 2013-07-29 17:04:08 UTC (rev 21573) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-07-29 21:34:58 UTC (rev 21574) @@ -4,16 +4,17 @@ # - individual package checks # - set checks # -# Individual checks need to be named "Check", while set checks are named -# "SetCheck". +# 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. +# 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 @@ -32,7 +33,7 @@ import logging PATHS_ALLOWED_ONLY_IN = { - # Leading slash must be removed. + # The leading slash must be removed. # Using strings where possible for performance. "CSWcommon": {"string": [ r"opt", 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 Jul 29 23:35:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 21:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21575] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21575 http://gar.svn.sourceforge.net/gar/?rev=21575&view=rev Author: wahwah Date: 2013-07-29 21:35:14 +0000 (Mon, 29 Jul 2013) Log Message: ----------- checkpkg: protecting us from breaking Python 2.6 If we build a CSWpy- package, it must contain files that are reachable by our Python 2.6 interpreter. 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 2013-07-29 21:34:58 UTC (rev 21574) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-07-29 21:35:14 UTC (rev 21575) @@ -814,9 +814,9 @@ '%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.*/.*") +def CheckPython2PackageName(pkg_data, error_mgr, logger, messenger): + """Packages providing Python modules are named CSWpy-* and py_*.""" + pyfile_re = re.compile(r"/opt/csw/lib/python(2\.6|2\.7)?/.*") pkgname = pkg_data["basic_stats"]["pkgname"] has_py_files = False example_py_file = "" @@ -829,11 +829,13 @@ 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_"): + 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)) + catalogname = pkg_data["basic_stats"]["catalogname"] + if has_py_files and not 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. " @@ -841,6 +843,30 @@ % repr(example_py_file)) +def CheckPackageDoesNotBreakPython26(pkg_data, error_mgr, logger, messenger): + """Packages named CSWpy- must provide files for Python 2.6.""" + py26_file_re = re.compile(r"/opt/csw/lib/python(2\.6)?/.*") + pkgname = pkg_data["basic_stats"]["pkgname"] + has_py_prefix = pkgname.startswith("CSWpy-") + if not has_py_prefix: + # It's not a Python 2.x module. Nothing to see here. + return + spotted_a_py26_file = False + example_py_file = "" + for pkgmap_entry in pkg_data["pkgmap"]: + if not pkgmap_entry["path"]: + continue + if py26_file_re.match(pkgmap_entry["path"]): + spotted_a_py26_file = True + example_py_file = pkgmap_entry["path"] + break + if not spotted_a_py26_file: + error_mgr.ReportError("python-package-missing-py26-files") + messenger.Message( + "The package has the CSWpy- prefix but " + "does not contain any files for Python 2.6. ") + + def CheckArchitecture(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] for metadata in pkg_data["files_metadata"]: Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-07-29 21:34:58 UTC (rev 21574) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-07-29 21:35:14 UTC (rev 21575) @@ -861,30 +861,25 @@ self.pkg_data["pkginfo"]["VENDOR"] = "https://www.example.com/" -class TestCheckPythonPackageName(CheckTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckPythonPackageName" +class TestCheckPackageDoesNotBreakPython26(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckPackageDoesNotBreakPython26" def testBad(self): self.pkg_data["pkgmap"].append({ - "class": "none", - "group": "bin", - "line": "", - "mode": '0755', - "path": "/opt/csw/lib/python/site-packages/hachoir_parser/video/mov.py", - "type": "f", - "user": "root" + "class": "none", "group": "bin", "line": "", "mode": '0755', + "type": "f", "user": "root", + "path": "/opt/csw/lib/python2.7/site-packages/" + "hachoir_parser/video/mov.py", + # No file in /opt/csw/lib/python/site-packages }) - self.error_mgr_mock.ReportError('pkgname-does-not-start-with-CSWpy-') - self.error_mgr_mock.ReportError('catalogname-does-not-start-with-py_') + self.pkg_data["basic_stats"]["catalogname"] = "py_foo" + self.pkg_data["basic_stats"]["pkgname"] = "CSWpy-foo" + self.error_mgr_mock.ReportError('python-package-missing-py26-files') def testGood(self): self.pkg_data["pkgmap"].append({ - "class": "none", - "group": "bin", - "line": "", - "mode": '0755', + "class": "none", "group": "bin", "line": "", "mode": '0755', + "type": "f", "user": "root", "path": "/opt/csw/lib/python/site-packages/hachoir_parser/video/mov.py", - "type": "f", - "user": "root" }) self.pkg_data["basic_stats"]["catalogname"] = "py_foo" self.pkg_data["basic_stats"]["pkgname"] = "CSWpy-foo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Jul 29 23:38:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 29 Jul 2013 21:38:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21576] csw/mgar/pkg/apcupsd/trunk/Makefile Message-ID: Revision: 21576 http://gar.svn.sourceforge.net/gar/?rev=21576&view=rev Author: lblume Date: 2013-07-29 21:38:52 +0000 (Mon, 29 Jul 2013) Log Message: ----------- apcupsd/trunk: Specify a shell rather than let configure pick the first in the PATH Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2013-07-29 21:35:14 UTC (rev 21575) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2013-07-29 21:38:52 UTC (rev 21576) @@ -94,6 +94,11 @@ #CONFIGURE_ARGS += --with-css-dir=$(sharedstatedir)/www/apcupsd/html CONFIGURE_ARGS += --enable-gapcmon +# This is needed to avoid picking up /opt/csw/bin/sh which creates an implicit +# and unneeded dependency on schilyutils (and without it, the apccontrol script +# does not work) +CONFIGURE_ARGS += SCRIPTSHELL=/bin/ksh + TEST_SCRIPTS = EXTRA_PAX_ARGS += -s ',.*/apcupsd\.css$$,.$(sharedstatedir)/www/apcupsd/html/apcupsd.css,' 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 Jul 30 00:32:16 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 22:32:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21577] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21577 http://gar.svn.sourceforge.net/gar/?rev=21577&view=rev Author: wahwah Date: 2013-07-29 22:32:16 +0000 (Mon, 29 Jul 2013) Log Message: ----------- checkpkg: Require a specific Python version A package containing files for a specific Python version must depend on that version. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/dependency_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-07-29 21:38:52 UTC (rev 21576) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-07-29 22:32:16 UTC (rev 21577) @@ -31,7 +31,12 @@ DEPENDENCY_FILENAME_REGEXES = ( (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), - (r".*\.py$", (u"CSWpython",)), + (r"/?opt/csw/lib/python(2\.6)?/site-packages/.+\.py$", + (u"CSWpython",)), + (r"/?opt/csw/lib/python2\.7/site-packages/.+\.py$", + (u"CSWpython27",)), + (r"/?opt/csw/lib/python3\.3/site-packages/.+\.py$", + (u"CSWpython33",)), (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")), (r".*\.elc?$", (u"CSWemacs-common",)), (r"/opt/csw/apache2/", (u"CSWapache2",)), Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-07-29 21:38:52 UTC (rev 21576) +++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-07-29 22:32:16 UTC (rev 21577) @@ -217,7 +217,7 @@ pass def testByFilename(self): - self.pkg_data = tree_stats[0] + self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"] = [ {'class': 'none', 'line': 'not important', @@ -237,6 +237,42 @@ None, None) self.mox.VerifyAll() + def testByFilenamePython(self): + self.pkg_data = copy.deepcopy(tree_stats[0]) + self.pkg_data["pkgmap"] = [ + {'class': 'none', 'line': 'not important', 'mode': '0755', + 'path': '/opt/csw/lib/python/site-packages/foo.py', + 'type': 'f', 'group': 'bin', 'user': 'root'}] + self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython', + "found file(s) matching /?opt/csw/lib/python(2\\.6)?/site-packages/.+\\.py$, " + "e.g. '/opt/csw/lib/python/site-packages/foo.py'") + self.mox.ReplayAll() + result = dependency_checks.ByFilename( + self.pkg_data, + self.error_mgr_mock, + self.logger_stub, + self.messenger_stub, + None, None) + self.mox.VerifyAll() + + def testByFilenamePython27(self): + self.pkg_data = copy.deepcopy(tree_stats[0]) + self.pkg_data["pkgmap"] = [ + {'class': 'none', 'line': 'not important', 'mode': '0755', + 'path': '/opt/csw/lib/python2.7/site-packages/foo.py', + 'type': 'f', 'group': 'bin', 'user': 'root'}] + self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython27', + "found file(s) matching /?opt/csw/lib/python2\\.7/site-packages/.+\\.py$, " + "e.g. '/opt/csw/lib/python2.7/site-packages/foo.py'") + self.mox.ReplayAll() + result = dependency_checks.ByFilename( + self.pkg_data, + self.error_mgr_mock, + self.logger_stub, + self.messenger_stub, + None, None) + self.mox.VerifyAll() + def testLibraries_1(self): self.pkg_data = copy.deepcopy(tree_stats[0]) path_and_pkg_by_basename = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jul 30 01:32:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 23:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21578] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21578 http://gar.svn.sourceforge.net/gar/?rev=21578&view=rev Author: wahwah Date: 2013-07-29 23:32:12 +0000 (Mon, 29 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: Build on Solaris 9 too Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-29 22:32:16 UTC (rev 21577) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-29 23:32:12 UTC (rev 21578) @@ -33,6 +33,9 @@ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ UFILES_REGEX = $(VER)\.\d+ +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += pyport.h @@ -134,12 +137,16 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWlibtcl8-4 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWtk +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += $(RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_$(GAROSREL)) + # Don't merge test files. EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* @@ -177,11 +184,13 @@ SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused LICENSE = LICENSE 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 Jul 30 01:33:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Jul 2013 23:33:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21579] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 21579 http://gar.svn.sourceforge.net/gar/?rev=21579&view=rev Author: wahwah Date: 2013-07-29 23:33:37 +0000 (Mon, 29 Jul 2013) Log Message: ----------- lang-python/python/trunk: Build for Solaris 9 too Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-29 23:32:12 UTC (rev 21578) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-29 23:33:37 UTC (rev 21579) @@ -33,6 +33,9 @@ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ UFILES_REGEX = $(VER)\.\d+ +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += pyport.h @@ -106,12 +109,12 @@ CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 # With the versioned directory: -CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_tkinter.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/test/test_subprocess.py -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/test/test_posixpath.py -CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python$(VER)/test/test_subprocess.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python$(VER)/test/test_posixpath.py +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_hashlib.so|but|never|used NOISALIST = 1 @@ -173,22 +176,27 @@ 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)-tk += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) + +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWlibtcl8-4 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWtk +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += $(RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_$(GAROSREL)) + # Don't merge test files. -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test/.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/bsddb/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/ctypes/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/email/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/distutils/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/json/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/lib2to3/tests.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/sqlite3/test.* -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/unittest/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.* BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWggettext-dev @@ -198,9 +206,9 @@ BUILD_DEP_PKGS += CSWlibgcrypt-dev # Allow to choose the default Python version. -# Python 2.6 is the default one as of 2013-07-21. -ALTERNATIVES_CSWpython$(CVER) = python-2.6 -ALTERNATIVE_python-2.6 = $(bindir)/python python-symlink $(bindir)/python2.6 2600 +# Python $(VER) is the default one as of 2013-07-21. +ALTERNATIVES_CSWpython$(CVER) = python-$(VER) +ALTERNATIVE_python-$(VER) = $(bindir)/python python-symlink $(bindir)/python$(VER) 2600 EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python # This could be handled by automatic dependency detection @@ -228,15 +236,20 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ -GARCOMPILER = SOS12U3 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython +include gar/category.mk -include gar/category.mk +# For some reason these definitions must be below the include. +GARCOMPILER_5.9 = SOS12 +GARCOMPILER_5.10 = SOS12U3 +GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) + EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) - post-configure-modulated: for f in Modules/Setup \ Makefile \ @@ -253,8 +266,8 @@ post-merge-modulated: # Some checks # Prevent things like https://www.opencsw.org/mantis/view.php?id=5040 - test ! -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket_failed.so - test -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket.so + test ! -f $(PKGROOT)/opt/csw/lib/python$(VER)/lib-dynload/_socket_failed.so + test -f $(PKGROOT)/opt/csw/lib/python$(VER)/lib-dynload/_socket.so # This is post-merge-modulated, which should not work. But it does. ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jul 30 09:43:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Jul 2013 07:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21580] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21580 http://gar.svn.sourceforge.net/gar/?rev=21580&view=rev Author: wahwah Date: 2013-07-30 07:43:51 +0000 (Tue, 30 Jul 2013) Log Message: ----------- checkpkg: dynload files are dependent on Python Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/dependency_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-07-29 23:33:37 UTC (rev 21579) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-07-30 07:43:51 UTC (rev 21580) @@ -31,11 +31,11 @@ DEPENDENCY_FILENAME_REGEXES = ( (r".*\.pl$", (u"CSWperl",)), (r".*\.pm$", (u"CSWperl",)), - (r"/?opt/csw/lib/python(2\.6)?/site-packages/.+\.py$", + (r"/?opt/csw/lib/python(2\.6)?/(site-packages|lib-dynload)/.+\.py$", (u"CSWpython",)), - (r"/?opt/csw/lib/python2\.7/site-packages/.+\.py$", + (r"/?opt/csw/lib/python2\.7/(site-packages|lib-dynload)/.+\.py$", (u"CSWpython27",)), - (r"/?opt/csw/lib/python3\.3/site-packages/.+\.py$", + (r"/?opt/csw/lib/python3\.3/(site-packages|lib-dynload)/.+\.py$", (u"CSWpython33",)), (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")), (r".*\.elc?$", (u"CSWemacs-common",)), Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-07-29 23:33:37 UTC (rev 21579) +++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2013-07-30 07:43:51 UTC (rev 21580) @@ -244,8 +244,9 @@ 'path': '/opt/csw/lib/python/site-packages/foo.py', 'type': 'f', 'group': 'bin', 'user': 'root'}] self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython', - "found file(s) matching /?opt/csw/lib/python(2\\.6)?/site-packages/.+\\.py$, " - "e.g. '/opt/csw/lib/python/site-packages/foo.py'") + "found file(s) matching " + "/?opt/csw/lib/python(2\\.6)?/(site-packages|lib-dynload)/.+" + "\\.py$, e.g. '/opt/csw/lib/python/site-packages/foo.py'") self.mox.ReplayAll() result = dependency_checks.ByFilename( self.pkg_data, @@ -262,8 +263,9 @@ 'path': '/opt/csw/lib/python2.7/site-packages/foo.py', 'type': 'f', 'group': 'bin', 'user': 'root'}] self.error_mgr_mock.NeedPackage('CSWtree', u'CSWpython27', - "found file(s) matching /?opt/csw/lib/python2\\.7/site-packages/.+\\.py$, " - "e.g. '/opt/csw/lib/python2.7/site-packages/foo.py'") + "found file(s) matching " + "/?opt/csw/lib/python2\\.7/(site-packages|lib-dynload)/.+" + "\\.py$, e.g. '/opt/csw/lib/python2.7/site-packages/foo.py'") self.mox.ReplayAll() result = dependency_checks.ByFilename( self.pkg_data, 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 Jul 30 09:44:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Jul 2013 07:44:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21581] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 21581 http://gar.svn.sourceforge.net/gar/?rev=21581&view=rev Author: wahwah Date: 2013-07-30 07:44:33 +0000 (Tue, 30 Jul 2013) Log Message: ----------- lang-python/python/trunk: the tk module and idle should depend on Python Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-30 07:43:51 UTC (rev 21580) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-07-30 07:44:33 UTC (rev 21581) @@ -238,6 +238,8 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython 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 Jul 30 10:22:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Jul 2013 08:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21582] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21582 http://gar.svn.sourceforge.net/gar/?rev=21582&view=rev Author: wahwah Date: 2013-07-30 08:22:58 +0000 (Tue, 30 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: idle and tk depend on the main package. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 07:44:33 UTC (rev 21581) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 08:22:58 UTC (rev 21582) @@ -210,6 +210,9 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython + CHECKPKG_OVERRIDES_CSWpython$(CVER) += file-with-bad-content # To avoid file collisions with CSWpython: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Tue Jul 30 10:26:17 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Tue, 30 Jul 2013 10:26:17 +0200 Subject: [csw-devel] SF.net SVN: gar:[21582] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile In-Reply-To: (wahwah@users.sourceforge.net's message of "Tue, 30 Jul 2013 08:22:59 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > Revision: 21582 > http://gar.svn.sourceforge.net/gar/?rev=21582&view=rev > Author: wahwah > Date: 2013-07-30 08:22:58 +0000 (Tue, 30 Jul 2013) > Log Message: > ----------- > lang-python/python/branches/python-2.7: idle and tk depend on the main package. > > Modified Paths: > -------------- > csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile > > Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 07:44:33 UTC (rev 21581) > +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 08:22:58 UTC (rev 21582) > @@ -210,6 +210,9 @@ > CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so > CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm > > +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython > +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython Are you sure that these shouldn't be CSWpython27? -- Peter From lblume at users.sourceforge.net Tue Jul 30 12:23:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 30 Jul 2013 10:23:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21583] csw/mgar/pkg/cpan/GD/trunk Message-ID: Revision: 21583 http://gar.svn.sourceforge.net/gar/?rev=21583&view=rev Author: lblume Date: 2013-07-30 10:22:56 +0000 (Tue, 30 Jul 2013) Log Message: ----------- cpan/GD/trunk: Bump to 2.50; dependency cleanup; add workaround for known bug with gd 2.1.0 Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile csw/mgar/pkg/cpan/GD/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/GD/trunk/files/t/ csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.2.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.3.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.4.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.5.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.6.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.7.png csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.9.png Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2013-07-30 08:22:58 UTC (rev 21582) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2013-07-30 10:22:56 UTC (rev 21583) @@ -1,5 +1,5 @@ NAME = GD -VERSION = 2.45 +VERSION = 2.50 CATEGORIES = cpan GARTYPE = v2 AUTHOR = LDS @@ -16,19 +16,13 @@ # https://rt.cpan.org/Ticket/Display.html?id=49053 PATCHFILES = diff-GD.t -LICENSE = LICENSE +# The LICENSE file is missing in v2.50 +LICENSE = README PACKAGES += CSWpm-gd SPKG_DESC_CSWpm-gd = Interface to GD graphics library # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibgd2 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWxpm -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibgd3 OBSOLETED_BY_CSWpm-gd += CSWpmgd CATALOGNAME_CSWpmgd = pm_gd_stub @@ -53,3 +47,8 @@ BUILD_OVERRIDE_VAR_CCFLAGS = include gar/category.mk + +# Needed to avoid https://rt.cpan.org/Public/Bug/Display.html?id=85789 +pre-test-modulated: + @cp files/t/test.out.* ${WORKSRC}/t/ + @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/GD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/checksums 2013-07-30 08:22:58 UTC (rev 21582) +++ csw/mgar/pkg/cpan/GD/trunk/checksums 2013-07-30 10:22:56 UTC (rev 21583) @@ -1 +1 @@ -430b15e74eb6287519c403c4772dc1e3 GD-2.45.tar.gz +b2f1e47dfc1c4e4fdda3277f165d36e5 GD-2.50.tar.gz Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.2.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.3.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.4.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.4.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.5.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.5.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.6.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.6.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.7.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.7.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.9.png =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cpan/GD/trunk/files/t/test.out.9.png ___________________________________________________________________ Added: svn:mime-type + image/png 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 Jul 30 12:56:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Jul 2013 10:56:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21584] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 21584 http://gar.svn.sourceforge.net/gar/?rev=21584&view=rev Author: wahwah Date: 2013-07-30 10:56:07 +0000 (Tue, 30 Jul 2013) Log Message: ----------- lang-python/python/branches/python-2.7: Add a note about the failing test Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 10:22:56 UTC (rev 21583) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-30 10:56:07 UTC (rev 21584) @@ -15,6 +15,7 @@ # - http://forums.sun.com/thread.jspa?threadID=5148204 # - http://bugs.python.org/issue4902 # - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S +# - test_threading locks up on Solaris 9: http://bugs.python.org/issue6643 SPKG_SOURCEURL = http://python.org/download/releases/$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Jul 30 14:11:24 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 30 Jul 2013 12:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[21585] csw/mgar/pkg/webalizer/trunk/Makefile Message-ID: Revision: 21585 http://gar.svn.sourceforge.net/gar/?rev=21585&view=rev Author: lblume Date: 2013-07-30 12:11:20 +0000 (Tue, 30 Jul 2013) Log Message: ----------- webalizer/trunk: Dependency cleanup Modified Paths: -------------- csw/mgar/pkg/webalizer/trunk/Makefile Modified: csw/mgar/pkg/webalizer/trunk/Makefile =================================================================== --- csw/mgar/pkg/webalizer/trunk/Makefile 2013-07-30 10:56:07 UTC (rev 21584) +++ csw/mgar/pkg/webalizer/trunk/Makefile 2013-07-30 12:11:20 UTC (rev 21585) @@ -31,12 +31,12 @@ PACKAGES += CSWwebalizer SPKG_DESC_CSWwebalizer = A flexible web server log file analysis program # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibgd2 -RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibgd3 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibz1 RUNTIME_DEP_PKGS_CSWwebalizer += CSWbdb48 RUNTIME_DEP_PKGS_CSWwebalizer += CSWgeoip RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibgeoip1 # Fix config file later CHECKPKG_OVERRIDES_CSWwebalizer += file-with-bad-content|/usr/share|root/etc/opt/csw/webalizer.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jul 30 17:35:42 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 30 Jul 2013 15:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21586] csw/mgar/pkg/gstreamer/trunk/Makefile Message-ID: Revision: 21586 http://gar.svn.sourceforge.net/gar/?rev=21586&view=rev Author: pfelecan Date: 2013-07-30 15:35:41 +0000 (Tue, 30 Jul 2013) Log Message: ----------- gstreamer/trunk/Makefile: changed flex path to adapt to its new packaging. Modified Paths: -------------- csw/mgar/pkg/gstreamer/trunk/Makefile Modified: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile 2013-07-30 12:11:20 UTC (rev 21585) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2013-07-30 15:35:41 UTC (rev 21586) @@ -143,8 +143,7 @@ include gar/category.mk +PATH:=:/opt/csw/gnu:$(PATH) + # remove -L/opt/csw/lib LDFLAGS = $(strip $($(GARCOMPILER)_LD_FLAGS)) - -# select the right flex parser aka CSWflex-new -CONFIGURE_ENV += FLEX_PATH=/opt/csw/bin/flex-2.5.35 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Jul 30 23:25:42 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 30 Jul 2013 22:25:42 +0100 Subject: [csw-devel] SF.net SVN: gar:[21582] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile In-Reply-To: References: Message-ID: 2013/7/30 Peter FELECAN : >> +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython >> +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython > > Are you sure that these shouldn't be CSWpython27? You're right. Thanks for spotting. From wahwah at users.sourceforge.net Wed Jul 31 00:38:04 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Jul 2013 22:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21587] csw/mgar/pkg Message-ID: Revision: 21587 http://gar.svn.sourceforge.net/gar/?rev=21587&view=rev Author: wahwah Date: 2013-07-30 22:38:03 +0000 (Tue, 30 Jul 2013) Log Message: ----------- dmenu/trunk: it builds. Added Paths: ----------- csw/mgar/pkg/dmenu/ csw/mgar/pkg/dmenu/Makefile csw/mgar/pkg/dmenu/branches/ csw/mgar/pkg/dmenu/tags/ csw/mgar/pkg/dmenu/trunk/ csw/mgar/pkg/dmenu/trunk/Makefile csw/mgar/pkg/dmenu/trunk/checksums csw/mgar/pkg/dmenu/trunk/files/ csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch Added: csw/mgar/pkg/dmenu/Makefile =================================================================== --- csw/mgar/pkg/dmenu/Makefile (rev 0) +++ csw/mgar/pkg/dmenu/Makefile 2013-07-30 22:38:03 UTC (rev 21587) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/dmenu/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/dmenu/trunk/Makefile =================================================================== --- csw/mgar/pkg/dmenu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dmenu/trunk/Makefile 2013-07-30 22:38:03 UTC (rev 21587) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = dmenu +VERSION = 4.5 +GARTYPE = v2 + +DESCRIPTION = Dynamic menu for X, originally designed for dwm + +MASTER_SITES = http://dl.suckless.org/tools/ +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://tools.suckless.org/dmenu/ + +PATCHFILES += 0001-Assorted-changes-to-make-it-compile.patch + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = dmenu +INSTALL_SCRIPTS = dmenu +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) + +GARCOMPILER = GNU + +include gar/category.mk + + +build-dmenu: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) gmake + $(MAKECOOKIE) + +install-dmenu: + cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) gmake install + $(MAKECOOKIE) + Property changes on: csw/mgar/pkg/dmenu/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dmenu/trunk/checksums =================================================================== --- csw/mgar/pkg/dmenu/trunk/checksums (rev 0) +++ csw/mgar/pkg/dmenu/trunk/checksums 2013-07-30 22:38:03 UTC (rev 21587) @@ -0,0 +1 @@ +9c46169ed703732ec52ed946c27d84b4 dmenu-4.5.tar.gz Added: csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch =================================================================== --- csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch (rev 0) +++ csw/mgar/pkg/dmenu/trunk/files/0001-Assorted-changes-to-make-it-compile.patch 2013-07-30 22:38:03 UTC (rev 21587) @@ -0,0 +1,87 @@ +From 60a35b1739bbb86e149aca4ed523db6fcc4c00b9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 31 Jul 2013 00:36:24 +0200 +Subject: [PATCH] Assorted changes to make it compile + +--- + Makefile | 9 +++------ + config.mk | 13 +++++++------ + dmenu.c | 2 ++ + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index c127f6a..a8ab397 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,18 +15,15 @@ options: + @echo "CC = ${CC}" + + .c.o: +- @echo CC -c $< +- @${CC} -c $< ${CFLAGS} ++ ${CC} -c $< ${CFLAGS} + + ${OBJ}: config.mk draw.h + + dmenu: dmenu.o draw.o +- @echo CC -o $@ +- @${CC} -o $@ dmenu.o draw.o ${LDFLAGS} ++ ${CC} -o $@ dmenu.o draw.o ${LDFLAGS} + + stest: stest.o +- @echo CC -o $@ +- @${CC} -o $@ stest.o ${LDFLAGS} ++ ${CC} -o $@ stest.o ${LDFLAGS} + + clean: + @echo cleaning +diff --git a/config.mk b/config.mk +index 92a5e63..3161d1c 100644 +--- a/config.mk ++++ b/config.mk +@@ -2,11 +2,11 @@ + VERSION = 4.5 + + # paths +-PREFIX = /usr/local ++PREFIX = /opt/csw + MANPREFIX = ${PREFIX}/share/man + +-X11INC = /usr/X11R6/include +-X11LIB = /usr/X11R6/lib ++X11INC = /usr/openwin/share/include ++X11LIB = /usr/openwin/lib + + # Xinerama, comment if you don't want it + XINERAMALIBS = -lXinerama +@@ -17,10 +17,11 @@ INCS = -I${X11INC} + LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} + + # flags +-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++# CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} + #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ++CFLAGS = -pedantic -Wall -Os ${INCS} ${CPPFLAGS} + LDFLAGS = -s ${LIBS} + + # compiler and linker +-CC = cc ++CC = gcc +diff --git a/dmenu.c b/dmenu.c +index 4ea95f8..cac3c58 100644 +--- a/dmenu.c ++++ b/dmenu.c +@@ -12,6 +12,8 @@ + #include + #endif + #include "draw.h" ++#include ++#include + + #define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ + * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jul 31 10:14:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 31 Jul 2013 08:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21588] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 21588 http://gar.svn.sourceforge.net/gar/?rev=21588&view=rev Author: pfelecan Date: 2013-07-31 08:14:36 +0000 (Wed, 31 Jul 2013) Log Message: ----------- guile/trunk/Makefile: - addition of a run-time dependency https://www.opencsw.org/mantis/view.php?id=5097 - removed kludge for time stamps which was required until mgar merge was corrected Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-07-30 22:38:03 UTC (rev 21587) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-07-31 08:14:36 UTC (rev 21588) @@ -111,6 +111,7 @@ RUNTIME_DEP_PKGS_CSWguile-dev += CSWguile RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguilereadline-v18-18 RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguile2-0-22 +RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibgmp-dev ARCHALL_CSWguile-dev = 1 CHECKPKG_OVERRIDES_CSWguile-dev += archall-devel-package @@ -143,11 +144,4 @@ cd $(DESTDIR)$(libdir) && ln -s libguile.so.12.3.0 libguile.so.12 ginstall $(WORKDIR)/libguile-ltdl.so.1.0.0 $(DESTDIR)$(libdir) cd $(DESTDIR)$(libdir) && ln -s libguile-ltdl.so.1.0.0 libguile-ltdl.so.1 - # the compiled and cached files must be newer than the sources, - # avoiding messages such as ";;; note: source file - # /opt/csw/share/guile/2.0/ice-9/eval.scm ;;; newer than compiled - # /opt/csw/lib/guile/2.0/ccache/ice-9/eval.go" interfering with - # configure usage of guile-config output, e.g., in autogen - sleep 1 - find $(DESTDIR)$(libdir) -type f -name '*.go' -exec touch {} \; $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jul 31 12:20:54 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 31 Jul 2013 10:20:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21589] csw/mgar/pkg/guile/trunk Message-ID: Revision: 21589 http://gar.svn.sourceforge.net/gar/?rev=21589&view=rev Author: pfelecan Date: 2013-07-31 10:20:52 +0000 (Wed, 31 Jul 2013) Log Message: ----------- guile/trunk/Makefile: move up prototypes to solve https://www.opencsw.org/mantis/view.php?id=5073 Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/guile/trunk/files/0001-move-up-prototypes.patch Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-07-31 08:14:36 UTC (rev 21588) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-07-31 10:20:52 UTC (rev 21589) @@ -15,6 +15,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.xz PREVLIBSAR = guilelib12-$(GARCH)-libs-1.6.7.tar.gz DISTFILES += $(PREVLIBSAR) +PATCHFILES += 0001-move-up-prototypes.patch GARCOMPILER = GNU Added: csw/mgar/pkg/guile/trunk/files/0001-move-up-prototypes.patch =================================================================== --- csw/mgar/pkg/guile/trunk/files/0001-move-up-prototypes.patch (rev 0) +++ csw/mgar/pkg/guile/trunk/files/0001-move-up-prototypes.patch 2013-07-31 10:20:52 UTC (rev 21589) @@ -0,0 +1,38 @@ +From b8e59be6be12b0ba924b6c10e751b796ba65356f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 31 Jul 2013 11:39:57 +0200 +Subject: [PATCH] move up prototypes + +this solves https://www.opencsw.org/mantis/view.php?id=5073 +--- + libguile/gc.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/libguile/gc.h b/libguile/gc.h +index a9a499b..ee31517 100644 +--- a/libguile/gc.h ++++ b/libguile/gc.h +@@ -219,6 +219,9 @@ SCM_API char *scm_gc_strndup (const char *str, size_t n, const char *what) + #define SCM_GC_MALLOC_POINTERLESS(size) scm_gc_malloc_pointerless (size, NULL) + #endif + ++SCM_API void scm_remember_upto_here_1 (SCM obj); ++SCM_API void scm_remember_upto_here_2 (SCM obj1, SCM obj2); ++SCM_API void scm_remember_upto_here (SCM obj1, ...); + + SCM_INLINE SCM scm_cell (scm_t_bits car, scm_t_bits cdr); + SCM_INLINE SCM scm_double_cell (scm_t_bits car, scm_t_bits cbr, +@@ -317,10 +320,6 @@ scm_words (scm_t_bits car, scm_t_uint16 n_words) + + #endif /* SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES */ + +-SCM_API void scm_remember_upto_here_1 (SCM obj); +-SCM_API void scm_remember_upto_here_2 (SCM obj1, SCM obj2); +-SCM_API void scm_remember_upto_here (SCM obj1, ...); +- + /* In GCC we can force a reference to an SCM by making it an input to an + empty asm. This avoids the code size and slowdown of an actual function + call. Unfortunately there doesn't seem to be any way to do the varargs +-- +1.8.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jul 31 12:29:30 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 31 Jul 2013 10:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21590] csw/mgar/pkg/libexpat0/branches/nim Message-ID: Revision: 21590 http://gar.svn.sourceforge.net/gar/?rev=21590&view=rev Author: mattdarcy Date: 2013-07-31 10:29:30 +0000 (Wed, 31 Jul 2013) Log Message: ----------- created nim test branch to try to fix a missing dep for BTS perl build Added Paths: ----------- csw/mgar/pkg/libexpat0/branches/nim Copied: csw/mgar/pkg/libexpat0/branches/nim (from rev 21377, csw/mgar/pkg/libexpat0/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libexpat0/branches/nim (rev 0) +++ csw/mgar/pkg/libexpat0/branches/nim 2013-07-31 10:29:30 UTC (rev 21590) @@ -0,0 +1,23 @@ +NAME = expat +VERSION = 1.95.8 +GARTYPE = v2 + +DESCRIPTION = XML parser toolkit +define BLURB + This is James Clark's Expat XML parser library in C. It is a stream oriented + parser that requires setting handlers to deal with the structure that the + parser discovers in the document. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWlibexpat0 +SPKG_DESC_CSWlibexpat0 = XML parser toolkit, libexpat.so.0 +PKGFILES_CSWlibexpat0 += $(call pkgfiles_lib,libexpat.so.0) + +BUILD64_LIBS_ONLY = 1 + +INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jul 31 13:22:38 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 31 Jul 2013 11:22:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21591] csw/mgar/pkg/gcc4/branches Message-ID: Revision: 21591 http://gar.svn.sourceforge.net/gar/?rev=21591&view=rev Author: mattdarcy Date: 2013-07-31 11:22:37 +0000 (Wed, 31 Jul 2013) Log Message: ----------- test branch to build libgcc_s1 to try to resolve problem with perl build in BTS Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/gcc4/branches/nim/ Modified: csw/mgar/pkg/gcc4/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/gcc4/branches/nim/Makefile 2013-07-31 11:22:37 UTC (rev 21591) @@ -2,11 +2,11 @@ NAME = gcc VERSION = 4.8.0 -GARTYPE = v2 +GARTYPE = bts 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)) +PKG_BASENAME = NIMOSS$(PKG_VERSION_TOKEN) +# PKG_BASENAME = NIMOSSgcc-$(subst .,-,$(BASE_VERION)) DESCRIPTION = The GNU Compiler Collection define BLURB @@ -39,14 +39,14 @@ ## Copyright File LICENSE = COPYING3 -BUILD_DEP_PKGS += CSWbinutils -BUILD_DEP_PKGS += CSWcloog-dev -BUILD_DEP_PKGS += CSWgnulinks -BUILD_DEP_PKGS += CSWlibgmp-dev -BUILD_DEP_PKGS += CSWlibmpc-dev -BUILD_DEP_PKGS += CSWlibmpfr-dev -BUILD_DEP_PKGS += CSWlibppl-dev -BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += NIMOSSbinutils +BUILD_DEP_PKGS += NIMOSScloog-dev +BUILD_DEP_PKGS += NIMOSSgnulinks +BUILD_DEP_PKGS += NIMOSSlibgmp-dev +BUILD_DEP_PKGS += NIMOSSlibmpc-dev +BUILD_DEP_PKGS += NIMOSSlibmpfr-dev +BUILD_DEP_PKGS += NIMOSSlibppl-dev +BUILD_DEP_PKGS += NIMOSSlibz-dev # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix PROGRAM_SUFFIX = -$(BASE_VERSION) @@ -105,27 +105,27 @@ 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 += CSWlibatomic1 -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 += CSWlibgo3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibatomic1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibffi4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgcj$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgij$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgo3 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibgomp1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibitm1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibssp0 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibz1 # checkpkg-undetectable dependencies -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWbinutils -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWcoreutils -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWggrep -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSbinutils +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSScoreutils +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSggrep +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSgsed ALTERNATIVES_$(PKG_BASENAME)core += $(PKG_VERSION_TOKEN)core ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) @@ -137,7 +137,7 @@ 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_NIMOSSlibgcj$(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 @@ -146,18 +146,18 @@ # 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 +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += missing-dependency|NIMOSSpython +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|NIMOSSbinutils +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|NIMOSScoreutils +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|NIMOSSggrep +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|NIMOSSgsed # 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 -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|/opt/csw/share/info/libffi.info|$(PKG_BASENAME)core|CSWlibffi-dev +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_call.3|$(PKG_BASENAME)core|NIMOSSlibffi-dev +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi.3|$(PKG_BASENAME)core|NIMOSSlibffi-dev +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_prep_cif.3|$(PKG_BASENAME)core|NIMOSSlibffi-dev +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|/opt/csw/nimoss/share/info/libffi.info|$(PKG_BASENAME)core|NIMOSSlibffi-dev # The .a files are necessary CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap @@ -167,17 +167,17 @@ 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 +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libffi.so|NIMOSSgcc3javart|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcc_s.so|NIMOSSgcc3core|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcj.so|NIMOSSgcc3javart|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libobjc.so|NIMOSSgcc3objcrt|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|NIMOSSgcc3javart|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libffi.so|NIMOSSgcc3javart|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libgcj.so|NIMOSSgcc3javart|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libobjc.so|NIMOSSgcc3objcrt|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/libobjc.so|NIMOSSgcc3objcrt|$(PKG_BASENAME)objc +CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/sparcv9/libobjc.so|NIMOSSgcc3objcrt|$(PKG_BASENAME)objc +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|NIMOSSgcc3javart|$(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 @@ -187,115 +187,115 @@ # 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) += CSWlibgcc-s1 +PACKAGES += NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) +CATALOGNAME_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) = lib_gnu_awt_xlib$(JAVA_LIB_VERSION) +PKGFILES_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) +SPKG_DESC_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(DESCRIPTION), lib-gnu-awt-xlib.so.$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME) += NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += NIMOSSlibgcc-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 += NIMOSSlibffi4 +CATALOGNAME_NIMOSSlibffi4 = libffi4 +PKGFILES_NIMOSSlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*) +SPKG_DESC_NIMOSSlibffi4 += $(DESCRIPTION), libffi.so.4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME) += NIMOSSlibffi4 +RUNTIME_DEP_PKGS_NIMOSSlibffi4 += NIMOSSlibgcc-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 +PACKAGES += NIMOSSlibgcc-s1 +CATALOGNAME_NIMOSSlibgcc-s1 = libgcc_s1 +PKGFILES_NIMOSSlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*) +SPKG_DESC_NIMOSSlibgcc-s1 += $(DESCRIPTION), libgcc_s.so.1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME) += NIMOSSlibgcc-s1 -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 += NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) +CATALOGNAME_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) = libgcj_tools$(JAVA_LIB_VERSION) +PKGFILES_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgcj-tools\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) +SPKG_DESC_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgcj-tools.so.$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME) += NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += NIMOSSlibgcc-s1 +RUNTIME_DEP_PKGS_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += NIMOSSlibgcj$(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 += NIMOSSlibgcj$(JAVA_LIB_VERSION) +CATALOGNAME_NIMOSSlibgcj$(JAVA_LIB_VERSION) = libgcj$(JAVA_LIB_VERSION) +PKGFILES_NIMOSSlibgcj$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgcj\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) +SPKG_DESC_NIMOSSlibgcj$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgcj.so.$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_NIMOSSlibgcj$(JAVA_LIB_VERSION) += NIMOSSlibgcc-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 +PACKAGES += NIMOSSlibgfortran3 +CATALOGNAME_NIMOSSlibgfortran3 = libgfortran3 +PKGFILES_NIMOSSlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*) +SPKG_DESC_NIMOSSlibgfortran3 += $(DESCRIPTION), libgfortran.so.3 +RUNTIME_DEP_PKGS_$(PKG_BASENAME) += NIMOSSlibgfortran3 +RUNTIME_DEP_PKGS_NIMOSSlibgfortran3 += NIMOSSlibgcc-s1 -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 += NIMOSSlibgij$(JAVA_LIB_VERSION) +CATALOGNAME_NIMOSSlibgij$(JAVA_LIB_VERSION) = libgij$(JAVA_LIB_VERSION) +PKGFILES_NIMOSSlibgij$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgij\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) +SPKG_DESC_NIMOSSlibgij$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgij.so.$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_NIMOSSlibgij$(JAVA_LIB_VERSION) += NIMOSSlibgcj$(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 +PACKAGES += NIMOSSlibgomp1 +CATALOGNAME_NIMOSSlibgomp1 = libgomp1 +PKGFILES_NIMOSSlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*) +SPKG_DESC_NIMOSSlibgomp1 += $(DESCRIPTION), libgomp.so.1 +RUNTIME_DEP_PKGS_NIMOSSlibgomp1 += NIMOSSlibgcc-s1 -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 += NIMOSSlibobjc$(LIBOBJC) +CATALOGNAME_NIMOSSlibobjc$(LIBOBJC) = libobjc$(LIBOBJC) +PKGFILES_NIMOSSlibobjc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc\.so\.$(LIBOBJC)(\.\d+)*) +SPKG_DESC_NIMOSSlibobjc$(LIBOBJC) += $(DESCRIPTION), libobjc.so.$(LIBOBJC) +RUNTIME_DEP_PKGS_NIMOSSlibobjc$(LIBOBJC) += NIMOSSlibgcc-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 += NIMOSSlibobjc-gc$(LIBOBJC) +CATALOGNAME_NIMOSSlibobjc-gc$(LIBOBJC) = libobjc_gc$(LIBOBJC) +PKGFILES_NIMOSSlibobjc-gc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc_gc\.so\.$(LIBOBJC)(\.\d+)*) +SPKG_DESC_NIMOSSlibobjc-gc$(LIBOBJC) += $(DESCRIPTION), libobjc_gc.so.$(LIBOBJC) +RUNTIME_DEP_PKGS_NIMOSSlibobjc-gc$(LIBOBJC) += NIMOSSlibgcc-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 +PACKAGES += NIMOSSlibssp0 +CATALOGNAME_NIMOSSlibssp0 = libssp0 +PKGFILES_NIMOSSlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*) +SPKG_DESC_NIMOSSlibssp0 += $(DESCRIPTION), libssp.so.0 +RUNTIME_DEP_PKGS_NIMOSSlibssp0 += NIMOSSlibgcc-s1 -PACKAGES += CSWlibgo3 -PKGFILES_CSWlibgo3 += $(call baseisadirs,$(libdir),libgo\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibgo3 += $(DESCRIPTION), libgo.so.3 -RUNTIME_DEP_PKGS_CSWlibgo3 += CSWlibgcc-s1 +PACKAGES += NIMOSSlibgo3 +PKGFILES_NIMOSSlibgo3 += $(call baseisadirs,$(libdir),libgo\.so\.3(\.\d+)*) +SPKG_DESC_NIMOSSlibgo3 += $(DESCRIPTION), libgo.so.3 +RUNTIME_DEP_PKGS_NIMOSSlibgo3 += NIMOSSlibgcc-s1 # Hasn't been investigated. I feel lucky. -CHECKPKG_OVERRIDES_CSWlibgo3 += file-with-bad-content +CHECKPKG_OVERRIDES_NIMOSSlibgo3 += file-with-bad-content -PACKAGES += CSWlibitm1 -PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibitm1 += $(DESCRIPTION), libitm.so.1 -RUNTIME_DEP_PKGS_CSWlibitm1 += CSWlibgcc-s1 +PACKAGES += NIMOSSlibitm1 +PKGFILES_NIMOSSlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) +SPKG_DESC_NIMOSSlibitm1 += $(DESCRIPTION), libitm.so.1 +RUNTIME_DEP_PKGS_NIMOSSlibitm1 += NIMOSSlibgcc-s1 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 +PACKAGES += NIMOSSlibstdc++$(LIBSTDCXX_VERSION) +CATALOGNAME_NIMOSSlibstdc++$(LIBSTDCXX_VERSION) = libstdc++$(LIBSTDCXX_VERSION) +PKGFILES_NIMOSSlibstdc++$(LIBSTDCXX_VERSION) += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.$(LIBSTDCXX_VERSION)(\.\d+)*) +SPKG_DESC_NIMOSSlibstdc++$(LIBSTDCXX_VERSION) += $(DESCRIPTION), libstdc++.so.$(LIBSTDCXX_VERSION) +RUNTIME_DEP_PKGS_NIMOSSlibstdc++$(LIBSTDCXX_VERSION) += NIMOSSlibgcc-s1 # 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 +PACKAGES_i386 += NIMOSSlibquadmath0 +CATALOGNAME_NIMOSSlibquadmath0 = libquadmath0 +PKGFILES_NIMOSSlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*) +SPKG_DESC_NIMOSSlibquadmath0 += GNU C compiler, libquadmath.so.0 +RUNTIME_DEP_PKGS_NIMOSSlibquadmath0 += NIMOSSlibgcc-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_i386 += NIMOSSlibquadmath0 +RUNTIME_DEP_PKGS_NIMOSSlibgfortran3_i386 += NIMOSSlibquadmath0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH)) +RUNTIME_DEP_PKGS_NIMOSSlibgfortran3 += $(RUNTIME_DEP_PKGS_NIMOSSlibgfortran3_$(GARCH)) -PACKAGES += CSWlibatomic1 -PKGFILES_CSWlibatomic1 += $(call baseisadirs,$(libdir),libatomic\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibatomic1 += $(DESCRIPTION), libatomic.so.1 -RUNTIME_DEP_PKGS_CSWlibatomic1 += CSWlibgcc-s1 +PACKAGES += NIMOSSlibatomic1 +PKGFILES_NIMOSSlibatomic1 += $(call baseisadirs,$(libdir),libatomic\.so\.1(\.\d+)*) +SPKG_DESC_NIMOSSlibatomic1 += $(DESCRIPTION), libatomic.so.1 +RUNTIME_DEP_PKGS_NIMOSSlibatomic1 += NIMOSSlibgcc-s1 PACKAGES += $(PKG_BASENAME)g++ SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler @@ -309,11 +309,11 @@ # 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++ += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibstdc++$(LIBSTDCXX_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibz1 # The C++ compiler needs the C compiler. RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(PKG_BASENAME)core @@ -321,7 +321,7 @@ ALTERNATIVES_$(PKG_BASENAME)g++ += $(PKG_VERSION_TOKEN)g++ ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) -RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_NIMOSSlibgij$(JAVA_LIB_VERSION) += NIMOSSlibgcc-s1 PACKAGES += $(PKG_BASENAME)gfortran SPKG_DESC_$(PKG_BASENAME)gfortran = GNU Fortran Compiler @@ -333,27 +333,27 @@ 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 += CSWlibgfortran3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibgfortran3 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibz1 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 += 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 += CSWecj -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 -CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += surplus-dependency|CSWecj +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibgcj$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibgij$(JAVA_LIB_VERSION) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSecj +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibz1 +CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += surplus-dependency|NIMOSSecj 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)) @@ -426,20 +426,20 @@ 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 += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibobjc$(LIBOBJC) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibobjc-gc$(LIBOBJC) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibz1 # 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 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += NIMOSSlibiconv2 PACKAGES += $(PKG_BASENAME)ada SPKG_DESC_$(PKG_BASENAME)ada = GCC Ada compiler (GNAT) @@ -457,12 +457,12 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += file-with-bad-content -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += NIMOSSlibz1 # This is an obsolete package. Nothing depends on it, so we can remove it. INCOMPATIBLE_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart @@ -484,18 +484,18 @@ # CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += binary-architecture-does-not-match-placement # CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += binary-architecture-does-not-match-placement # CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibffi4 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcc-s1 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgfortran3 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgomp1 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibobjc$(LIBOBJC) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibobjc-gc$(LIBOBJC) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibssp0 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibffi4 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgcc-s1 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgcj$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgfortran3 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgij$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibgomp1 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibobjc$(LIBOBJC) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibobjc-gc$(LIBOBJC) += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibssp0 += binary-architecture-does-not-match-placement +# CHECKPKG_OVERRIDES_NIMOSSlibstdc++6 += binary-architecture-does-not-match-placement # We're building with the default GAR maps, currently U5. # LINKER_MAP_RELEASE = solaris10u8 @@ -510,22 +510,22 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += no-direct-binding CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += soname-unused CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += no-direct-binding -CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += soname-unused -CHECKPKG_OVERRIDES_CSWlibatomic1 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgo3 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibobjc4 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibquadmath0 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibssp0 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibstdc++6 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += soname-unused +CHECKPKG_OVERRIDES_NIMOSSlibatomic1 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibffi4 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgcj$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgfortran3 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgij$(JAVA_LIB_VERSION) += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgo3 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibgomp1 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibitm1 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibobjc-gc4 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibobjc4 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibquadmath0 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibssp0 += no-direct-binding +CHECKPKG_OVERRIDES_NIMOSSlibstdc++6 += no-direct-binding include files/scripts.mk include gar/category.mk @@ -540,7 +540,7 @@ bash $(FILEDIR)/customize_specs.sh $(DESTDIR) $(PROGRAM_SUFFIX) $(VERSION) @$(MAKECOOKIE) -# Use CSW or Solaris tools explicitly: +# Use NIMOSS or Solaris tools explicitly: AR = /usr/ccs/bin/ar AS = /usr/ccs/bin/as NM = /usr/ccs/bin/nm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jul 31 13:35:14 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 31 Jul 2013 11:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21592] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 21592 http://gar.svn.sourceforge.net/gar/?rev=21592&view=rev Author: pfelecan Date: 2013-07-31 11:35:14 +0000 (Wed, 31 Jul 2013) Log Message: ----------- guile/trunk/Makefile: addition of an override for explicit dependency Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-07-31 11:22:37 UTC (rev 21591) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-07-31 11:35:14 UTC (rev 21592) @@ -113,6 +113,7 @@ RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguilereadline-v18-18 RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguile2-0-22 RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibgmp-dev +CHECKPKG_OVERRIDES_CSWguile-dev += surplus-dependency|CSWlibgmp-dev ARCHALL_CSWguile-dev = 1 CHECKPKG_OVERRIDES_CSWguile-dev += archall-devel-package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jul 31 13:51:09 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 31 Jul 2013 11:51:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21593] csw/mgar/pkg/bdb48/branches/nim/Makefile Message-ID: Revision: 21593 http://gar.svn.sourceforge.net/gar/?rev=21593&view=rev Author: mattdarcy Date: 2013-07-31 11:51:07 +0000 (Wed, 31 Jul 2013) Log Message: ----------- fixing problem with bts build - included some old reference files ot be cleaned up after sucessful build Modified Paths: -------------- csw/mgar/pkg/bdb48/branches/nim/Makefile Modified: csw/mgar/pkg/bdb48/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/bdb48/branches/nim/Makefile 2013-07-31 11:35:14 UTC (rev 21592) +++ csw/mgar/pkg/bdb48/branches/nim/Makefile 2013-07-31 11:51:07 UTC (rev 21593) @@ -42,7 +42,7 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=/opt/csw/lib CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) # bdb tests are *very* time consuming This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jul 31 15:09:51 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 31 Jul 2013 13:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21594] csw/mgar/pkg/libjpeg62/branches Message-ID: Revision: 21594 http://gar.svn.sourceforge.net/gar/?rev=21594&view=rev Author: mattdarcy Date: 2013-07-31 13:09:51 +0000 (Wed, 31 Jul 2013) Log Message: ----------- test NIM branch - drop later, just building dependencies to try to fix perl in BTS Modified Paths: -------------- csw/mgar/pkg/libjpeg62/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/libjpeg62/branches/nim/ Modified: csw/mgar/pkg/libjpeg62/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libjpeg62/trunk/Makefile 2013-07-31 10:29:30 UTC (rev 21590) +++ csw/mgar/pkg/libjpeg62/branches/nim/Makefile 2013-07-31 13:09:51 UTC (rev 21594) @@ -1,6 +1,6 @@ NAME = jpeg VERSION = 6b -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = JPEG library and tools by the Independent JPEG Group define BLURB @@ -13,9 +13,9 @@ LICENSE = README -PACKAGES += CSWlibjpeg62 -SPKG_DESC_CSWlibjpeg62 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.62 -PKGFILES_CSWlibjpeg62 = $(call pkgfiles_lib,libjpeg.so.62) +PACKAGES += NIMOSSlibjpeg62 +SPKG_DESC_NIMOSSlibjpeg62 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.62 +PKGFILES_NIMOSSlibjpeg62 = $(call pkgfiles_lib,libjpeg.so.62) BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jul 31 15:27:39 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 31 Jul 2013 13:27:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21595] csw/mgar/pkg/gettext/branches/nim/Makefile Message-ID: Revision: 21595 http://gar.svn.sourceforge.net/gar/?rev=21595&view=rev Author: mattdarcy Date: 2013-07-31 13:27:36 +0000 (Wed, 31 Jul 2013) Log Message: ----------- initial build building deps for perl for bts build - this branch can be deleted when done Modified Paths: -------------- csw/mgar/pkg/gettext/branches/nim/Makefile Modified: csw/mgar/pkg/gettext/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gettext/branches/nim/Makefile 2013-07-31 13:09:51 UTC (rev 21594) +++ csw/mgar/pkg/gettext/branches/nim/Makefile 2013-07-31 13:27:36 UTC (rev 21595) @@ -17,8 +17,8 @@ FOREIGN_PACKAGES += NIMOSSlibintl2 FOREIGN_PACKAGES += NIMOSSlibintl3 -BUILD_DEP_PKGS += NIMOSSlibncurses-dev NIMOSSlibxml2-dev NIMOSSlibexpat-dev -BUILD_DEP_PKGS += NIMOSSlibiconv-dev NIMOSSggettext-dev +BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev CSWlibexpat-dev +BUILD_DEP_PKGS += CSWlibiconv-dev CSWggettext-dev PACKAGES += NIMOSSggettext PACKAGES += NIMOSSggettextdoc @@ -158,8 +158,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += NIMOSSggettextdoc.cswreleasenotes -DISTFILES += NIMOSSggettext.cswreleasenotes +DISTFILES += CSWggettextdoc.cswreleasenotes +DISTFILES += CSWggettext.cswreleasenotes PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.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 Wed Jul 31 17:33:52 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 31 Jul 2013 15:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21596] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/building-a-catalog.rst Message-ID: Revision: 21596 http://gar.svn.sourceforge.net/gar/?rev=21596&view=rev Author: wahwah Date: 2013-07-31 15:33:51 +0000 (Wed, 31 Jul 2013) Log Message: ----------- opencsw-manual/trunk: partial rewrite of the catalog building docs Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-07-31 13:27:36 UTC (rev 21595) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-07-31 15:33:51 UTC (rev 21596) @@ -2,11 +2,25 @@ Building a package catalog -------------------------- -If you have built a package (or a set of them), you might want to test -them. You could just ``gunzip`` the packages and run ``pkgadd``, but if -you wanted to test your package on a couple of systems, it's better to -build a catalog. +When to build your own catalog +------------------------------ +In short, any time you have a set of packages you want to install with +pkgutil, but there isn't an existing catalog that provides you with the right +mix. The typical cases include: + +# You've built a set of packages and you want to test them. +# You want to pick a subset of packages from an existing catalog on the + mirror. +# You want to install older versions of some packages, for instance pick a few + packages from the old package stash (``allpkgs``) and some other, newer + packages. +# You have a set of packages internal to your company that you want to + distribute across your servers. + +How to build your own catalog +----------------------------- + Make sure you've installed the ``pkgutilplus`` package. It contains the ``bldcat`` utility. You can use it to create a local catalog containing your package:: @@ -25,19 +39,14 @@ If you create a persistent local catalog, you can add the path or URL to ``/etc/opt/csw/pkgutil.conf``. -Building your own catalogs --------------------------- +More details on catalog building +-------------------------------- -If you have test packages that you have built for OpenCSW or your own -packages that have dependencies on each other, you may want to use -pkgutil to install them. For that to work you need a catalog for your -packages just like the ones OpenCSW publishes. +``bldcat`` is relatively a simple perl script which parses your packages in +a directory and builds a catalog for them. The one argument is the directory +to parse for ``*.pkg.gz`` files and the ``catalog`` file is put in the same +directory together with the ``descriptions`` of all packages:: -There's a simple perl script to parse your packages in a directory and -build a catalog for them. The one argument is the directory to parse for -``*.pkg.gz`` files and the ``catalog`` file is put in the same directory -together with the ``descriptions`` of all packages:: - $ bldcat . Inspecting ./xv-3.10a,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz $ ls -l @@ -61,7 +70,7 @@ Test run on a manipulated catalog:: - # chkcat /var/opt/csw/pkgutil/catalog + # chkcat /var/opt/csw/pkgutil/catalog Skipping signature. Skipping comment. Skipping comment. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.