From rthurner at users.sourceforge.net Mon Apr 2 00:07:04 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 01 Apr 2012 22:07:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17582] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 17582 http://gar.svn.sourceforge.net/gar/?rev=17582&view=rev Author: rthurner Date: 2012-04-01 22:07:04 +0000 (Sun, 01 Apr 2012) Log Message: ----------- mercurial, upgrade to hg-2.1.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2012-03-30 10:20:27 UTC (rev 17581) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-04-01 22:07:04 UTC (rev 17582) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.1.1 +VERSION = 2.1.2 CATEGORIES = python GARTYPE = v2 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 Apr 2 00:08:24 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 01 Apr 2012 22:08:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17583] csw/mgar/pkg/mercurial/trunk/checksums Message-ID: Revision: 17583 http://gar.svn.sourceforge.net/gar/?rev=17583&view=rev Author: rthurner Date: 2012-04-01 22:08:24 +0000 (Sun, 01 Apr 2012) Log Message: ----------- mercurial, upgrade to hg-2.1.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-04-01 22:07:04 UTC (rev 17582) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-04-01 22:08:24 UTC (rev 17583) @@ -1 +1 @@ -368fab4705ebd4d1296fdd6bd2fe6272 mercurial-2.1.1.tar.gz +15354d739504ec46f68a0fee2ecfbf25 mercurial-2.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 2 06:38:57 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 04:38:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17584] csw/mgar/pkg/lzip/trunk Message-ID: Revision: 17584 http://gar.svn.sourceforge.net/gar/?rev=17584&view=rev Author: rthurner Date: 2012-04-02 04:38:57 +0000 (Mon, 02 Apr 2012) Log Message: ----------- lzip: update to lzip-0.13 Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile csw/mgar/pkg/lzip/trunk/checksums Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2012-04-01 22:08:24 UTC (rev 17583) +++ csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 04:38:57 UTC (rev 17584) @@ -1,5 +1,5 @@ NAME = lzip -VERSION = 1.12 +VERSION = 1.13 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/lzip/trunk/checksums =================================================================== --- csw/mgar/pkg/lzip/trunk/checksums 2012-04-01 22:08:24 UTC (rev 17583) +++ csw/mgar/pkg/lzip/trunk/checksums 2012-04-02 04:38:57 UTC (rev 17584) @@ -1 +1 @@ -69a40172db5ce896b58d862c50fcd517 lzip-1.12.tar.gz +2f401e995c36cca05bd1805aa9c28231 lzip-1.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 2 06:58:32 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 04:58:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17585] csw/mgar/pkg/lzip/trunk Message-ID: Revision: 17585 http://gar.svn.sourceforge.net/gar/?rev=17585&view=rev Author: rthurner Date: 2012-04-02 04:58:32 +0000 (Mon, 02 Apr 2012) Log Message: ----------- lzip: update patches Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lzip/trunk/files/0001-use-inttypes.h-instead-of-stdint.h.patch Removed Paths: ------------- csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 04:38:57 UTC (rev 17584) +++ csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 04:58:32 UTC (rev 17585) @@ -15,8 +15,8 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-inttypes.h-instead-of-stdint.h.patch -PATCHFILES += 0002-inttypes.h-instead-of-stdint.h.patch +#PATCHFILES = 0001-inttypes.h-instead-of-stdint.h.patch +#PATCHFILES += 0002-inttypes.h-instead-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch 2012-04-02 04:38:57 UTC (rev 17584) +++ csw/mgar/pkg/lzip/trunk/files/0001-inttypes.h-instead-of-stdint.h.patch 2012-04-02 04:58:32 UTC (rev 17585) @@ -1,25 +0,0 @@ -From 43958262312e06e5fde2e62815798e2c6e8f8929 Mon Sep 17 00:00:00 2001 -From: THURNER rupert -Date: Mon, 1 Nov 2010 16:57:20 -0500 -Subject: [PATCH] inttypes.h instead of stdint.h - ---- - fast_encoder.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/fast_encoder.cc b/fast_encoder.cc -index f4becde..bfefe17 100644 ---- a/fast_encoder.cc -+++ b/fast_encoder.cc -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - - #include "lzip.h" - #include "encoder.h" --- -1.7.3 - Added: csw/mgar/pkg/lzip/trunk/files/0001-use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0001-use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0001-use-inttypes.h-instead-of-stdint.h.patch 2012-04-02 04:58:32 UTC (rev 17585) @@ -0,0 +1,53 @@ +From 94cd14c20757910525df7b74c3bc48d6138cba68 Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Mon, 2 Apr 2012 06:53:46 +0200 +Subject: [PATCH] use inttypes.h instead of stdint.h + +--- + decoder.cc | 2 +- + encoder.cc | 2 +- + fast_encoder.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/decoder.cc b/decoder.cc +index ae37563..bd7aa0c 100644 +--- a/decoder.cc ++++ b/decoder.cc +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "lzip.h" +diff --git a/encoder.cc b/encoder.cc +index 56820b5..9c3ca06 100644 +--- a/encoder.cc ++++ b/encoder.cc +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "encoder.h" +diff --git a/fast_encoder.cc b/fast_encoder.cc +index 2d99b04..a89e984 100644 +--- a/fast_encoder.cc ++++ b/fast_encoder.cc +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzip.h" + #include "encoder.h" +-- +1.7.9 + Deleted: csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch 2012-04-02 04:38:57 UTC (rev 17584) +++ csw/mgar/pkg/lzip/trunk/files/0002-inttypes.h-instead-of-stdint.h.patch 2012-04-02 04:58:32 UTC (rev 17585) @@ -1,68 +0,0 @@ -From e434ca6f4d7f1157d0e0e74b26739333b81d8d80 Mon Sep 17 00:00:00 2001 -From: THURNER rupert -Date: Mon, 1 Nov 2010 16:51:34 -0500 -Subject: [PATCH] replace stdint.h with inttypes.h - ---- - decoder.cc | 2 +- - encoder.cc | 2 +- - lziprecover.cc | 2 +- - main.cc | 3 ++- - 4 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/decoder.cc b/decoder.cc -index 03d2ca6..c0c4759 100644 ---- a/decoder.cc -+++ b/decoder.cc -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - - #include "lzip.h" - #include "decoder.h" -diff --git a/encoder.cc b/encoder.cc -index e10142a..f58fcb2 100644 ---- a/encoder.cc -+++ b/encoder.cc -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - - #include "lzip.h" - #include "encoder.h" -diff --git a/lziprecover.cc b/lziprecover.cc -index 3f1b130..c2b218f 100644 ---- a/lziprecover.cc -+++ b/lziprecover.cc -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #if defined(__MSVCRT__) -diff --git a/main.cc b/main.cc -index 193f4ac..26b1b23 100644 ---- a/main.cc -+++ b/main.cc -@@ -33,7 +33,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include --- -1.7.3 - 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 Apr 2 07:02:06 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 05:02:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17586] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 17586 http://gar.svn.sourceforge.net/gar/?rev=17586&view=rev Author: rthurner Date: 2012-04-02 05:02:06 +0000 (Mon, 02 Apr 2012) Log Message: ----------- lzip: update patches Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 04:58:32 UTC (rev 17585) +++ csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 05:02:06 UTC (rev 17586) @@ -15,8 +15,7 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz -#PATCHFILES = 0001-inttypes.h-instead-of-stdint.h.patch -#PATCHFILES += 0002-inttypes.h-instead-of-stdint.h.patch +PATCHFILES = 0001-use-inttypes.h-instead-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 2 07:05:32 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 05:05:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17587] csw/mgar/pkg/lzip/trunk Message-ID: Revision: 17587 http://gar.svn.sourceforge.net/gar/?rev=17587&view=rev Author: rthurner Date: 2012-04-02 05:05:32 +0000 (Mon, 02 Apr 2012) Log Message: ----------- lzip: update patches Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lzip/trunk/files/0002-use-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 05:02:06 UTC (rev 17586) +++ csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 05:05:32 UTC (rev 17587) @@ -16,6 +16,7 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = 0001-use-inttypes.h-instead-of-stdint.h.patch +PATCHFILES = 0002-use-inttypes.h-instead-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/lzip/trunk/files/0002-use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lzip/trunk/files/0002-use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/lzip/trunk/files/0002-use-inttypes.h-instead-of-stdint.h.patch 2012-04-02 05:05:32 UTC (rev 17587) @@ -0,0 +1,25 @@ +From 0102a612dbf0de47be5e988774b0a92f61bf4d8c Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Mon, 2 Apr 2012 07:02:32 +0200 +Subject: [PATCH] use inttypes.h instead of stdint.h + +--- + main.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/main.cc b/main.cc +index 276fe30..bd497f6 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +1.7.9 + 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 Apr 2 07:08:33 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 05:08:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17588] csw/mgar/pkg/lzip/trunk/Makefile Message-ID: Revision: 17588 http://gar.svn.sourceforge.net/gar/?rev=17588&view=rev Author: rthurner Date: 2012-04-02 05:08:33 +0000 (Mon, 02 Apr 2012) Log Message: ----------- lzip: update patches Modified Paths: -------------- csw/mgar/pkg/lzip/trunk/Makefile Modified: csw/mgar/pkg/lzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 05:05:32 UTC (rev 17587) +++ csw/mgar/pkg/lzip/trunk/Makefile 2012-04-02 05:08:33 UTC (rev 17588) @@ -16,7 +16,7 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = 0001-use-inttypes.h-instead-of-stdint.h.patch -PATCHFILES = 0002-use-inttypes.h-instead-of-stdint.h.patch +PATCHFILES += 0002-use-inttypes.h-instead-of-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 2 09:21:20 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 02 Apr 2012 07:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17589] csw/mgar/pkg Message-ID: Revision: 17589 http://gar.svn.sourceforge.net/gar/?rev=17589&view=rev Author: janholzh Date: 2012-04-02 07:21:19 +0000 (Mon, 02 Apr 2012) Log Message: ----------- znc/trunk: first commit;modperl and modpython do not work Added Paths: ----------- csw/mgar/pkg/znc/ csw/mgar/pkg/znc/Makefile csw/mgar/pkg/znc/branches/ csw/mgar/pkg/znc/tags/ csw/mgar/pkg/znc/trunk/ csw/mgar/pkg/znc/trunk/Makefile csw/mgar/pkg/znc/trunk/checksums csw/mgar/pkg/znc/trunk/files/ csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch csw/mgar/pkg/znc/trunk/files/0002-fix-znc.1-manpage.patch Added: csw/mgar/pkg/znc/Makefile =================================================================== --- csw/mgar/pkg/znc/Makefile (rev 0) +++ csw/mgar/pkg/znc/Makefile 2012-04-02 07:21:19 UTC (rev 17589) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/znc/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/znc/trunk/Makefile =================================================================== --- csw/mgar/pkg/znc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/znc/trunk/Makefile 2012-04-02 07:21:19 UTC (rev 17589) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = znc +VERSION = 0.204 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = ZNC, an advanced IRC bouncer +define BLURB + ZNC, an advanced IRC bouncer that is left connected so an IRC client can disconnect/reconnect without losing the chat session. +endef + +VENDOR_URL = http://http://wiki.znc.in/ZNC +MASTER_SITES = http://znc.in/releases/ +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-fix-man-pages.patch +PATCHFILES += 0002-fix-znc.1-manpage.patch +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWznc += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWznc += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWznc += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWznc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWznc += CSWlibgnugetopt0 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GCC4 +CONFIGURE_ARGS = $(DIRPATHS) + +# --enable-perl and --enable-python do not work. perl autotools check is broke; python module does not compile +#CONFIGURE_ARGS = $(DIRPATHS) --enable-perl --enable-python + +SKIPTEST = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/znc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/znc/trunk/checksums =================================================================== --- csw/mgar/pkg/znc/trunk/checksums (rev 0) +++ csw/mgar/pkg/znc/trunk/checksums 2012-04-02 07:21:19 UTC (rev 17589) @@ -0,0 +1 @@ +7c7247423fc08b0c5c62759a50a9bca3 znc-0.204.tar.gz Added: csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch =================================================================== --- csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch (rev 0) +++ csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch 2012-04-02 07:21:19 UTC (rev 17589) @@ -0,0 +1,33 @@ +From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 2 Apr 2012 09:02:40 +0200 +Subject: [PATCH] fix-man-pages + +--- + man/Makefile.in | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/man/Makefile.in b/man/Makefile.in +index 145d14f..19aafdc 100644 +--- a/man/Makefile.in ++++ b/man/Makefile.in +@@ -11,7 +11,7 @@ mandir := @mandir@ + INSTALL := @INSTALL@ + INSTALL_DATA := @INSTALL_DATA@ + +-MAN1 := znc.1.gz znc-buildmod.1.gz znc-config.1.gz ++MAN1 := znc.1 znc-buildmod.1 znc-config.1 + + ifneq "$(V)" "" + VERBOSE=1 +@@ -28,7 +28,6 @@ all: $(MAN1) + + %.1.gz: %.1 Makefile + $(E) Packing man page $@... +- $(Q)gzip -9 <$< >$@ + + clean: + -rm -f $(MAN1) +-- +1.7.9 + Added: csw/mgar/pkg/znc/trunk/files/0002-fix-znc.1-manpage.patch =================================================================== --- csw/mgar/pkg/znc/trunk/files/0002-fix-znc.1-manpage.patch (rev 0) +++ csw/mgar/pkg/znc/trunk/files/0002-fix-znc.1-manpage.patch 2012-04-02 07:21:19 UTC (rev 17589) @@ -0,0 +1,34 @@ +From 42f231dc87753e120b4416b3a3af658bc3316621 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 2 Apr 2012 09:09:12 +0200 +Subject: [PATCH] fix-znc.1-manpage + +--- + man/znc.1 | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/man/znc.1 b/man/znc.1 +index 7578adc..68e140e 100644 +--- a/man/znc.1 ++++ b/man/znc.1 +@@ -98,14 +98,14 @@ Rewrite znc.conf. This is equivalent to + .I /znc saveconfig + .SH FILES + .TP +-.I /usr/local/share/znc/ ++.I /opt/csw/share/znc/ + Static module data like webadmin skins + .TP +-.I /usr/local/lib/znc/ ++.I /opt/csw/lib/znc/ + .B znc + installs its modules to this directory. + .TP +-.I /usr/local/include/znc/ ++.I /opt/csw/include/znc/ + These are the headers needed for compiling own modules. + .TP + .I ~/.znc +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 2 12:44:30 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 02 Apr 2012 10:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17590] csw/mgar/pkg/znc/trunk/Makefile Message-ID: Revision: 17590 http://gar.svn.sourceforge.net/gar/?rev=17590&view=rev Author: janholzh Date: 2012-04-02 10:44:29 +0000 (Mon, 02 Apr 2012) Log Message: ----------- znc/trunk: add a dev package Modified Paths: -------------- csw/mgar/pkg/znc/trunk/Makefile Modified: csw/mgar/pkg/znc/trunk/Makefile =================================================================== --- csw/mgar/pkg/znc/trunk/Makefile 2012-04-02 07:21:19 UTC (rev 17589) +++ csw/mgar/pkg/znc/trunk/Makefile 2012-04-02 10:44:29 UTC (rev 17590) @@ -18,12 +18,24 @@ PATCHFILES += 0002-fix-znc.1-manpage.patch LICENSE = LICENSE +PACKAGES += CSWznc +SPKG_DESC_CSWznc = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWznc += CSWlibcares2 RUNTIME_DEP_PKGS_CSWznc += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWznc += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWznc += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWznc += CSWlibgnugetopt0 +PACKAGES += CSWznc-dev +SPKG_DESC_CSWznc-dev += $(DESCRIPTION), development files +PKGFILES_CSWznc-dev += /opt/csw/bin/znc-buildmod +PKGFILES_CSWznc-dev += /opt/csw/bin/znc-config +PKGFILES_CSWznc-dev += /opt/csw/lib/pkgconfig/znc.pc +PKGFILES_CSWznc-dev += /opt/csw/include/znc/.* +RUNTIME_DEP_PKGS_CSWznc-dev += CSWznc +RUNTIME_DEP_PKGS_CSWznc-dev += CSWgcc4g++ +RUNTIME_DEP_PKGS_CSWznc-dev += CSWlibcares-dev + # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package 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 Apr 2 22:06:11 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 02 Apr 2012 20:06:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17591] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 17591 http://gar.svn.sourceforge.net/gar/?rev=17591&view=rev Author: rthurner Date: 2012-04-02 20:06:10 +0000 (Mon, 02 Apr 2012) Log Message: ----------- subversion: upgrade to svn-1.7.4 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 2012-04-02 10:44:29 UTC (rev 17590) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-02 20:06:10 UTC (rev 17591) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.3 +VERSION = 1.7.4 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2012-04-02 10:44:29 UTC (rev 17590) +++ csw/mgar/pkg/subversion/trunk/checksums 2012-04-02 20:06:10 UTC (rev 17591) @@ -1 +1 @@ -867fb0a5db00710cf8dce0bdfa094b3b subversion-1.7.3.tar.bz2 +99ace9433be21a4793fc1cdbf2fdea09 subversion-1.7.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Apr 3 04:07:27 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 03 Apr 2012 02:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17592] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17592 http://gar.svn.sourceforge.net/gar/?rev=17592&view=rev Author: rthurner Date: 2012-04-03 02:07:27 +0000 (Tue, 03 Apr 2012) Log Message: ----------- subversion: include a hint how it 'should' be, but the lib cannot be set like it ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-02 20:06:10 UTC (rev 17591) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-03 02:07:27 UTC (rev 17592) @@ -1,10 +1,5 @@ # $Id$ # -# TODO (release-critical prefixed with !, non release-critical with *) -# -# ! Install does not work as there is no contrib any more. Where is this stuff? -# contrib was removed from the svn upstream delivery. -# # * How about shipping a changelog.CSW (example in files/)? # * The language binding packages all have a whole stack of dependencies # (mostly the same libs that the main svn package has). Are those really @@ -135,7 +130,6 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding @@ -217,6 +211,11 @@ # Relocate locations of foreign language bindings PATCHFILES += 0002-Fix-location-of-bindings.patch +# should be in lib ... put something below to at least make it compile. +# on the svn mailing list people say we should not build the package +# with svn installed, and here it seems basic that we build with svn +# installed. +# SVNLIB = $(prefix)/lib SVNLIB = $(prefix)/lib/svn JAVA_HOME = /usr/jdk1.6.0_20 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 Apr 3 04:31:39 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 03 Apr 2012 02:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17593] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17593 http://gar.svn.sourceforge.net/gar/?rev=17593&view=rev Author: rthurner Date: 2012-04-03 02:31:39 +0000 (Tue, 03 Apr 2012) Log Message: ----------- subversion, temporary mute checkpkg ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-03 02:07:27 UTC (rev 17592) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-03 02:31:39 UTC (rev 17593) @@ -64,6 +64,129 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 +# temporary include this to get it built to analyze ... +CHECKPKG_OVERRIDES_CSWrbsvn += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWpythonsvn += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibssl0-9-8 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWsvn +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibneon27 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibapr1-0 +CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0 +CHECKPKG_OVERRIDES_CSWpmsvn += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.pyc + +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so.0 +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.a +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.la +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.so +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.py +CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.so +CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.so +CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWpython +# end test entries ... + PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Tue Apr 3 21:46:17 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Tue, 03 Apr 2012 19:46:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17594] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 17594 http://gar.svn.sourceforge.net/gar/?rev=17594&view=rev Author: igalic Date: 2012-04-03 19:46:17 +0000 (Tue, 03 Apr 2012) Log Message: ----------- trafficserver: obsolete the necessity to replace the config user, which I forgot to do anyway.. Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-04-03 02:31:39 UTC (rev 17593) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-04-03 19:46:17 UTC (rev 17594) @@ -11,7 +11,7 @@ Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant caching proxy server endef -MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/ +MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/ DISTFILES = $(DISTNAME).tar.bz2 PACKAGING_PLATFORMS = solaris10-i386 @@ -26,9 +26,10 @@ CONFIGURE_ARGS += --with-pcre=$(prefix) CONFIGURE_ARGS += --with-lzma=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) -CONFIGURE_ARGS += --with-user=$(shell /opt/csw/gnu/id -nu) -CONFIGURE_ARGS += --with-group=$(shell /opt/csw/gnu/id -ng) +export pkgsysuser = $(shell /opt/csw/gnu/id -nu) +export pkgsysgroup = $(shell /opt/csw/gnu/id -ng) + PROTOTYPE_MODIFIERS += data PROTOTYPE_FILES_data += $(sysconfdir)/?.* PROTOTYPE_FILES_data += $(datadir)/?.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 3 22:43:01 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 20:43:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17595] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17595 http://gar.svn.sourceforge.net/gar/?rev=17595&view=rev Author: wilbury Date: 2012-04-03 20:43:00 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Build for (at the moment) Solaris 10/i386 Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 19:46:17 UTC (rev 17594) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 20:43:00 UTC (rev 17595) @@ -9,13 +9,20 @@ backends. Current backends include MySQL, PostgreSQL, bind, etc. endef +# XXX: Open Issues: +# - build recursor + MASTER_SITES = http://downloads.powerdns.com/releases/ SPKG_SOURCEURL = http://www.powerdns.com/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE DISTFILES += cswpdns -# PATCHFILES += 0001-stdint.h-patch.patch +PATCHFILES += 0003-Make-checking-for-LUA-behave-correctly.patch +PATCHFILES += 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch +PATCHFILES += 0005-Include-correct-sys-ethernet.h.patch +WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -27,23 +34,31 @@ LICENSE = $(FILEDIR)/LICENSE GARCOMPILER = GNU -# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris10-i386 + +# PowerDNS does not have any "test" target SKIPTEST = 1 -BUILD64_ONLY = 1 -BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/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-boost=/opt/csw/gxx +CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib +CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include/mysql +EXTRA_INC = /opt/csw/gxx/include +LDFLAGS += -L/opt/csw/gxx/lib RUNTIME_DEP_PKGS_CSWpdns += CSWzlib RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4corert RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWpdns += CSWboostrt +RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-prog-opts1-49-0-gxx +RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-s13n1-49-0-gxx BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel INITSMF = /etc/opt/csw/init.d/cswpdns Deleted: csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch 2012-04-03 19:46:17 UTC (rev 17594) +++ csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch 2012-04-03 20:43:00 UTC (rev 17595) @@ -1,109 +0,0 @@ -From fffc4da5956c09a85d9b2f749c015af973212488 Mon Sep 17 00:00:00 2001 -From: Ihsan Dogan -Date: Wed, 14 Jul 2010 10:27:42 +0200 -Subject: [PATCH] stdint.h patch - ---- - modules/geobackend/ippreftree.hh | 2 +- - pdns/aes/brg_types.h | 2 +- - pdns/dnspbench.cc | 2 +- - pdns/dnswriter.hh | 2 +- - pdns/misc.hh | 2 +- - pdns/rcpgenerator.hh | 2 +- - pdns/rec_channel.hh | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/modules/geobackend/ippreftree.hh b/modules/geobackend/ippreftree.hh -index d1196c1..d4f970a 100644 ---- a/modules/geobackend/ippreftree.hh -+++ b/modules/geobackend/ippreftree.hh -@@ -8,7 +8,7 @@ - #include - #include - #include --#include -+#include - - using namespace std; - -diff --git a/pdns/aes/brg_types.h b/pdns/aes/brg_types.h -index 5911581..755b3e8 100644 ---- a/pdns/aes/brg_types.h -+++ b/pdns/aes/brg_types.h -@@ -47,7 +47,7 @@ extern "C" { - # include - # define ptrint_t intptr_t - #elif defined( __GNUC__ ) && ( __GNUC__ >= 3 ) --# include -+#include - # define ptrint_t intptr_t - #else - # define ptrint_t int -diff --git a/pdns/dnspbench.cc b/pdns/dnspbench.cc -index ae62fe3..c422c31 100644 ---- a/pdns/dnspbench.cc -+++ b/pdns/dnspbench.cc -@@ -8,7 +8,7 @@ Logger L("dnspbench"); - #include "dnsrecords.hh" - - #include "statbag.hh" --#include -+#include - #include - - using namespace boost; -diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh -index e5d418d..a041cea 100644 ---- a/pdns/dnswriter.hh -+++ b/pdns/dnswriter.hh -@@ -5,7 +5,7 @@ - #include - #include - #if !defined SOLARIS8 && !defined WIN32 --#include -+#include - #elif defined WIN32 - #include "utility.hh" - #endif -diff --git a/pdns/misc.hh b/pdns/misc.hh -index f04787a..4f38a4c 100644 ---- a/pdns/misc.hh -+++ b/pdns/misc.hh -@@ -18,7 +18,7 @@ - */ - #ifndef MISC_HH - #define MISC_HH --#include -+#include - #include - - #if 0 -diff --git a/pdns/rcpgenerator.hh b/pdns/rcpgenerator.hh -index 3651830..35c5334 100644 ---- a/pdns/rcpgenerator.hh -+++ b/pdns/rcpgenerator.hh -@@ -23,7 +23,7 @@ - #include - #include - #if !defined SOLARIS8 && !defined WIN32 --# include -+#include - #elif defined WIN32 - # include "utility.hh" - #endif -diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh -index 4a381a5..7b62082 100644 ---- a/pdns/rec_channel.hh -+++ b/pdns/rec_channel.hh -@@ -3,7 +3,7 @@ - #include - #include - #if !defined SOLARIS8 && !defined WIN32 --#include -+#include - #elif defined WIN32 - #include "utility.hh" - #endif --- -1.7.1 - Added: csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch 2012-04-03 20:43:00 UTC (rev 17595) @@ -0,0 +1,25 @@ +From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:06:09 +0200 +Subject: [PATCH 3/5] Make checking for LUA behave correctly. + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 1067417..55b5d20 100755 +--- a/configure ++++ b/configure +@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; } + + # Check whether --with-lua was given. + if test "${with_lua+set}" = set; then : +- withval=$with_lua; WITH_LUA=$withval] ++ withval=$with_lua; WITH_LUA=$withval + else + WITH_LUA=yes + fi +-- +1.7.9 + Added: csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-03 20:43:00 UTC (rev 17595) @@ -0,0 +1,269 @@ +From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:12:41 +0200 +Subject: [PATCH 4/5] Use sys/isa_defs.h instead of endian.h + +--- + codedocs/Makefile | 160 +++++++++++++++++++------------------- + pdns/ext/polarssl/library/net.c | 2 + + 2 files changed, 82 insertions(+), 80 deletions(-) + +diff --git a/codedocs/Makefile b/codedocs/Makefile +index a8dc049..279bc07 100644 +--- a/codedocs/Makefile ++++ b/codedocs/Makefile +@@ -31,8 +31,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = x86_64-unknown-linux-gnu +-host_triplet = x86_64-unknown-linux-gnu ++build_triplet = i386-pc-solaris2.10 ++host_triplet = i386-pc-solaris2.10 + subdir = codedocs + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -47,70 +47,70 @@ CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run aclocal-1.11 +-AMTAR = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run tar ++ACLOCAL = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run tar + AR = ar +-AUTOCONF = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run automake-1.11 +-AWK = mawk +-BOOST_CPPFLAGS = +-BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/usr/local/lib -R/usr/local/lib +-BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options-mt ++AUTOCONF = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run automake-1.11 ++AWK = gawk ++BOOST_CPPFLAGS = -I/opt/csw/gxx/include ++BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib ++BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options + BOOST_ROOT = +-BOOST_SERIALIZATION_LDFLAGS = -L/usr/local/lib -R/usr/local/lib +-BOOST_SERIALIZATION_LIBS = -lboost_serialization-mt +-CC = gcc ++BOOST_SERIALIZATION_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib ++BOOST_SERIALIZATION_LIBS = -lboost_serialization ++CC = /opt/csw/bin/gcc-4.6 + CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXCPP = g++ -E ++CFLAGS = -O2 -pipe -m32 -march=pentiumpro ++CPP = /opt/csw/bin/gcc-4.6 -E ++CPPFLAGS = -I/opt/csw/gxx/include -I/opt/csw/include ++CXX = /opt/csw/bin/g++-4.6 ++CXXCPP = /opt/csw/bin/g++-4.6 -E + CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -D_GNU_SOURCE -Wall -O2 ++CXXFLAGS = -D_REENTRANT -O2 -pipe -m32 -march=pentiumpro -Wall -O2 + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +-DISTCHECK_CONFIGURE_FLAGS = '--with-boost=' ++DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw/gxx' + DSYMUTIL = + DUMPBIN = +-DYNLINKFLAGS = -rdynamic ++DYNLINKFLAGS = + ECHO_C = + ECHO_N = -n + ECHO_T = +-EGREP = /bin/grep -E ++EGREP = /opt/csw/bin/ggrep -E + EXEEXT = +-FGREP = /bin/grep -F +-GREP = /bin/grep +-INSTALL = /usr/bin/install -c ++FGREP = /opt/csw/bin/ggrep -F ++GREP = /opt/csw/bin/ggrep ++INSTALL = /opt/csw/bin/ginstall -c + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LD = /usr/bin/ld -m elf_x86_64 +-LDFLAGS = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib ++LD = /usr/ccs/bin/ld ++LDFLAGS = -L/opt/csw/lib -L/opt/csw/gxx/lib + LEX = flex + LEXLIB = -lfl + LEX_OUTPUT_ROOT = lex.yy + LIBDL = -ldl +-LIBLDAP = ldap_r ++LIBLDAP = + LIBOBJS = +-LIBOPENDBX = opendbx +-LIBS = -lz ++LIBOPENDBX = ++LIBS = -lposix4 -lresolv -lnsl -lsocket -lpthread -lrt -lz + LIBTOOL = $(SHELL) $(top_builddir)/libtool + LIPO = + LN_S = ln -s + LTLIBOBJS = +-LUA_CFLAGS = -I/usr/include/lua5.1 +-LUA_LIBS = -llua5.1 +-MAKEINFO = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run makeinfo +-MKDIR_P = /bin/mkdir -p +-MYSQL_incdir = /usr/include/mysql +-MYSQL_lib = +-NM = /usr/bin/nm -B ++LUA_CFLAGS = ++LUA_LIBS = ++MAKEINFO = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run makeinfo ++MKDIR_P = /opt/csw/bin/gmkdir -p ++MYSQL_incdir = /opt/csw/include/mysql ++MYSQL_lib = -L/opt/csw/lib ++NM = /usr/ccs/bin/nm -p + NMEDIT = +-OBJDUMP = objdump ++OBJDUMP = false + OBJEXT = o + OTOOL = + OTOOL64 = +@@ -122,78 +122,78 @@ PACKAGE_TARNAME = + PACKAGE_URL = + PACKAGE_VERSION = + PATH_SEPARATOR = : +-PGSQL_incdir = /opt/postgresql/include +-PGSQL_lib = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib +-PKG_CONFIG = /usr/bin/pkg-config ++PGSQL_incdir = ++PGSQL_lib = ++PKG_CONFIG = + RANLIB = ranlib +-SED = /bin/sed ++SED = /opt/csw/bin/gsed + SET_MAKE = + SHELL = /bin/bash +-SQLITE3_CFLAGS = +-SQLITE3_LIBS = -lsqlite3 +-SQLITE_incdir = /usr/include/ ++SQLITE3_CFLAGS = ++SQLITE3_LIBS = ++SQLITE_incdir = + SQLITE_lib = + STRIP = strip +-THREADFLAGS = -pthread +-UNIXODBC_incdir = /usr/include/ ++THREADFLAGS = ++UNIXODBC_incdir = + UNIXODBC_lib = + VERSION = 3.0.1 + YACC = bison -y + YFLAGS = +-abs_builddir = /home/vagrant/pdns-auth-3.0/codedocs +-abs_srcdir = /home/vagrant/pdns-auth-3.0/codedocs +-abs_top_builddir = /home/vagrant/pdns-auth-3.0 +-abs_top_srcdir = /home/vagrant/pdns-auth-3.0 +-ac_ct_CC = gcc +-ac_ct_CXX = g++ ++abs_builddir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/codedocs ++abs_srcdir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/codedocs ++abs_top_builddir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1 ++abs_top_srcdir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1 ++ac_ct_CC = /opt/csw/bin/gcc-4.6 ++ac_ct_CXX = + ac_ct_DUMPBIN = + am__include = include + am__leading_dot = . + am__quote = + am__tar = ${AMTAR} chof - "$$tardir" + am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = x86_64-unknown-linux-gnu ++bindir = /opt/csw/bin ++build = i386-pc-solaris2.10 + build_alias = +-build_cpu = x86_64 +-build_os = linux-gnu +-build_vendor = unknown ++build_cpu = i386 ++build_os = solaris2.10 ++build_vendor = pc + builddir = . +-datadir = ${datarootdir} ++datadir = /opt/csw/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = x86_64-unknown-linux-gnu ++exec_prefix = /opt/csw ++host = i386-pc-solaris2.10 + host_alias = +-host_cpu = x86_64 +-host_os = linux-gnu +-host_vendor = unknown ++host_cpu = i386 ++host_os = solaris2.10 ++host_vendor = pc + htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = ${SHELL} /home/vagrant/pdns-auth-3.0/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++includedir = /opt/csw/include ++infodir = /opt/csw/share/info ++install_sh = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/install-sh ++libdir = /opt/csw/lib ++libexecdir = /opt/csw/libexec + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var ++localstatedir = /var/opt/csw + lt_ECHO = echo +-mandir = ${datarootdir}/man +-mkdir_p = /bin/mkdir -p +-moduledirs = mysqlbackend mydnsbackend gmysqlbackend mongodbbackend luabackend gpgsqlbackend xdbbackend pipebackend oraclebackend pipebackend pdnsbackend db2backend odbcbackend ldapbackend gsqlitebackend gsqlite3backend geobackend goraclebackend opendbxbackend godbcbackend +-modulelibs = -lmysqlclient -lz -lmysqlclient -lz -lmysqlclient -L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system -llua5.1 -lpq -lssl -lcrypto -lcrypt -lresolv -lnsl -ltdb -L$(ORACLE_HOME)/lib -lclntsh -lmysqlclient -lldap_r -lsqlite -lsqlite3 -L$(ORACLE_HOME)/lib -lclient9 -lclntst9 -lopendbx +-moduleobjects = ../modules/mysqlbackend/mysqlcbackend.o ../modules/mydnsbackend/mydnsbackend.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/mongodbbackend/mongodbbackend.o ../modules/mongodbbackend/minimal.o ../modules/mongodbbackend/slave.o ../modules/mongodbbackend/master.o ../modules/mongodbbackend/reload.o ../modules/mongodbbackend/private.o ../modules/mongodbbackend/dnssec.o ../modules/mongodbbackend/supermaster.o ../modules/mongodbbackend/crc32.o ../modules/luabackend/luabackend.o ../modules/luabackend/minimal.o ../modules/luabackend/reload.o ../modules/luabackend/lua_functions.o ../modules/luabackend/master.o ../modules/luabackend/private.o ../modules/luabackend/slave.o ../modules/luabackend/supermaster.o ../modules/luabackend/dnssec.o ../modules/gpgsqlbackend/gpgsqlbackend.o ../modules/gpgsqlbackend/spgsql.o ../modules/xdbbackend/xdbbackend.o ../modules/xdbbackend/xtdb.o ../modules/pipebackend/coprocess.o ../modules/pipeback end/pipebackend.o ../modules/oraclebackend/oraclebackend.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/pdnsbackend/pdnsbackend.o ../modules/db2backend/DB2Backend.o ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/gsqlitebackend/gsqlitebackend.o ../modules/gsqlitebackend/ssqlite.o ../modules/gsqlite3backend/gsqlite3backend.o ../modules/gsqlite3backend/ssqlite3.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/goraclebackend/goraclebackend.o ../modules/goraclebackend/soracle.o ../modules/opendbxbackend/odbxbackend.o ../modules/opendbxbackend/odbxprivate.o ++mandir = /opt/csw/share/man ++mkdir_p = /opt/csw/bin/gmkdir -p ++moduledirs = gmysqlbackend geobackend pipebackend ++modulelibs = -lmysqlclient ++moduleobjects = ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local ++prefix = /opt/csw + program_transform_name = s,x,x, + programdescend = pdns + psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com ++sbindir = /opt/csw/sbin ++sharedstatedir = /opt/csw/share + socketdir = /var/run + srcdir = . +-sysconfdir = ${prefix}/etc ++sysconfdir = /etc//opt/csw/pdns + target_alias = + top_build_prefix = ../ + top_builddir = .. +diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c +index 67b52a7..8106b74 100644 +--- a/pdns/ext/polarssl/library/net.c ++++ b/pdns/ext/polarssl/library/net.c +@@ -59,6 +59,8 @@ static int wsa_init_done = 0; + #include + #elif defined(__APPLE__) + #include ++#elif defined(sun) ++#include + #else + #include + #endif +-- +1.7.9 + Added: csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch 2012-04-03 20:43:00 UTC (rev 17595) @@ -0,0 +1,28 @@ +From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:27:38 +0200 +Subject: [PATCH 5/5] Include correct sys/ethernet.h + +--- + pdns/dnspcap.hh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh +index 66e07b9..60596ff 100644 +--- a/pdns/dnspcap.hh ++++ b/pdns/dnspcap.hh +@@ -10,7 +10,11 @@ + #include + #include + #include ++#ifdef sun ++#include ++#else + #include ++#endif + #include + #include + #include "namespaces.hh" +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 3 23:02:39 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 21:02:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17596] csw/mgar/pkg/powerdns/trunk/files/ 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch Message-ID: Revision: 17596 http://gar.svn.sourceforge.net/gar/?rev=17596&view=rev Author: wilbury Date: 2012-04-03 21:02:38 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Build for (at the moment) Solaris 10/i386 Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch Modified: csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-03 20:43:00 UTC (rev 17595) +++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-03 21:02:38 UTC (rev 17596) @@ -4,253 +4,9 @@ Subject: [PATCH 4/5] Use sys/isa_defs.h instead of endian.h --- - codedocs/Makefile | 160 +++++++++++++++++++------------------- pdns/ext/polarssl/library/net.c | 2 + - 2 files changed, 82 insertions(+), 80 deletions(-) + 1 file changed, 2 insertions(+), 0 deletions(-) -diff --git a/codedocs/Makefile b/codedocs/Makefile -index a8dc049..279bc07 100644 ---- a/codedocs/Makefile -+++ b/codedocs/Makefile -@@ -31,8 +31,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = x86_64-unknown-linux-gnu --host_triplet = x86_64-unknown-linux-gnu -+build_triplet = i386-pc-solaris2.10 -+host_triplet = i386-pc-solaris2.10 - subdir = codedocs - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -47,70 +47,70 @@ CONFIG_CLEAN_VPATH_FILES = - SOURCES = - DIST_SOURCES = - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run aclocal-1.11 --AMTAR = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run tar -+ACLOCAL = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run aclocal-1.11 -+AMTAR = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run tar - AR = ar --AUTOCONF = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run autoconf --AUTOHEADER = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run autoheader --AUTOMAKE = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run automake-1.11 --AWK = mawk --BOOST_CPPFLAGS = --BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/usr/local/lib -R/usr/local/lib --BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options-mt -+AUTOCONF = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run automake-1.11 -+AWK = gawk -+BOOST_CPPFLAGS = -I/opt/csw/gxx/include -+BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib -+BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options - BOOST_ROOT = --BOOST_SERIALIZATION_LDFLAGS = -L/usr/local/lib -R/usr/local/lib --BOOST_SERIALIZATION_LIBS = -lboost_serialization-mt --CC = gcc -+BOOST_SERIALIZATION_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib -+BOOST_SERIALIZATION_LIBS = -lboost_serialization -+CC = /opt/csw/bin/gcc-4.6 - CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E -+CFLAGS = -O2 -pipe -m32 -march=pentiumpro -+CPP = /opt/csw/bin/gcc-4.6 -E -+CPPFLAGS = -I/opt/csw/gxx/include -I/opt/csw/include -+CXX = /opt/csw/bin/g++-4.6 -+CXXCPP = /opt/csw/bin/g++-4.6 -E - CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -D_GNU_SOURCE -Wall -O2 -+CXXFLAGS = -D_REENTRANT -O2 -pipe -m32 -march=pentiumpro -Wall -O2 - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps --DISTCHECK_CONFIGURE_FLAGS = '--with-boost=' -+DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw/gxx' - DSYMUTIL = - DUMPBIN = --DYNLINKFLAGS = -rdynamic -+DYNLINKFLAGS = - ECHO_C = - ECHO_N = -n - ECHO_T = --EGREP = /bin/grep -E -+EGREP = /opt/csw/bin/ggrep -E - EXEEXT = --FGREP = /bin/grep -F --GREP = /bin/grep --INSTALL = /usr/bin/install -c -+FGREP = /opt/csw/bin/ggrep -F -+GREP = /opt/csw/bin/ggrep -+INSTALL = /opt/csw/bin/ginstall -c - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = $(install_sh) -c -s --LD = /usr/bin/ld -m elf_x86_64 --LDFLAGS = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib -+LD = /usr/ccs/bin/ld -+LDFLAGS = -L/opt/csw/lib -L/opt/csw/gxx/lib - LEX = flex - LEXLIB = -lfl - LEX_OUTPUT_ROOT = lex.yy - LIBDL = -ldl --LIBLDAP = ldap_r -+LIBLDAP = - LIBOBJS = --LIBOPENDBX = opendbx --LIBS = -lz -+LIBOPENDBX = -+LIBS = -lposix4 -lresolv -lnsl -lsocket -lpthread -lrt -lz - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LIPO = - LN_S = ln -s - LTLIBOBJS = --LUA_CFLAGS = -I/usr/include/lua5.1 --LUA_LIBS = -llua5.1 --MAKEINFO = ${SHELL} /home/vagrant/pdns-auth-3.0/missing --run makeinfo --MKDIR_P = /bin/mkdir -p --MYSQL_incdir = /usr/include/mysql --MYSQL_lib = --NM = /usr/bin/nm -B -+LUA_CFLAGS = -+LUA_LIBS = -+MAKEINFO = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/missing --run makeinfo -+MKDIR_P = /opt/csw/bin/gmkdir -p -+MYSQL_incdir = /opt/csw/include/mysql -+MYSQL_lib = -L/opt/csw/lib -+NM = /usr/ccs/bin/nm -p - NMEDIT = --OBJDUMP = objdump -+OBJDUMP = false - OBJEXT = o - OTOOL = - OTOOL64 = -@@ -122,78 +122,78 @@ PACKAGE_TARNAME = - PACKAGE_URL = - PACKAGE_VERSION = - PATH_SEPARATOR = : --PGSQL_incdir = /opt/postgresql/include --PGSQL_lib = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib --PKG_CONFIG = /usr/bin/pkg-config -+PGSQL_incdir = -+PGSQL_lib = -+PKG_CONFIG = - RANLIB = ranlib --SED = /bin/sed -+SED = /opt/csw/bin/gsed - SET_MAKE = - SHELL = /bin/bash --SQLITE3_CFLAGS = --SQLITE3_LIBS = -lsqlite3 --SQLITE_incdir = /usr/include/ -+SQLITE3_CFLAGS = -+SQLITE3_LIBS = -+SQLITE_incdir = - SQLITE_lib = - STRIP = strip --THREADFLAGS = -pthread --UNIXODBC_incdir = /usr/include/ -+THREADFLAGS = -+UNIXODBC_incdir = - UNIXODBC_lib = - VERSION = 3.0.1 - YACC = bison -y - YFLAGS = --abs_builddir = /home/vagrant/pdns-auth-3.0/codedocs --abs_srcdir = /home/vagrant/pdns-auth-3.0/codedocs --abs_top_builddir = /home/vagrant/pdns-auth-3.0 --abs_top_srcdir = /home/vagrant/pdns-auth-3.0 --ac_ct_CC = gcc --ac_ct_CXX = g++ -+abs_builddir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/codedocs -+abs_srcdir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/codedocs -+abs_top_builddir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1 -+abs_top_srcdir = /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1 -+ac_ct_CC = /opt/csw/bin/gcc-4.6 -+ac_ct_CXX = - ac_ct_DUMPBIN = - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - --bindir = ${exec_prefix}/bin --build = x86_64-unknown-linux-gnu -+bindir = /opt/csw/bin -+build = i386-pc-solaris2.10 - build_alias = --build_cpu = x86_64 --build_os = linux-gnu --build_vendor = unknown -+build_cpu = i386 -+build_os = solaris2.10 -+build_vendor = pc - builddir = . --datadir = ${datarootdir} -+datadir = /opt/csw/share - datarootdir = ${prefix}/share - docdir = ${datarootdir}/doc/${PACKAGE} - dvidir = ${docdir} --exec_prefix = ${prefix} --host = x86_64-unknown-linux-gnu -+exec_prefix = /opt/csw -+host = i386-pc-solaris2.10 - host_alias = --host_cpu = x86_64 --host_os = linux-gnu --host_vendor = unknown -+host_cpu = i386 -+host_os = solaris2.10 -+host_vendor = pc - htmldir = ${docdir} --includedir = ${prefix}/include --infodir = ${datarootdir}/info --install_sh = ${SHELL} /home/vagrant/pdns-auth-3.0/install-sh --libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec -+includedir = /opt/csw/include -+infodir = /opt/csw/share/info -+install_sh = ${SHELL} /home/wilbury/b/powerdns/trunk/work/solaris10-i386/build-isa-pentium_pro/pdns-3.0.1/install-sh -+libdir = /opt/csw/lib -+libexecdir = /opt/csw/libexec - localedir = ${datarootdir}/locale --localstatedir = ${prefix}/var -+localstatedir = /var/opt/csw - lt_ECHO = echo --mandir = ${datarootdir}/man --mkdir_p = /bin/mkdir -p --moduledirs = mysqlbackend mydnsbackend gmysqlbackend mongodbbackend luabackend gpgsqlbackend xdbbackend pipebackend oraclebackend pipebackend pdnsbackend db2backend odbcbackend ldapbackend gsqlitebackend gsqlite3backend geobackend goraclebackend opendbxbackend godbcbackend --modulelibs = -lmysqlclient -lz -lmysqlclient -lz -lmysqlclient -L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system -llua5.1 -lpq -lssl -lcrypto -lcrypt -lresolv -lnsl -ltdb -L$(ORACLE_HOME)/lib -lclntsh -lmysqlclient -lldap_r -lsqlite -lsqlite3 -L$(ORACLE_HOME)/lib -lclient9 -lclntst9 -lopendbx --moduleobjects = ../modules/mysqlbackend/mysqlcbackend.o ../modules/mydnsbackend/mydnsbackend.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/mongodbbackend/mongodbbackend.o ../modules/mongodbbackend/minimal.o ../modules/mongodbbackend/slave.o ../modules/mongodbbackend/master.o ../modules/mongodbbackend/reload.o ../modules/mongodbbackend/private.o ../modules/mongodbbackend/dnssec.o ../modules/mongodbbackend/supermaster.o ../modules/mongodbbackend/crc32.o ../modules/luabackend/luabackend.o ../modules/luabackend/minimal.o ../modules/luabackend/reload.o ../modules/luabackend/lua_functions.o ../modules/luabackend/master.o ../modules/luabackend/private.o ../modules/luabackend/slave.o ../modules/luabackend/supermaster.o ../modules/luabackend/dnssec.o ../modules/gpgsqlbackend/gpgsqlbackend.o ../modules/gpgsqlbackend/spgsql.o ../modules/xdbbackend/xdbbackend.o ../modules/xdbbackend/xtdb.o ../modules/pipebackend/coprocess.o ../modules/pipeback end/pipebackend.o ../modules/oraclebackend/oraclebackend.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/pdnsbackend/pdnsbackend.o ../modules/db2backend/DB2Backend.o ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/gsqlitebackend/gsqlitebackend.o ../modules/gsqlitebackend/ssqlite.o ../modules/gsqlite3backend/gsqlite3backend.o ../modules/gsqlite3backend/ssqlite3.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/goraclebackend/goraclebackend.o ../modules/goraclebackend/soracle.o ../modules/opendbxbackend/odbxbackend.o ../modules/opendbxbackend/odbxprivate.o -+mandir = /opt/csw/share/man -+mkdir_p = /opt/csw/bin/gmkdir -p -+moduledirs = gmysqlbackend geobackend pipebackend -+modulelibs = -lmysqlclient -+moduleobjects = ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o - oldincludedir = /usr/include - pdfdir = ${docdir} --prefix = /usr/local -+prefix = /opt/csw - program_transform_name = s,x,x, - programdescend = pdns - psdir = ${docdir} --sbindir = ${exec_prefix}/sbin --sharedstatedir = ${prefix}/com -+sbindir = /opt/csw/sbin -+sharedstatedir = /opt/csw/share - socketdir = /var/run - srcdir = . --sysconfdir = ${prefix}/etc -+sysconfdir = /etc//opt/csw/pdns - target_alias = - top_build_prefix = ../ - top_builddir = .. diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c index 67b52a7..8106b74 100644 --- a/pdns/ext/polarssl/library/net.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 3 23:25:28 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 21:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17597] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17597 http://gar.svn.sourceforge.net/gar/?rev=17597&view=rev Author: wilbury Date: 2012-04-03 21:25:28 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Build only stub LUA hooks in pdns recursor. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:02:38 UTC (rev 17596) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:25:28 UTC (rev 17597) @@ -19,6 +19,7 @@ DISTFILES += cswpdns PATCHFILES += 0003-Make-checking-for-LUA-behave-correctly.patch PATCHFILES += 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch +PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch PATCHFILES += 0005-Include-correct-sys-ethernet.h.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) @@ -43,7 +44,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns -CONFIGURE_ARGS += --disable-recursor CONFIGURE_ARGS += --with-lua=no CONFIGURE_ARGS += --with-boost=/opt/csw/gxx CONFIGURE_ARGS += --with-mysql=$(prefix) Added: csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-03 21:25:28 UTC (rev 17597) @@ -0,0 +1,25 @@ +From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 23:19:42 +0200 +Subject: [PATCH] Build only stub LUA pdns recursor implementation. Do not + check for LIBDIR + +--- + pdns/lua-pdns-recursor.cc | 2 +- + 1 file changed, 1 insertion(+), 0 deletions(-) + +diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc +index 5e0dd7f..eb6c380 100644 +--- a/pdns/lua-pdns-recursor.cc ++++ b/pdns/lua-pdns-recursor.cc +@@ -1,6 +1,6 @@ + #include "lua-pdns-recursor.hh" + +-#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR) ++#if !defined(PDNS_ENABLE_LUA) + + // stub implementation + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 3 23:27:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 21:27:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17598] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17598 http://gar.svn.sourceforge.net/gar/?rev=17598&view=rev Author: wilbury Date: 2012-04-03 21:27:16 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct patchfile numbering Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:25:28 UTC (rev 17597) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:27:16 UTC (rev 17598) @@ -19,7 +19,7 @@ DISTFILES += cswpdns PATCHFILES += 0003-Make-checking-for-LUA-behave-correctly.patch PATCHFILES += 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch -PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch +PATCHFILES += 0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch PATCHFILES += 0005-Include-correct-sys-ethernet.h.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 3 23:50:35 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 21:50:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17599] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17599 http://gar.svn.sourceforge.net/gar/?rev=17599&view=rev Author: wilbury Date: 2012-04-03 21:50:35 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct PACKAGES and dependencies Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:27:16 UTC (rev 17598) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:50:35 UTC (rev 17599) @@ -52,15 +52,46 @@ EXTRA_INC = /opt/csw/gxx/include LDFLAGS += -L/opt/csw/gxx/lib -RUNTIME_DEP_PKGS_CSWpdns += CSWzlib +RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4g++rt +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 BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel +PACKAGES += CSWlibgeobackend +CATALOGNAME_CSWlibgeobackend = libgeobackend +PKGFILES_CSWlibgeobackend += $(call baseisadirs,$(libdir),libgeobackend\.so) +PKGFILES_CSWlibgeobackend += $(call baseisadirs,$(libdir),libgeobackend\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibz1 +SPKG_DESC_CSWlibgeobackend += $(DESCRIPTION), libgeobackend.so +RUNTIME_DEP_PKGS_CSWpdns += CSWlibgeobackend + +PACKAGES += CSWlibgmysqlbackend +CATALOGNAME_CSWlibgmysqlbackend = libgmysqlbackend +PKGFILES_CSWlibgmysqlbackend += $(call baseisadirs,$(libdir),libgmysqlbackend\.so) +PKGFILES_CSWlibgmysqlbackend += $(call baseisadirs,$(libdir),libgmysqlbackend\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibz1 +SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so +RUNTIME_DEP_PKGS_CSWpdns += CSWlibgmysqlbackend + +PACKAGES += CSWlibpipebackend +CATALOGNAME_CSWlibpipebackend = libpipebackend +PKGFILES_CSWlibpipebackend += $(call baseisadirs,$(libdir),libpipebackend\.so) +PKGFILES_CSWlibpipebackend += $(call baseisadirs,$(libdir),libpipebackend\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibz1 +SPKG_DESC_CSWlibpipebackend += $(DESCRIPTION), libpipebackend.so +RUNTIME_DEP_PKGS_CSWpdns += CSWlibpipebackend + INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 00:51:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 22:51:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17600] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17600 http://gar.svn.sourceforge.net/gar/?rev=17600&view=rev Author: wilbury Date: 2012-04-03 22:51:31 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 21:50:35 UTC (rev 17599) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 22:51:31 UTC (rev 17600) @@ -48,7 +48,7 @@ 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/mysql +CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include EXTRA_INC = /opt/csw/gxx/include LDFLAGS += -L/opt/csw/gxx/lib @@ -82,15 +82,9 @@ SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so RUNTIME_DEP_PKGS_CSWpdns += CSWlibgmysqlbackend -PACKAGES += CSWlibpipebackend -CATALOGNAME_CSWlibpipebackend = libpipebackend -PKGFILES_CSWlibpipebackend += $(call baseisadirs,$(libdir),libpipebackend\.so) -PKGFILES_CSWlibpipebackend += $(call baseisadirs,$(libdir),libpipebackend\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibpipebackend += CSWlibz1 -SPKG_DESC_CSWlibpipebackend += $(DESCRIPTION), libpipebackend.so -RUNTIME_DEP_PKGS_CSWpdns += CSWlibpipebackend +# These are not errors! +CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so +CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 01:07:51 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 23:07:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17601] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17601 http://gar.svn.sourceforge.net/gar/?rev=17601&view=rev Author: wilbury Date: 2012-04-03 23:07:51 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 22:51:31 UTC (rev 17600) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 23:07:51 UTC (rev 17601) @@ -84,7 +84,9 @@ # These are not errors! CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so +CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so +CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 01:30:12 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 23:30:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17602] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17602 http://gar.svn.sourceforge.net/gar/?rev=17602&view=rev Author: wilbury Date: 2012-04-03 23:30:12 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 23:07:51 UTC (rev 17601) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 23:30:12 UTC (rev 17602) @@ -83,10 +83,10 @@ RUNTIME_DEP_PKGS_CSWpdns += CSWlibgmysqlbackend # These are not errors! -CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so -CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so -CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted +#CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so +#CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted +#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so +#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 01:40:26 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 03 Apr 2012 23:40:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17603] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17603 http://gar.svn.sourceforge.net/gar/?rev=17603&view=rev Author: wilbury Date: 2012-04-03 23:40:26 +0000 (Tue, 03 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 23:30:12 UTC (rev 17602) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-03 23:40:26 UTC (rev 17603) @@ -31,7 +31,6 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CATALOGNAME = powerdns LICENSE = $(FILEDIR)/LICENSE GARCOMPILER = GNU @@ -52,10 +51,12 @@ EXTRA_INC = /opt/csw/gxx/include LDFLAGS += -L/opt/csw/gxx/lib +PACKAGES = CSWpdns +CATALOGNAME_CSWpdns = powerdns +SPKG_DESC_CSWpdns = PowerDNS RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 -RUNTIME_DEP_PKGS_CSWpdns += CSWgcc4corert 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 @@ -69,7 +70,6 @@ RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibz1 SPKG_DESC_CSWlibgeobackend += $(DESCRIPTION), libgeobackend.so -RUNTIME_DEP_PKGS_CSWpdns += CSWlibgeobackend PACKAGES += CSWlibgmysqlbackend CATALOGNAME_CSWlibgmysqlbackend = libgmysqlbackend @@ -80,7 +80,6 @@ RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibz1 SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so -RUNTIME_DEP_PKGS_CSWpdns += CSWlibgmysqlbackend # These are not errors! #CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Apr 4 08:35:21 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 04 Apr 2012 06:35:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17604] csw/mgar/pkg/znc/trunk/Makefile Message-ID: Revision: 17604 http://gar.svn.sourceforge.net/gar/?rev=17604&view=rev Author: janholzh Date: 2012-04-04 06:35:21 +0000 (Wed, 04 Apr 2012) Log Message: ----------- znc/trunk: remove g++ from deb Modified Paths: -------------- csw/mgar/pkg/znc/trunk/Makefile Modified: csw/mgar/pkg/znc/trunk/Makefile =================================================================== --- csw/mgar/pkg/znc/trunk/Makefile 2012-04-03 23:40:26 UTC (rev 17603) +++ csw/mgar/pkg/znc/trunk/Makefile 2012-04-04 06:35:21 UTC (rev 17604) @@ -33,7 +33,6 @@ PKGFILES_CSWznc-dev += /opt/csw/lib/pkgconfig/znc.pc PKGFILES_CSWznc-dev += /opt/csw/include/znc/.* RUNTIME_DEP_PKGS_CSWznc-dev += CSWznc -RUNTIME_DEP_PKGS_CSWznc-dev += CSWgcc4g++ RUNTIME_DEP_PKGS_CSWznc-dev += CSWlibcares-dev # File name regex to get notifications about upstream software releases This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 17:48:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 15:48:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17605] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17605 http://gar.svn.sourceforge.net/gar/?rev=17605&view=rev Author: wilbury Date: 2012-04-04 15:48:30 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies and reinplacements. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 06:35:21 UTC (rev 17604) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 15:48:30 UTC (rev 17605) @@ -9,18 +9,16 @@ backends. Current backends include MySQL, PostgreSQL, bind, etc. endef -# XXX: Open Issues: -# - build recursor - MASTER_SITES = http://downloads.powerdns.com/releases/ SPKG_SOURCEURL = http://www.powerdns.com/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE DISTFILES += cswpdns -PATCHFILES += 0003-Make-checking-for-LUA-behave-correctly.patch -PATCHFILES += 0004-Use-sys-isa_defs.h-instead-of-endian.h.patch -PATCHFILES += 0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch -PATCHFILES += 0005-Include-correct-sys-ethernet.h.patch +PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch +PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch +PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch +PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch +PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) @@ -37,18 +35,30 @@ #PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 #PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGING_PLATFORMS += solaris10-i386 +NORUNPATH = 1 +REINPLACEMENTS += usrlocaletc +REINPLACE_MATCH_usrlocaletc = /usr/local/etc +REINPLACE_WITH_usrlocaletc = /etc/$(prefix)/pdns +REINPLACE_FILES_usrlocaletc = /etc/$(prefix)/pdns/pdns.conf.CSW + # PowerDNS does not have any "test" target SKIPTEST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/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-modules="ldap geo gmysql" EXTRA_INC = /opt/csw/gxx/include + +# Extra libs for LDAP backend +EXTRA_LIB = lber + LDFLAGS += -L/opt/csw/gxx/lib PACKAGES = CSWpdns @@ -60,6 +70,8 @@ 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 +RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel PACKAGES += CSWlibgeobackend @@ -82,10 +94,11 @@ SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so # These are not errors! -#CHECKPKG_OVERRIDES_CSWlibgeobackend += soname-equals-filename|file=/opt/csw/lib/libgeobackend.so -#CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted -#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += soname-equals-filename|file=/opt/csw/lib/libgmysqlbackend.so -#CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWpdns += file-with-bad-content|/usr/local|root/etc/opt/csw/pdns/pdns.conf.CSW +CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns +CHECKPKG_OVERRIDES_CSWpdns += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf Copied: csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch) =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -0,0 +1,25 @@ +From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:06:09 +0200 +Subject: [PATCH 1/4] Make checking for LUA behave correctly. + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 1067417..55b5d20 100755 +--- a/configure ++++ b/configure +@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; } + + # Check whether --with-lua was given. + if test "${with_lua+set}" = set; then : +- withval=$with_lua; WITH_LUA=$withval] ++ withval=$with_lua; WITH_LUA=$withval + else + WITH_LUA=yes + fi +-- +1.7.9 + Copied: csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch) =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -0,0 +1,25 @@ +From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:12:41 +0200 +Subject: [PATCH 2/4] Use sys/isa_defs.h instead of endian.h + +--- + pdns/ext/polarssl/library/net.c | 2 + + 1 file changed, 2 insertions(+), 0 deletions(-) + +diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c +index 67b52a7..8106b74 100644 +--- a/pdns/ext/polarssl/library/net.c ++++ b/pdns/ext/polarssl/library/net.c +@@ -59,6 +59,8 @@ static int wsa_init_done = 0; + #include + #elif defined(__APPLE__) + #include ++#elif defined(sun) ++#include + #else + #include + #endif +-- +1.7.9 + Copied: csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch) =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -0,0 +1,28 @@ +From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 22:27:38 +0200 +Subject: [PATCH 3/4] Include correct sys/ethernet.h + +--- + pdns/dnspcap.hh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh +index 66e07b9..60596ff 100644 +--- a/pdns/dnspcap.hh ++++ b/pdns/dnspcap.hh +@@ -10,7 +10,11 @@ + #include + #include + #include ++#ifdef sun ++#include ++#else + #include ++#endif + #include + #include + #include "namespaces.hh" +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 06:35:21 UTC (rev 17604) +++ csw/mgar/pkg/powerdns/trunk/files/0003-Make-checking-for-LUA-behave-correctly.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -1,25 +0,0 @@ -From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:06:09 +0200 -Subject: [PATCH 3/5] Make checking for LUA behave correctly. - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 1067417..55b5d20 100755 ---- a/configure -+++ b/configure -@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; } - - # Check whether --with-lua was given. - if test "${with_lua+set}" = set; then : -- withval=$with_lua; WITH_LUA=$withval] -+ withval=$with_lua; WITH_LUA=$withval - else - WITH_LUA=yes - fi --- -1.7.9 - Copied: csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch (from rev 17601, csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch) =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -0,0 +1,25 @@ +From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Tue, 3 Apr 2012 23:19:42 +0200 +Subject: [PATCH 4/4] Build only stub LUA pdns recursor implementation. Do not + check for LIBDIR + +--- + pdns/lua-pdns-recursor.cc | 2 +- + 1 file changed, 1 insertion(+), 0 deletions(-) + +diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc +index 5e0dd7f..eb6c380 100644 +--- a/pdns/lua-pdns-recursor.cc ++++ b/pdns/lua-pdns-recursor.cc +@@ -1,6 +1,6 @@ + #include "lua-pdns-recursor.hh" + +-#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR) ++#if !defined(PDNS_ENABLE_LUA) + + // stub implementation + +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 06:35:21 UTC (rev 17604) +++ csw/mgar/pkg/powerdns/trunk/files/0004-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -1,25 +0,0 @@ -From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:12:41 +0200 -Subject: [PATCH 4/5] Use sys/isa_defs.h instead of endian.h - ---- - pdns/ext/polarssl/library/net.c | 2 + - 1 file changed, 2 insertions(+), 0 deletions(-) - -diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c -index 67b52a7..8106b74 100644 ---- a/pdns/ext/polarssl/library/net.c -+++ b/pdns/ext/polarssl/library/net.c -@@ -59,6 +59,8 @@ static int wsa_init_done = 0; - #include - #elif defined(__APPLE__) - #include -+#elif defined(sun) -+#include - #else - #include - #endif --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch 2012-04-04 06:35:21 UTC (rev 17604) +++ csw/mgar/pkg/powerdns/trunk/files/0005-Include-correct-sys-ethernet.h.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -1,28 +0,0 @@ -From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:27:38 +0200 -Subject: [PATCH 5/5] Include correct sys/ethernet.h - ---- - pdns/dnspcap.hh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh -index 66e07b9..60596ff 100644 ---- a/pdns/dnspcap.hh -+++ b/pdns/dnspcap.hh -@@ -10,7 +10,11 @@ - #include - #include - #include -+#ifdef sun -+#include -+#else - #include -+#endif - #include - #include - #include "namespaces.hh" --- -1.7.9 - Added: csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -0,0 +1,25 @@ +From f0c281399bfdd40dd9d02d5a3fe07417dd20b070 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Wed, 4 Apr 2012 13:12:24 +0200 +Subject: [PATCH] Use correct namespace for timegm() + +--- + modules/ldapbackend/utils.hh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh +index ba60f9f..25392c3 100644 +--- a/modules/ldapbackend/utils.hh ++++ b/modules/ldapbackend/utils.hh +@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str ) + + if( tmp != NULL && *tmp == 0 ) + { +- return timegm( &tm ); ++ return Utility::timegm( &tm ); + } + + return 0; +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 06:35:21 UTC (rev 17604) +++ csw/mgar/pkg/powerdns/trunk/files/0006-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-04 15:48:30 UTC (rev 17605) @@ -1,25 +0,0 @@ -From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 23:19:42 +0200 -Subject: [PATCH] Build only stub LUA pdns recursor implementation. Do not - check for LIBDIR - ---- - pdns/lua-pdns-recursor.cc | 2 +- - 1 file changed, 1 insertion(+), 0 deletions(-) - -diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc -index 5e0dd7f..eb6c380 100644 ---- a/pdns/lua-pdns-recursor.cc -+++ b/pdns/lua-pdns-recursor.cc -@@ -1,6 +1,6 @@ - #include "lua-pdns-recursor.hh" - --#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR) -+#if !defined(PDNS_ENABLE_LUA) - - // stub implementation - --- -1.7.9 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 20:20:52 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 18:20:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17606] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17606 http://gar.svn.sourceforge.net/gar/?rev=17606&view=rev Author: wilbury Date: 2012-04-04 18:20:52 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Correct dependencies and reinplacements and libdir. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 15:48:30 UTC (rev 17605) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 18:20:52 UTC (rev 17606) @@ -30,23 +30,19 @@ # UPSTREAM_MASTER_SITES = LICENSE = $(FILEDIR)/LICENSE +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc GARCOMPILER = GNU -#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris10-i386 NORUNPATH = 1 REINPLACEMENTS += usrlocaletc REINPLACE_MATCH_usrlocaletc = /usr/local/etc -REINPLACE_WITH_usrlocaletc = /etc/$(prefix)/pdns -REINPLACE_FILES_usrlocaletc = /etc/$(prefix)/pdns/pdns.conf.CSW +REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns +REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist -# PowerDNS does not have any "test" target -SKIPTEST = 1 - 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 @@ -58,9 +54,11 @@ # Extra libs for LDAP backend EXTRA_LIB = lber - LDFLAGS += -L/opt/csw/gxx/lib +# PowerDNS does not have any "test" target +SKIPTEST = 1 + PACKAGES = CSWpdns CATALOGNAME_CSWpdns = powerdns SPKG_DESC_CSWpdns = PowerDNS @@ -74,31 +72,8 @@ RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel -PACKAGES += CSWlibgeobackend -CATALOGNAME_CSWlibgeobackend = libgeobackend -PKGFILES_CSWlibgeobackend += $(call baseisadirs,$(libdir),libgeobackend\.so) -PKGFILES_CSWlibgeobackend += $(call baseisadirs,$(libdir),libgeobackend\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgeobackend += CSWlibz1 -SPKG_DESC_CSWlibgeobackend += $(DESCRIPTION), libgeobackend.so - -PACKAGES += CSWlibgmysqlbackend -CATALOGNAME_CSWlibgmysqlbackend = libgmysqlbackend -PKGFILES_CSWlibgmysqlbackend += $(call baseisadirs,$(libdir),libgmysqlbackend\.so) -PKGFILES_CSWlibgmysqlbackend += $(call baseisadirs,$(libdir),libgmysqlbackend\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibmysqlclient15 -RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgmysqlbackend += CSWlibz1 -SPKG_DESC_CSWlibgmysqlbackend += $(DESCRIPTION), libgmysqlbackend.so - # These are not errors! -CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWpdns += file-with-bad-content|/usr/local|root/etc/opt/csw/pdns/pdns.conf.CSW CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns -CHECKPKG_OVERRIDES_CSWpdns += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 22:56:46 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 20:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17607] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17607 http://gar.svn.sourceforge.net/gar/?rev=17607&view=rev Author: wilbury Date: 2012-04-04 20:56:46 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Correct reinplacements, patches. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 18:20:52 UTC (rev 17606) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 20:56:46 UTC (rev 17607) @@ -19,6 +19,7 @@ PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch +PATCHFILES += 0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) @@ -38,8 +39,13 @@ REINPLACEMENTS += usrlocaletc REINPLACE_MATCH_usrlocaletc = /usr/local/etc REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns -REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist +REINPLACE_FILES_usrlocaletc = pdns/pdns.conf +REINPLACEMENTS += usrlocallib +REINPLACE_MATCH_usrlocallib = /usr/local/lib +REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns +REINPLACE_FILES_usrlocallib = pdns/pdns.conf + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns @@ -50,10 +56,9 @@ CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include CONFIGURE_ARGS += --with-modules="ldap geo gmysql" + +# Prepend Boost 1.49 installation in paths so we pick up the correct one EXTRA_INC = /opt/csw/gxx/include - -# Extra libs for LDAP backend -EXTRA_LIB = lber LDFLAGS += -L/opt/csw/gxx/lib # PowerDNS does not have any "test" target Modified: csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-04 18:20:52 UTC (rev 17606) +++ csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-04 20:56:46 UTC (rev 17607) @@ -15,8 +15,8 @@ if( tmp != NULL && *tmp == 0 ) { -- return timegm( &tm ); -+ return Utility::timegm( &tm ); +- return timegm( &tm ); ++ return Utility::timegm( &tm ); } return 0; Added: csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-04 20:56:46 UTC (rev 17607) @@ -0,0 +1,36 @@ +From e72393802b2f4f786f7b7383c8a25a80ff289f33 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Wed, 4 Apr 2012 22:26:31 +0200 +Subject: [PATCH] Add -llber to -lldap for ldapbackend to make OpenLDAP happy. + +--- + modules/ldapbackend/Makefile.am | 2 +- + modules/ldapbackend/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am +index 8709848..abf762e 100644 +--- a/modules/ldapbackend/Makefile.am ++++ b/modules/ldapbackend/Makefile.am +@@ -5,4 +5,4 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS + lib_LTLIBRARIES = libldapbackend.la + libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh + libldapbackend_la_LDFLAGS =-module -avoid-version +-libldapbackend_la_LIBADD =-l at LIBLDAP@ ++libldapbackend_la_LIBADD =-l at LIBLDAP@ -llber +diff --git a/modules/ldapbackend/Makefile.in b/modules/ldapbackend/Makefile.in +index 8d3b0d9..ccf27c5 100644 +--- a/modules/ldapbackend/Makefile.in ++++ b/modules/ldapbackend/Makefile.in +@@ -257,7 +257,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS + lib_LTLIBRARIES = libldapbackend.la + libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh + libldapbackend_la_LDFLAGS = -module -avoid-version +-libldapbackend_la_LIBADD = -l at LIBLDAP@ ++libldapbackend_la_LIBADD = -l at LIBLDAP@ -llber + all: all-am + + .SUFFIXES: +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 23:03:48 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 21:03:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17608] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17608 http://gar.svn.sourceforge.net/gar/?rev=17608&view=rev Author: wilbury Date: 2012-04-04 21:03:48 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Correct reinplacements, patches. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 20:56:46 UTC (rev 17607) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:03:48 UTC (rev 17608) @@ -1,3 +1,6 @@ +# PowerDNS +# $Id$ +# NAME = pdns VERSION = 3.0.1 CATEGORIES = server Property changes on: csw/mgar/pkg/powerdns/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 23:28:08 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 21:28:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17609] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17609 http://gar.svn.sourceforge.net/gar/?rev=17609&view=rev Author: wilbury Date: 2012-04-04 21:28:08 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Tweak patch for OpenLDAP usage. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch Property Changed: ---------------- csw/mgar/pkg/powerdns/trunk/ Property changes on: csw/mgar/pkg/powerdns/trunk ___________________________________________________________________ Modified: svn:ignore - work download cookies + cookies download work Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:03:48 UTC (rev 17608) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:28:08 UTC (rev 17609) @@ -22,7 +22,7 @@ PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch -PATCHFILES += 0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch +PATCHFILES += 0006-Use-also-llber-with-lldap.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) Added: csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch 2012-04-04 21:28:08 UTC (rev 17609) @@ -0,0 +1,20 @@ +From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Wed, 4 Apr 2012 23:17:47 +0200 +Subject: [PATCH] Use also -llber with -lldap + +--- + modules/ldapbackend/OBJECTLIBS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS +index a787b8d..4adc2f0 100644 +--- a/modules/ldapbackend/OBJECTLIBS ++++ b/modules/ldapbackend/OBJECTLIBS +@@ -1 +1 @@ +--lldap_r +\ No newline at end of file ++-lldap_r -llber +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-04 21:03:48 UTC (rev 17608) +++ csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-04 21:28:08 UTC (rev 17609) @@ -1,36 +0,0 @@ -From e72393802b2f4f786f7b7383c8a25a80ff289f33 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 22:26:31 +0200 -Subject: [PATCH] Add -llber to -lldap for ldapbackend to make OpenLDAP happy. - ---- - modules/ldapbackend/Makefile.am | 2 +- - modules/ldapbackend/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am -index 8709848..abf762e 100644 ---- a/modules/ldapbackend/Makefile.am -+++ b/modules/ldapbackend/Makefile.am -@@ -5,4 +5,4 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS - lib_LTLIBRARIES = libldapbackend.la - libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh - libldapbackend_la_LDFLAGS =-module -avoid-version --libldapbackend_la_LIBADD =-l at LIBLDAP@ -+libldapbackend_la_LIBADD =-l at LIBLDAP@ -llber -diff --git a/modules/ldapbackend/Makefile.in b/modules/ldapbackend/Makefile.in -index 8d3b0d9..ccf27c5 100644 ---- a/modules/ldapbackend/Makefile.in -+++ b/modules/ldapbackend/Makefile.in -@@ -257,7 +257,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS - lib_LTLIBRARIES = libldapbackend.la - libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh - libldapbackend_la_LDFLAGS = -module -avoid-version --libldapbackend_la_LIBADD = -l at LIBLDAP@ -+libldapbackend_la_LIBADD = -l at LIBLDAP@ -llber - all: all-am - - .SUFFIXES: --- -1.7.9 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 23:34:24 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 21:34:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17610] csw/mgar/pkg/powerdns/trunk/work/ Message-ID: Revision: 17610 http://gar.svn.sourceforge.net/gar/?rev=17610&view=rev Author: wilbury Date: 2012-04-04 21:34:23 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Delete work directory from versioning Removed Paths: ------------- csw/mgar/pkg/powerdns/trunk/work/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 4 23:59:21 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 04 Apr 2012 21:59:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17611] csw/mgar/pkg/powerdns/trunk/Makefile Message-ID: Revision: 17611 http://gar.svn.sourceforge.net/gar/?rev=17611&view=rev Author: wilbury Date: 2012-04-04 21:59:21 +0000 (Wed, 04 Apr 2012) Log Message: ----------- powerdns/trunk: Adjust reinplacements Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:34:23 UTC (rev 17610) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:59:21 UTC (rev 17611) @@ -42,12 +42,12 @@ REINPLACEMENTS += usrlocaletc REINPLACE_MATCH_usrlocaletc = /usr/local/etc REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns -REINPLACE_FILES_usrlocaletc = pdns/pdns.conf +REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist REINPLACEMENTS += usrlocallib REINPLACE_MATCH_usrlocallib = /usr/local/lib REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns -REINPLACE_FILES_usrlocallib = pdns/pdns.conf +REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Apr 5 10:19:48 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 05 Apr 2012 08:19:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17612] csw/mgar/pkg/bind/trunk Message-ID: Revision: 17612 http://gar.svn.sourceforge.net/gar/?rev=17612&view=rev Author: bonivart Date: 2012-04-05 08:19:47 +0000 (Thu, 05 Apr 2012) Log Message: ----------- bind/trunk: update to 9.8.2 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 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-04-05 08:19:47 UTC (rev 17612) @@ -2,16 +2,18 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.8.1 +VERSION = 9.8.2 +#VERSION = 9.9.0 CATEGORIES = net GARTYPE = v2 # Enable these for Px-releases -RELEASE = P1 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = rc2 +#RELEASE = P1 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB @@ -22,12 +24,12 @@ endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -38,10 +40,12 @@ SPKG_DESC_CSWbind = ISC BIND DNS main package RUNTIME_DEP_PKGS_CSWbind = CSWlibbind RUNTIME_DEP_PKGS_CSWbind += CSWbindutils -RUNTIME_DEP_PKGS_CSWbind += CSWosslrt RUNTIME_DEP_PKGS_CSWbind += CSWlibz1 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWbind += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWbind += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWbind += CSWlibldap2-4-2 PACKAGES += CSWbind-dev CATALOGNAME_CSWbind-dev = bind_dev @@ -53,18 +57,18 @@ CATALOGNAME_CSWlibbind = libbind SPKG_DESC_CSWlibbind = ISC BIND DNS library package RUNTIME_DEP_PKGS_CSWlibbind = CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibbind += CSWosslrt RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl0-9-8 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWbindutils += CSWosslrt RUNTIME_DEP_PKGS_CSWbindutils += CSWlibz1 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWbindutils += CSWlibssl0-9-8 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot @@ -79,9 +83,12 @@ CONFIGURE_ARGS += --enable-largefile CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named +CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la +#EXTRA_INC = /opt/csw/include + PKGFILES_CSWbind-dev = $(PKGFILES_DEVEL) PKGFILES_CSWbind-dev += .*\.so PKGFILES_CSWlibbind = .*\.so\..* @@ -107,7 +114,6 @@ CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot -CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=libbind9.so.80,libdns.so.81,libisc.so.83,libisccc.so.80,libisccfg.so.82,liblwres.so.80 include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/bind/trunk/checksums 2012-04-05 08:19:47 UTC (rev 17612) @@ -1 +1 @@ -afa41f8203d50bedad65071f9b6f96d7 bind-9.8.1-P1.tar.gz +9d92bed18795a35ebe629f715cf41353 bind-9.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Apr 5 13:39:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 05 Apr 2012 11:39:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17613] csw/mgar/pkg/powerdns/trunk Message-ID: Revision: 17613 http://gar.svn.sourceforge.net/gar/?rev=17613&view=rev Author: wilbury Date: 2012-04-05 11:39:17 +0000 (Thu, 05 Apr 2012) Log Message: ----------- powerdns/trunk: Expand @@SYSCONFDIR@@ properly in some source files. Modified Paths: -------------- csw/mgar/pkg/powerdns/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch Modified: csw/mgar/pkg/powerdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-05 08:19:47 UTC (rev 17612) +++ csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-05 11:39:17 UTC (rev 17613) @@ -23,6 +23,7 @@ PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch PATCHFILES += 0006-Use-also-llber-with-lldap.patch +PATCHFILES += 0009-Expand-SYSCONFDIR-properly.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) Added: csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch (rev 0) +++ csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 11:39:17 UTC (rev 17613) @@ -0,0 +1,45 @@ +From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Thu, 5 Apr 2012 13:36:22 +0200 +Subject: [PATCH] Expand @@SYSCONFDIR@@ properly. + +--- + pdns/dynloader.cc | 4 ++-- + pdns/receiver.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc +index d810278..b7691a7 100644 +--- a/pdns/dynloader.cc ++++ b/pdns/dynloader.cc +@@ -53,9 +53,9 @@ int main(int argc, char **argv) + string s_programname="pdns"; + string localdir; + +- static char pietje[128]="!@@SYSCONFDIR@@:"; ++ static char pietje[128]="!/etc/opt/csw/pdns:"; + ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= +- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; ++ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; + + ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; + ::arg().set("remote-address","Remote address to query"); +diff --git a/pdns/receiver.cc b/pdns/receiver.cc +index e92e67e..887b3eb 100644 +--- a/pdns/receiver.cc ++++ b/pdns/receiver.cc +@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv) + + static void UNIX_declareArguments() + { +- static char pietje[128]="!@@SYSCONFDIR@@:"; ++ static char pietje[128]="!/etc/opt/csw/pdns:"; + ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= +- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; ++ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; + + ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")=""; + ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Apr 5 17:09:55 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 05 Apr 2012 15:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17614] csw/mgar/pkg/powerdns/branches Message-ID: Revision: 17614 http://gar.svn.sourceforge.net/gar/?rev=17614&view=rev Author: wilbury Date: 2012-04-05 15:09:54 +0000 (Thu, 05 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: PowerDNS 3.1-RC1. Work in progress. Added Paths: ----------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/work/ Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2012-04-04 21:28:08 UTC (rev 17609) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614) @@ -1,97 +0,0 @@ -# PowerDNS -# $Id$ -# -NAME = pdns -VERSION = 3.0.1 -CATEGORIES = server -GARTYPE = v2 - -DESCRIPTION = An advanced DNS server with multiple backends -define BLURB - PowerDNS is an advanced DNS server, which allows for several different - backends. Current backends include MySQL, PostgreSQL, bind, etc. -endef - -MASTER_SITES = http://downloads.powerdns.com/releases/ -SPKG_SOURCEURL = http://www.powerdns.com/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += LICENSE -DISTFILES += cswpdns -PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch -PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch -PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch -PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch -PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch -PATCHFILES += 0006-Use-also-llber-with-lldap.patch - -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) - -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - -LICENSE = $(FILEDIR)/LICENSE -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc - -GARCOMPILER = GNU -NORUNPATH = 1 - -REINPLACEMENTS += usrlocaletc -REINPLACE_MATCH_usrlocaletc = /usr/local/etc -REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns -REINPLACE_FILES_usrlocaletc = pdns/pdns.conf - -REINPLACEMENTS += usrlocallib -REINPLACE_MATCH_usrlocallib = /usr/local/lib -REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns -REINPLACE_FILES_usrlocallib = pdns/pdns.conf - -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-modules="ldap geo gmysql" - -# 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 - -# PowerDNS does not have any "test" target -SKIPTEST = 1 - -PACKAGES = CSWpdns -CATALOGNAME_CSWpdns = powerdns -SPKG_DESC_CSWpdns = PowerDNS -RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 -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 -RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 -BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel - -# These are not errors! -CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns - -INITSMF = /etc/opt/csw/init.d/cswpdns -PRESERVECONF = /etc/opt/csw/pdns/pdns.conf - -post-install-modulated: - @echo " ==> Installing Init Script" - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns - @echo " ==> Moving config file" - @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf - @$(MAKECOOKIE) - -include gar/category.mk Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile (from rev 17613, csw/mgar/pkg/powerdns/trunk/Makefile) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614) @@ -0,0 +1,98 @@ +# PowerDNS +# $Id$ +# +NAME = pdns +VERSION = 3.0.1 +CATEGORIES = server +GARTYPE = v2 + +DESCRIPTION = An advanced DNS server with multiple backends +define BLURB + PowerDNS is an advanced DNS server, which allows for several different + backends. Current backends include MySQL, PostgreSQL, bind, etc. +endef + +MASTER_SITES = http://downloads.powerdns.com/releases/ +SPKG_SOURCEURL = http://www.powerdns.com/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += LICENSE +DISTFILES += cswpdns +PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch +PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch +PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch +PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch +PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch +PATCHFILES += 0006-Use-also-llber-with-lldap.patch +PATCHFILES += 0009-Expand-SYSCONFDIR-properly.patch + +WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +LICENSE = $(FILEDIR)/LICENSE +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + +GARCOMPILER = GNU +NORUNPATH = 1 + +REINPLACEMENTS += usrlocaletc +REINPLACE_MATCH_usrlocaletc = /usr/local/etc +REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns +REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist + +REINPLACEMENTS += usrlocallib +REINPLACE_MATCH_usrlocallib = /usr/local/lib +REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns +REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist + +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-modules="ldap geo gmysql" + +# 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 + +# PowerDNS does not have any "test" target +SKIPTEST = 1 + +PACKAGES = CSWpdns +CATALOGNAME_CSWpdns = powerdns +SPKG_DESC_CSWpdns = PowerDNS +RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 +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 +RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 +BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel + +# These are not errors! +CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns + +INITSMF = /etc/opt/csw/init.d/cswpdns +PRESERVECONF = /etc/opt/csw/pdns/pdns.conf + +post-install-modulated: + @echo " ==> Installing Init Script" + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns + @echo " ==> Moving config file" + @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf + @$(MAKECOOKIE) + +include gar/category.mk Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums =================================================================== --- csw/mgar/pkg/powerdns/trunk/checksums 2012-04-04 21:28:08 UTC (rev 17609) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614) @@ -1 +0,0 @@ -a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums (from rev 17608, csw/mgar/pkg/powerdns/trunk/checksums) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614) @@ -0,0 +1 @@ +a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch (from rev 17609, csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch 2012-04-05 15:09:54 UTC (rev 17614) @@ -0,0 +1,20 @@ +From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Wed, 4 Apr 2012 23:17:47 +0200 +Subject: [PATCH] Use also -llber with -lldap + +--- + modules/ldapbackend/OBJECTLIBS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS +index a787b8d..4adc2f0 100644 +--- a/modules/ldapbackend/OBJECTLIBS ++++ b/modules/ldapbackend/OBJECTLIBS +@@ -1 +1 @@ +--lldap_r +\ No newline at end of file ++-lldap_r -llber +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch =================================================================== --- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-04 21:03:48 UTC (rev 17608) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch 2012-04-05 15:09:54 UTC (rev 17614) @@ -1,36 +0,0 @@ -From e72393802b2f4f786f7b7383c8a25a80ff289f33 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 22:26:31 +0200 -Subject: [PATCH] Add -llber to -lldap for ldapbackend to make OpenLDAP happy. - ---- - modules/ldapbackend/Makefile.am | 2 +- - modules/ldapbackend/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am -index 8709848..abf762e 100644 ---- a/modules/ldapbackend/Makefile.am -+++ b/modules/ldapbackend/Makefile.am -@@ -5,4 +5,4 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS - lib_LTLIBRARIES = libldapbackend.la - libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh - libldapbackend_la_LDFLAGS =-module -avoid-version --libldapbackend_la_LIBADD =-l at LIBLDAP@ -+libldapbackend_la_LIBADD =-l at LIBLDAP@ -llber -diff --git a/modules/ldapbackend/Makefile.in b/modules/ldapbackend/Makefile.in -index 8d3b0d9..ccf27c5 100644 ---- a/modules/ldapbackend/Makefile.in -+++ b/modules/ldapbackend/Makefile.in -@@ -257,7 +257,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS - lib_LTLIBRARIES = libldapbackend.la - libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh - libldapbackend_la_LDFLAGS = -module -avoid-version --libldapbackend_la_LIBADD = -l at LIBLDAP@ -+libldapbackend_la_LIBADD = -l at LIBLDAP@ -llber - all: all-am - - .SUFFIXES: --- -1.7.9 - Copied: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch (from rev 17613, csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 15:09:54 UTC (rev 17614) @@ -0,0 +1,45 @@ +From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Thu, 5 Apr 2012 13:36:22 +0200 +Subject: [PATCH] Expand @@SYSCONFDIR@@ properly. + +--- + pdns/dynloader.cc | 4 ++-- + pdns/receiver.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc +index d810278..b7691a7 100644 +--- a/pdns/dynloader.cc ++++ b/pdns/dynloader.cc +@@ -53,9 +53,9 @@ int main(int argc, char **argv) + string s_programname="pdns"; + string localdir; + +- static char pietje[128]="!@@SYSCONFDIR@@:"; ++ static char pietje[128]="!/etc/opt/csw/pdns:"; + ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= +- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; ++ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; + + ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; + ::arg().set("remote-address","Remote address to query"); +diff --git a/pdns/receiver.cc b/pdns/receiver.cc +index e92e67e..887b3eb 100644 +--- a/pdns/receiver.cc ++++ b/pdns/receiver.cc +@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv) + + static void UNIX_declareArguments() + { +- static char pietje[128]="!@@SYSCONFDIR@@:"; ++ static char pietje[128]="!/etc/opt/csw/pdns:"; + ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= +- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; ++ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; + + ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")=""; + ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Apr 5 21:40:28 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 05 Apr 2012 19:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17615] csw/mgar/pkg/libpng/branches/libpng3 Message-ID: Revision: 17615 http://gar.svn.sourceforge.net/gar/?rev=17615&view=rev Author: bonivart Date: 2012-04-05 19:40:28 +0000 (Thu, 05 Apr 2012) Log Message: ----------- libpng/branches/libpng3: update to 1.2.49 due to security Modified Paths: -------------- csw/mgar/pkg/libpng/branches/libpng3/Makefile csw/mgar/pkg/libpng/branches/libpng3/checksums Modified: csw/mgar/pkg/libpng/branches/libpng3/Makefile =================================================================== --- csw/mgar/pkg/libpng/branches/libpng3/Makefile 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/libpng/branches/libpng3/Makefile 2012-04-05 19:40:28 UTC (rev 17615) @@ -10,7 +10,7 @@ # pentium_pro NAME = libpng -VERSION = 1.2.46 +VERSION = 1.2.49 CATEGORIES = lib DESCRIPTION = The official library for Portable Network Graphics format (PNG) define BLURB Modified: csw/mgar/pkg/libpng/branches/libpng3/checksums =================================================================== --- csw/mgar/pkg/libpng/branches/libpng3/checksums 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/libpng/branches/libpng3/checksums 2012-04-05 19:40:28 UTC (rev 17615) @@ -1 +1 @@ -03ddfc17ad321db93f984581e9415d22 libpng-1.2.46.tar.gz +39a35257cd888d29f1d000c2ffcc79eb libpng-1.2.49.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Apr 5 23:20:23 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 05 Apr 2012 21:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17616] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1 Message-ID: Revision: 17616 http://gar.svn.sourceforge.net/gar/?rev=17616&view=rev Author: wilbury Date: 2012-04-05 21:20:22 +0000 (Thu, 05 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: PowerDNS 3.1-RC1 WIP - adjust PATCHFILES Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums Added Paths: ----------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 21:20:22 UTC (rev 17616) @@ -2,7 +2,7 @@ # $Id$ # NAME = pdns -VERSION = 3.0.1 +VERSION = 3.1-rc1 CATEGORIES = server GARTYPE = v2 @@ -12,28 +12,32 @@ backends. Current backends include MySQL, PostgreSQL, bind, etc. endef -MASTER_SITES = http://downloads.powerdns.com/releases/ +# Open issues: +# -llber +# timegm() in utils.hh ldapbackend +# endian.h net.c +# +# AR libpolarssl.a +# ar: creating libpolarssl.a +# RL libpolarssl.a +# ar: one of [drqtpmx] must be specified +# gmake[5]: *** [libpolarssl.a] Error 1 +# ^^^ treba pouzit ranlib +# +# @@SYSCONFDIR@@ +# asprintf http://blogs.everycity.co.uk/alasdair/2011/07/vasprintf-and-asprintf-on-solaris-10/ +# +MASTER_SITES = http://powerdnssec.org/downloads/ SPKG_SOURCEURL = http://www.powerdns.com/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE DISTFILES += cswpdns -PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch -PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch -PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch -PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch -PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch -PATCHFILES += 0006-Use-also-llber-with-lldap.patch -PATCHFILES += 0009-Expand-SYSCONFDIR-properly.patch WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = 0003-Patch-for-Solaris-compilation.patch +PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch -# 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 = - LICENSE = $(FILEDIR)/LICENSE PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 21:20:22 UTC (rev 17616) @@ -1 +1 @@ -a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz +3e1ac551b4fb9d75be513e9dcfe59115 pdns-3.1-rc1.tar.gz Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,25 +0,0 @@ -From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:06:09 +0200 -Subject: [PATCH 1/4] Make checking for LUA behave correctly. - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 1067417..55b5d20 100755 ---- a/configure -+++ b/configure -@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; } - - # Check whether --with-lua was given. - if test "${with_lua+set}" = set; then : -- withval=$with_lua; WITH_LUA=$withval] -+ withval=$with_lua; WITH_LUA=$withval - else - WITH_LUA=yes - fi --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,25 +0,0 @@ -From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:12:41 +0200 -Subject: [PATCH 2/4] Use sys/isa_defs.h instead of endian.h - ---- - pdns/ext/polarssl/library/net.c | 2 + - 1 file changed, 2 insertions(+), 0 deletions(-) - -diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c -index 67b52a7..8106b74 100644 ---- a/pdns/ext/polarssl/library/net.c -+++ b/pdns/ext/polarssl/library/net.c -@@ -59,6 +59,8 @@ static int wsa_init_done = 0; - #include - #elif defined(__APPLE__) - #include -+#elif defined(sun) -+#include - #else - #include - #endif --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,28 +0,0 @@ -From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:27:38 +0200 -Subject: [PATCH 3/4] Include correct sys/ethernet.h - ---- - pdns/dnspcap.hh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh -index 66e07b9..60596ff 100644 ---- a/pdns/dnspcap.hh -+++ b/pdns/dnspcap.hh -@@ -10,7 +10,11 @@ - #include - #include - #include -+#ifdef sun -+#include -+#else - #include -+#endif - #include - #include - #include "namespaces.hh" --- -1.7.9 - Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Patch-for-Solaris-compilation.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -0,0 +1,160 @@ +From 050de1b8fdc43e512e71b1e1c3119f8a07d60f89 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Thu, 5 Apr 2012 22:45:30 +0200 +Subject: [PATCH] Patch for Solaris compilation. + +--- + modules/ldapbackend/utils.hh | 2 +- + pdns/backends/gsql/gsqlbackend.cc | 71 ++++++++++++++ + pdns/dnspcap.hh | 4 + + pdns/ext/polarssl-1.1.1/library/Makefile | 2 +- + pdns/ext/polarssl-1.1.1/library/net.c | 2 + + 5 files changed, 157 insertions(+), 80 deletions(-) + +diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh +index ba60f9f..25392c3 100644 +--- a/modules/ldapbackend/utils.hh ++++ b/modules/ldapbackend/utils.hh +@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str ) + + if( tmp != NULL && *tmp == 0 ) + { +- return timegm( &tm ); ++ return Utility::timegm( &tm ); + } + + return 0; +diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc +index 2bd8ffc..aede8e6 100644 +--- a/pdns/backends/gsql/gsqlbackend.cc ++++ b/pdns/backends/gsql/gsqlbackend.cc +@@ -21,6 +21,7 @@ + # pragma warning ( disable: 4786 ) + #endif // WIN32 + ++#include + #include + #include + +@@ -760,6 +761,76 @@ bool GSQLBackend::get(DNSResourceRecord &r) + return false; + } + ++#if (defined (__SVR4) && defined (__sun)) ++ ++extern "C" { ++#define INIT_SZ 128 ++ ++/* VARARGS2 */ ++int ++vasprintf(char **str, const char *format, va_list ap) ++{ ++ char string[INIT_SZ]; ++ char *newstr; ++ int ret; ++ size_t len; ++ ++ *str = NULL; ++ ret = vsnprintf(string, INIT_SZ, format, ap); ++ if (ret < 0) /* retain the value of errno from vsnprintf() */ ++ return (-1); ++ if (ret < INIT_SZ) { ++ len = ret + 1; ++ if ((newstr = (char*) malloc(len)) == NULL) ++ return (-1); /* retain errno from malloc() */ ++ (void) strlcpy(newstr, string, len); ++ *str = newstr; ++ return (ret); ++ } ++ /* ++ * We will perform this loop more than once only if some other ++ * thread modifies one of the vasprintf() arguments after our ++ * previous call to vsnprintf(). ++ */ ++ for (;;) { ++ if (ret == INT_MAX) { /* Bad length */ ++ errno = ENOMEM; ++ return (-1); ++ } ++ len = ret + 1; ++ if ((newstr = (char*) malloc(len)) == NULL) ++ return (-1); /* retain errno from malloc() */ ++ ret = vsnprintf(newstr, len, format, ap); ++ if (ret < 0) { /* retain errno from vsnprintf() */ ++ free(newstr); ++ return (-1); ++ } ++ if (ret < len) { ++ *str = newstr; ++ return (ret); ++ } ++ free(newstr); ++ } ++} ++ ++int ++asprintf(char **str, const char *format, ...) ++{ ++ va_list ap; ++ int ret; ++ ++ *str = NULL; ++ va_start(ap, format); ++ ret = vasprintf(str, format, ap); ++ va_end(ap); ++ ++ return (ret); ++} ++ ++} /* extern "C" */ ++ ++#endif ++ + bool GSQLBackend::feedRecord(const DNSResourceRecord &r) + { + char *output; +diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh +index 66e07b9..607a397 100644 +--- a/pdns/dnspcap.hh ++++ b/pdns/dnspcap.hh +@@ -10,7 +10,11 @@ + #include + #include + #include ++#if defined (__sun) ++#include ++#else + #include ++#endif + #include + #include + #include "namespaces.hh" +diff --git a/pdns/ext/polarssl-1.1.1/library/Makefile b/pdns/ext/polarssl-1.1.1/library/Makefile +index 26de4d7..624994c 100644 +--- a/pdns/ext/polarssl-1.1.1/library/Makefile ++++ b/pdns/ext/polarssl-1.1.1/library/Makefile +@@ -49,7 +49,7 @@ libpolarssl.a: $(OBJS) + echo " AR $@" + $(AR) r $@ $(OBJS) + echo " RL $@" +- $(AR) s $@ ++ ranlib $@ + + libpolarssl.so: libpolarssl.a + echo " LD $@" +diff --git a/pdns/ext/polarssl-1.1.1/library/net.c b/pdns/ext/polarssl-1.1.1/library/net.c +index 9724c07..e30aebb 100644 +--- a/pdns/ext/polarssl-1.1.1/library/net.c ++++ b/pdns/ext/polarssl-1.1.1/library/net.c +@@ -63,6 +63,8 @@ static int wsa_init_done = 0; + #include + #elif defined(__APPLE__) + #include ++#elif defined(sun) ++#include + #else + #include + #endif +-- +1.7.9 + Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Add-llber-to-make-OpenLDAP-happy.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -0,0 +1,20 @@ +From be1063f6b42879daeab42f956fc9e59f2bdda6c5 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Thu, 5 Apr 2012 23:15:17 +0200 +Subject: [PATCH] Add -llber to make OpenLDAP happy. + +--- + modules/ldapbackend/OBJECTLIBS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS +index a787b8d..4adc2f0 100644 +--- a/modules/ldapbackend/OBJECTLIBS ++++ b/modules/ldapbackend/OBJECTLIBS +@@ -1 +1 @@ +--lldap_r +\ No newline at end of file ++-lldap_r -llber +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,25 +0,0 @@ -From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 23:19:42 +0200 -Subject: [PATCH 4/4] Build only stub LUA pdns recursor implementation. Do not - check for LIBDIR - ---- - pdns/lua-pdns-recursor.cc | 2 +- - 1 file changed, 1 insertion(+), 0 deletions(-) - -diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc -index 5e0dd7f..eb6c380 100644 ---- a/pdns/lua-pdns-recursor.cc -+++ b/pdns/lua-pdns-recursor.cc -@@ -1,6 +1,6 @@ - #include "lua-pdns-recursor.hh" - --#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR) -+#if !defined(PDNS_ENABLE_LUA) - - // stub implementation - --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,25 +0,0 @@ -From f0c281399bfdd40dd9d02d5a3fe07417dd20b070 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 13:12:24 +0200 -Subject: [PATCH] Use correct namespace for timegm() - ---- - modules/ldapbackend/utils.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh -index ba60f9f..25392c3 100644 ---- a/modules/ldapbackend/utils.hh -+++ b/modules/ldapbackend/utils.hh -@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str ) - - if( tmp != NULL && *tmp == 0 ) - { -- return timegm( &tm ); -+ return Utility::timegm( &tm ); - } - - return 0; --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,20 +0,0 @@ -From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 23:17:47 +0200 -Subject: [PATCH] Use also -llber with -lldap - ---- - modules/ldapbackend/OBJECTLIBS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS -index a787b8d..4adc2f0 100644 ---- a/modules/ldapbackend/OBJECTLIBS -+++ b/modules/ldapbackend/OBJECTLIBS -@@ -1 +1 @@ ---lldap_r -\ No newline at end of file -+-lldap_r -llber --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 19:40:28 UTC (rev 17615) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 21:20:22 UTC (rev 17616) @@ -1,45 +0,0 @@ -From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Thu, 5 Apr 2012 13:36:22 +0200 -Subject: [PATCH] Expand @@SYSCONFDIR@@ properly. - ---- - pdns/dynloader.cc | 4 ++-- - pdns/receiver.cc | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc -index d810278..b7691a7 100644 ---- a/pdns/dynloader.cc -+++ b/pdns/dynloader.cc -@@ -53,9 +53,9 @@ int main(int argc, char **argv) - string s_programname="pdns"; - string localdir; - -- static char pietje[128]="!@@SYSCONFDIR@@:"; -+ static char pietje[128]="!/etc/opt/csw/pdns:"; - ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= -- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; -+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; - - ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; - ::arg().set("remote-address","Remote address to query"); -diff --git a/pdns/receiver.cc b/pdns/receiver.cc -index e92e67e..887b3eb 100644 ---- a/pdns/receiver.cc -+++ b/pdns/receiver.cc -@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv) - - static void UNIX_declareArguments() - { -- static char pietje[128]="!@@SYSCONFDIR@@:"; -+ static char pietje[128]="!/etc/opt/csw/pdns:"; - ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= -- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; -+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; - - ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")=""; - ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; --- -1.7.9 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 6 22:18:20 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 20:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17617] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17617 http://gar.svn.sourceforge.net/gar/?rev=17617&view=rev Author: wilbury Date: 2012-04-06 20:18:20 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: Try to build for all platforms we support. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 21:20:22 UTC (rev 17616) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:18:20 UTC (rev 17617) @@ -39,7 +39,7 @@ PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch LICENSE = $(FILEDIR)/LICENSE -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +# PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc GARCOMPILER = GNU NORUNPATH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 6 22:23:10 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 20:23:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17618] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17618 http://gar.svn.sourceforge.net/gar/?rev=17618&view=rev Author: wilbury Date: 2012-04-06 20:23:09 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: Enable recursor, build also PostgreSQL backend. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:18:20 UTC (rev 17617) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:23:09 UTC (rev 17618) @@ -57,13 +57,16 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns -CONFIGURE_ARGS += --disable-recursor +CONFIGURE_ARGS += --enable-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-modules="ldap geo gmysql" +CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql +CONFIGURE_ARGS += --with-pgsql-lib=$(prefix)/postgresql/lib +CONFIGURE_ARGS += --with-pgsql-includes=$(prefix)/postgresql/include +CONFIGURE_ARGS += --with-modules="ldap geo gmysql gpgsql" # Prepend Boost 1.49 installation in paths so we pick up the correct one EXTRA_INC = /opt/csw/gxx/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 6 22:29:18 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 20:29:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17619] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17619 http://gar.svn.sourceforge.net/gar/?rev=17619&view=rev Author: wilbury Date: 2012-04-06 20:29:17 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: Build for Solaris 10 only, no Boost 1.49 for Solaris 9 on our buildfarm. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:23:09 UTC (rev 17618) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:29:17 UTC (rev 17619) @@ -39,7 +39,7 @@ PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch LICENSE = $(FILEDIR)/LICENSE -# PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc GARCOMPILER = GNU NORUNPATH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 6 22:36:18 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 20:36:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17620] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17620 http://gar.svn.sourceforge.net/gar/?rev=17620&view=rev Author: wilbury Date: 2012-04-06 20:36:18 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: No PgSQL backend, build system still broken. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:29:17 UTC (rev 17619) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:36:18 UTC (rev 17620) @@ -63,10 +63,7 @@ CONFIGURE_ARGS += --with-mysql=$(prefix) CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include -CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql -CONFIGURE_ARGS += --with-pgsql-lib=$(prefix)/postgresql/lib -CONFIGURE_ARGS += --with-pgsql-includes=$(prefix)/postgresql/include -CONFIGURE_ARGS += --with-modules="ldap geo gmysql gpgsql" +CONFIGURE_ARGS += --with-modules="ldap geo gmysql" # Prepend Boost 1.49 installation in paths so we pick up the correct one EXTRA_INC = /opt/csw/gxx/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 6 23:15:39 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 21:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17621] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17621 http://gar.svn.sourceforge.net/gar/?rev=17621&view=rev Author: wilbury Date: 2012-04-06 21:15:39 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: At last, build for Solaris 10 x86 only, no Boost libraries on unstable10s box. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 20:36:18 UTC (rev 17620) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 21:15:39 UTC (rev 17621) @@ -39,7 +39,7 @@ PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch LICENSE = $(FILEDIR)/LICENSE -PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc +PACKAGING_PLATFORMS = solaris10-i386 GARCOMPILER = GNU NORUNPATH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Apr 7 00:13:14 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 06 Apr 2012 22:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17622] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/ Makefile Message-ID: Revision: 17622 http://gar.svn.sourceforge.net/gar/?rev=17622&view=rev Author: wilbury Date: 2012-04-06 22:13:14 +0000 (Fri, 06 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc1: Build also gsqlite3 backend for dnssec. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 21:15:39 UTC (rev 17621) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-06 22:13:14 UTC (rev 17622) @@ -39,7 +39,7 @@ PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch LICENSE = $(FILEDIR)/LICENSE -PACKAGING_PLATFORMS = solaris10-i386 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc GARCOMPILER = GNU NORUNPATH = 1 @@ -63,8 +63,15 @@ CONFIGURE_ARGS += --with-mysql=$(prefix) CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include -CONFIGURE_ARGS += --with-modules="ldap geo gmysql" +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" +EXTRA_CONFIGURE_ENV += "PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig" + # 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 @@ -83,7 +90,8 @@ RUNTIME_DEP_PKGS_CSWpdns += CSWlibboost-s13n1-49-0-gxx RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 -BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel +RUNTIME_DEP_PKGS_CSWpdns += CSWlibsqlite3-0 +BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel CSWlibsqlite3-dev CSWopenldap-dev CSWlibz-dev # These are not errors! CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns 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 Apr 7 04:59:49 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 02:59:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17623] csw/mgar/pkg/git/trunk Message-ID: Revision: 17623 http://gar.svn.sourceforge.net/gar/?rev=17623&view=rev Author: bdwalton Date: 2012-04-07 02:59:48 +0000 (Sat, 07 Apr 2012) Log Message: ----------- git/trunk: version bump to 1.7.10 final 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 2012-04-06 22:13:14 UTC (rev 17622) +++ csw/mgar/pkg/git/trunk/Makefile 2012-04-07 02:59:48 UTC (rev 17623) @@ -1,7 +1,7 @@ NAME = git VERSION = 1.7.10 -PATCHLEVEL = rc3 -DISTNAME = $(NAME)-$(VERSION).$(PATCHLEVEL) +#PATCHLEVEL = rc4 +DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-04-06 22:13:14 UTC (rev 17622) +++ csw/mgar/pkg/git/trunk/checksums 2012-04-07 02:59:48 UTC (rev 17623) @@ -1 +1 @@ -3b59d5dacfc60ea278ba4c479a78f77e git-1.7.10.rc3.tar.gz +ab2716db51580037c7ebda4c8e9d56eb git-1.7.10.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 Apr 7 15:40:39 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 13:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17624] csw/mgar/pkg Message-ID: Revision: 17624 http://gar.svn.sourceforge.net/gar/?rev=17624&view=rev Author: bdwalton Date: 2012-04-07 13:40:38 +0000 (Sat, 07 Apr 2012) Log Message: ----------- libxslt-ruby/trunk: stub for new xslt gem Added Paths: ----------- csw/mgar/pkg/libxslt-ruby/ csw/mgar/pkg/libxslt-ruby/Makefile csw/mgar/pkg/libxslt-ruby/branches/ csw/mgar/pkg/libxslt-ruby/tags/ csw/mgar/pkg/libxslt-ruby/trunk/ csw/mgar/pkg/libxslt-ruby/trunk/Makefile csw/mgar/pkg/libxslt-ruby/trunk/checksums csw/mgar/pkg/libxslt-ruby/trunk/files/ Copied: csw/mgar/pkg/libxslt-ruby/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxslt-ruby/Makefile (rev 0) +++ csw/mgar/pkg/libxslt-ruby/Makefile 2012-04-07 13:40:38 UTC (rev 17624) @@ -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/libxslt-ruby/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + Added: csw/mgar/pkg/libxslt-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt-ruby/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxslt-ruby/trunk/Makefile 2012-04-07 13:40:38 UTC (rev 17624) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libxslt-ruby +VERSION = x.y +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libxslt-ruby/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libxslt-ruby/trunk/checksums =================================================================== 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 Apr 7 19:25:31 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 17:25:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17625] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 17625 http://gar.svn.sourceforge.net/gar/?rev=17625&view=rev Author: bdwalton Date: 2012-04-07 17:25:30 +0000 (Sat, 07 Apr 2012) Log Message: ----------- ruby19/trunk: version bump to latest patch release Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile csw/mgar/pkg/ruby19/trunk/checksums Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2012-04-07 13:40:38 UTC (rev 17624) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2012-04-07 17:25:30 UTC (rev 17625) @@ -3,7 +3,7 @@ # Change this when the build starts putting files in $(libdir)/ruby/$(newver) API_VERSION = 1.9.1 API_SHORT = $(subst .,,$(API_VERSION)) -PATCHLEVEL = p0 +PATCHLEVEL = p125 CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/ruby19/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby19/trunk/checksums 2012-04-07 13:40:38 UTC (rev 17624) +++ csw/mgar/pkg/ruby19/trunk/checksums 2012-04-07 17:25:30 UTC (rev 17625) @@ -1 +1 @@ -8e2fef56185cfbaf29d0c8329fc77c05 ruby-1.9.3-p0.tar.gz +e3ea86b9d3fc2d3ec867f66969ae3b92 ruby-1.9.3-p125.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 Apr 7 20:22:20 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 18:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17626] csw/mgar/pkg/rbgems/libxslt-ruby/ Message-ID: Revision: 17626 http://gar.svn.sourceforge.net/gar/?rev=17626&view=rev Author: bdwalton Date: 2012-04-07 18:22:20 +0000 (Sat, 07 Apr 2012) Log Message: ----------- moved libxslt gem to proper location Added Paths: ----------- csw/mgar/pkg/rbgems/libxslt-ruby/ 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 Apr 7 20:31:17 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 18:31:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17627] csw/mgar/pkg/rbgems/libxslt-ruby/trunk Message-ID: Revision: 17627 http://gar.svn.sourceforge.net/gar/?rev=17627&view=rev Author: bdwalton Date: 2012-04-07 18:31:17 +0000 (Sat, 07 Apr 2012) Log Message: ----------- rbgems/libxslt-ruby/trunk: add basic definitions for package, gather checksum Modified Paths: -------------- csw/mgar/pkg/rbgems/libxslt-ruby/trunk/Makefile csw/mgar/pkg/rbgems/libxslt-ruby/trunk/checksums Modified: csw/mgar/pkg/rbgems/libxslt-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/libxslt-ruby/trunk/Makefile 2012-04-07 18:22:20 UTC (rev 17626) +++ csw/mgar/pkg/rbgems/libxslt-ruby/trunk/Makefile 2012-04-07 18:31:17 UTC (rev 17627) @@ -2,28 +2,18 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = libxslt-ruby -VERSION = x.y +VERSION = 1.0.9 GARTYPE = v2 -CATEGORIES = category +CATEGORIES = rbgems -DESCRIPTION = Brief description +DESCRIPTION = "The libxslt gem provides Ruby language bindings for GNOME's Libxslt toolkit." define BLURB - Long description +The Libxslt-Ruby project provides Ruby language bindings for the GNOME XSLT C library. It is free software, released under the MIT License. endef -MASTER_SITES = -DISTFILES = $(DISTNAME).tar.gz +GEM_DEPS = CSWrb18-libxml-1-1-4 -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWrb18-libxslt-1-0-9 = $(GEM_DEPS) -# 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 = - -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Modified: csw/mgar/pkg/rbgems/libxslt-ruby/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/libxslt-ruby/trunk/checksums 2012-04-07 18:22:20 UTC (rev 17626) +++ csw/mgar/pkg/rbgems/libxslt-ruby/trunk/checksums 2012-04-07 18:31:17 UTC (rev 17627) @@ -0,0 +1 @@ +06f522e3cec4bc7efb945a24b185eaee libxslt-ruby-1.0.9.gem 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 Apr 7 20:45:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 18:45:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17628] csw/mgar/pkg/rubygems/trunk Message-ID: Revision: 17628 http://gar.svn.sourceforge.net/gar/?rev=17628&view=rev Author: bdwalton Date: 2012-04-07 18:45:17 +0000 (Sat, 07 Apr 2012) Log Message: ----------- rubygems/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/rubygems/trunk/checksums Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 18:31:17 UTC (rev 17627) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 18:45:17 UTC (rev 17628) @@ -1,5 +1,5 @@ NAME = rubygems -VERSION = 1.7.2 +VERSION = 1.8.21 CATEGORIES = xtra GARTYPE = v2 Modified: csw/mgar/pkg/rubygems/trunk/checksums =================================================================== --- csw/mgar/pkg/rubygems/trunk/checksums 2012-04-07 18:31:17 UTC (rev 17627) +++ csw/mgar/pkg/rubygems/trunk/checksums 2012-04-07 18:45:17 UTC (rev 17628) @@ -1 +1 @@ -8d67d0bc44b0317dc37e200dcf6627ea rubygems-1.7.2.tgz +d77b3438a4b3c7368491537bb0ddde1d rubygems-1.8.21.tgz 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 Apr 7 20:51:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 18:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17629] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 17629 http://gar.svn.sourceforge.net/gar/?rev=17629&view=rev Author: bdwalton Date: 2012-04-07 18:51:15 +0000 (Sat, 07 Apr 2012) Log Message: ----------- rubygems/trunk: drop a new redundant file copy Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 18:45:17 UTC (rev 17628) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 18:51:15 UTC (rev 17629) @@ -50,5 +50,4 @@ @mkdir -p $(DESTDIR)$(docdir)/$(NAME) @gcp -v $(WORKSRC)/README.rdoc $(DESTDIR)$(docdir)/$(NAME) @gcp -v $(WORKSRC)/LICENSE.txt $(DESTDIR)$(docdir)/$(NAME) - @gcp -v $(WORKSRC)/GPL.txt $(DESTDIR)$(docdir)/$(NAME) @$(MAKECOOKIE) 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 Apr 7 21:18:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 Apr 2012 19:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17630] csw/mgar/pkg/rubygems/trunk/Makefile Message-ID: Revision: 17630 http://gar.svn.sourceforge.net/gar/?rev=17630&view=rev Author: bdwalton Date: 2012-04-07 19:18:22 +0000 (Sat, 07 Apr 2012) Log Message: ----------- rubygems/trunk: override usr/local references that are all in comments Modified Paths: -------------- csw/mgar/pkg/rubygems/trunk/Makefile Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 18:51:15 UTC (rev 17629) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2012-04-07 19:18:22 UTC (rev 17630) @@ -33,6 +33,8 @@ CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/gem_path_searcher.rb CHECKPKG_OVERRIDES_CSWrubygems += surplus-dependency|CSWalternatives +# all comments +CHECKPKG_OVERRIDES_CSWrubygems += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/rubygems/specification.rb ALTERNATIVE = $(bindir)/gem gem $(bindir)/gem18 5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 9 03:59:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 09 Apr 2012 01:59:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17631] csw/mgar/pkg/git/trunk Message-ID: Revision: 17631 http://gar.svn.sourceforge.net/gar/?rev=17631&view=rev Author: bdwalton Date: 2012-04-09 01:59:12 +0000 (Mon, 09 Apr 2012) Log Message: ----------- git/trunk: revert to default SANE_TOOL_PATH, work around bug in xpg4/sed Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-04-07 19:18:22 UTC (rev 17630) +++ csw/mgar/pkg/git/trunk/Makefile 2012-04-09 01:59:12 UTC (rev 17631) @@ -117,6 +117,7 @@ PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch PATCHFILES += 0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch +PATCHFILES += 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files @@ -152,7 +153,6 @@ CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less CONFIGURE_ARGS += --without-python -CONFIGURE_ARGS += --with-sane-tool-path=/opt/csw/gnu:/opt/csw/bin:/usr/xpg6/bin:/usr/xpg4/bin BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ASCIIDOC_NO_ROFF=YesPlease \ Added: csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch 2012-04-09 01:59:12 UTC (rev 17631) @@ -0,0 +1,56 @@ +From 097f067a25220fc3cc315163dfef07de6a1c5f20 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 9 Apr 2012 03:14:18 +0200 +Subject: [PATCH] Avoid bug in Solaris xpg4/sed as used in submodule + +The sed provided by Solaris in /usr/xpg4/bin has a bug whereby an +unanchored regex using * for zero or more repetitions sees two +separate matches fed to the substitution engine in some cases. + +This is evidenced by: + +$ for sed in /usr/xpg4/bin/sed /usr/bin/sed /opt/csw/gnu/sed; do \ +echo 'ab' | $sed -e 's|[a]*|X|g' \ +done +XXbX +XbX +XbX + +This bug was triggered during a git submodule clone operation as +exercised in the setup stage of t5526-fetch-submodules when using the +default SANE_TOOL_PATH for Solaris. It led to paths such as +..../.. being used in the submodule .git gitdir reference. + +Using the expression 's|\([^/]*\(/*\)\)|..\2|g' provides the desired +result with all three three tested sed implementations but is harder +to read. Instead, use an additional -e script to clean up after the +bug on Solaris. The second script will be a functional no-op on most +sed implementations. + +Signed-off-by: Ben Walton +--- + git-submodule.sh | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/git-submodule.sh b/git-submodule.sh +index efc86ad..0adad22 100755 +--- a/git-submodule.sh ++++ b/git-submodule.sh +@@ -167,10 +167,12 @@ module_clone() + a=${a%/} + b=${b%/} + +- rel=$(echo $b | sed -e 's|[^/]*|..|g') ++ # Note: The second -e is to work around a bug in Solairs' ++ # xpg4/sed. It will be a no-op in a working implementation. ++ rel=$(echo $b | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') + echo "gitdir: $rel/$a" >"$path/.git" + +- rel=$(echo $a | sed -e 's|[^/]*|..|g') ++ rel=$(echo $a | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') + (clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") + } + +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Apr 9 17:57:25 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Apr 2012 15:57:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17632] csw/mgar/gar/v2/categories Message-ID: Revision: 17632 http://gar.svn.sourceforge.net/gar/?rev=17632&view=rev Author: wbonnet Date: 2012-04-09 15:57:25 +0000 (Mon, 09 Apr 2012) Log Message: ----------- Add defaults for xfce4.10 Added Paths: ----------- csw/mgar/gar/v2/categories/xfce4.10/ csw/mgar/gar/v2/categories/xfce4.10/category.mk Removed Paths: ------------- csw/mgar/gar/v2/categories/xfce4.10/category.mk Deleted: csw/mgar/gar/v2/categories/xfce4.10/category.mk =================================================================== --- csw/mgar/gar/v2/categories/xfce/category.mk 2011-02-24 16:12:32 UTC (rev 13465) +++ csw/mgar/gar/v2/categories/xfce4.10/category.mk 2012-04-09 15:57:25 UTC (rev 17632) @@ -1,37 +0,0 @@ -# XFCE -XFCE_ROOT = http://www.us.xfce.org -XFCE_VERSION ?= 4.6.1 -XFCE_MIRROR = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/ - -MASTER_SITES ?= $(XFCE_MIRROR) -VERSION ?= $(XFCE_VERSION) -PKGDIST ?= $(NAME)-$(VERSION).tar.bz2 -DISTFILES += $(PKGDIST) - -# Compiler options -# Compiler options -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -CPPFLAGS += -I$(DESTDIR)/opt/csw/include/xfce4 -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -# pkg-config options -EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig - -# Configure common options -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-debug -CONFIGURE_ARGS += --enable-final -CONFIGURE_ARGS += --enable-xinerama -CONFIGURE_ARGS += --enable-dbus - -MSGFMT= /opt/csw/bin/gmsgfmt -MSGMERGE= /opt/csw/bin/gmsgmerge -XGETTEXT = /opt/csw/bin/gxgettext -GETTEXT = /opt/csw/bin/ggettext -export MSGMERGE -export MSGFMT -export XGETTEXT -export GETTEXT - -include gar/gar.mk Copied: csw/mgar/gar/v2/categories/xfce4.10/category.mk (from rev 17631, csw/mgar/gar/v2/categories/xfce/category.mk) =================================================================== --- csw/mgar/gar/v2/categories/xfce4.10/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/xfce4.10/category.mk 2012-04-09 15:57:25 UTC (rev 17632) @@ -0,0 +1,37 @@ +# XFCE +XFCE_ROOT = http://www.us.xfce.org +XFCE_VERSION ?= 4.6.1 +XFCE_MIRROR = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/ + +MASTER_SITES ?= $(XFCE_MIRROR) +VERSION ?= $(XFCE_VERSION) +PKGDIST ?= $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(PKGDIST) + +# Compiler options +# Compiler options +CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath +CPPFLAGS += -I$(DESTDIR)/opt/csw/include/xfce4 +LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib + +# pkg-config options +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig + +# Configure common options +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --enable-final +CONFIGURE_ARGS += --enable-xinerama +CONFIGURE_ARGS += --enable-dbus + +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + +include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Apr 9 18:28:29 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Apr 2012 16:28:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17633] csw/mgar/pkg/xfce Message-ID: Revision: 17633 http://gar.svn.sourceforge.net/gar/?rev=17633&view=rev Author: wbonnet Date: 2012-04-09 16:28:28 +0000 (Mon, 09 Apr 2012) Log Message: ----------- First commit of version 4.10 Added Paths: ----------- csw/mgar/pkg/xfce/xfce-4.10/ csw/mgar/pkg/xfce/xfce-4.10/exo/ csw/mgar/pkg/xfce/xfce-4.10/exo/Makefile csw/mgar/pkg/xfce/xfce-4.10/exo/branches/ csw/mgar/pkg/xfce/xfce-4.10/exo/tags/ csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/ csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/garcon/ csw/mgar/pkg/xfce/xfce-4.10/garcon/Makefile csw/mgar/pkg/xfce/xfce-4.10/garcon/branches/ csw/mgar/pkg/xfce/xfce-4.10/garcon/tags/ csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/ csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/Makefile csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/branches/ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/tags/ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/Makefile csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/branches/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/tags/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/Makefile csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/branches/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/tags/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/newpkg-Makefile csw/mgar/pkg/xfce/xfce-4.10/thunar/ csw/mgar/pkg/xfce/xfce-4.10/thunar/Makefile csw/mgar/pkg/xfce/xfce-4.10/thunar/branches/ csw/mgar/pkg/xfce/xfce-4.10/thunar/tags/ csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/ csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/Makefile csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/branches/ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/tags/ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/tumbler/ csw/mgar/pkg/xfce/xfce-4.10/tumbler/Makefile csw/mgar/pkg/xfce/xfce-4.10/tumbler/branches/ csw/mgar/pkg/xfce/xfce-4.10/tumbler/tags/ csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/ csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0002-void-function-cannot-return-value.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfconf/ csw/mgar/pkg/xfce/xfce-4.10/xfconf/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfconf/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfconf/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch csw/mgar/pkg/xfce/xfce-4.10/xfwm4/ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfwm4/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch Added: csw/mgar/pkg/xfce/xfce-4.10/exo/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/exo/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/exo/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/exo/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,60 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = exo +VERSION = 0.7.2 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Extensions Library +define BLURB + Xfce Extensions Library +endef + + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWexo CSWexo-dev CSWexo-doc + +# Package description +SPKG_DESC_CSWexo = $(DESCRIPTION) +SPKG_DESC_CSWexo-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWexo-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWexo-doc = 1 +ARCHALL_CSWexo-dev = 1 + +# Dynamic prototype +PKGFILES_CSWexo-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWexo-doc = /opt/csw/share/gtk-doc/.* + +# Defines dependencies + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-python --enable-hal + +CPPFLAGS += -I/opt/csw/include/gtk-2.0 +CPPFLAGS += -I/opt/csw/lib/gtk-2.0/include/ +CPPFLAGS += -I/opt/csw/include/cairo +CPPFLAGS += -I/opt/csw/include/pango-1.0 +CPPFLAGS += -I/opt/csw/include/gdk-pixbuf-2.0 +CPPFLAGS += -I/opt/csw/include/atk-1.0/ +CPPFLAGS += -I/opt/csw/include/xfce4/libxfce4ui-1/ + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + + Added: csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/exo/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 67dbed87aafb4726ffd532249eaacbdf2aba350d Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 13:03:38 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 60e5e87..7745ef9 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/garcon/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/garcon/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/garcon/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,48 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = garcon +VERSION = 0.1.11 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce's freedesktop.org specification compatible menu implementation library +define BLURB + Xfce's freedesktop.org specification compatible menu implementation library +endef + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +# Catalog description +PACKAGES = CSWgarcon CSWgarcon-dev CSWgarcon-doc + +# Package description +SPKG_DESC_CSWgarcon = $(DESCRIPTION) +SPKG_DESC_CSWgarcon-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWgarcon-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWgarcon-doc = 1 +ARCHALL_CSWgarcon-dev = 1 + +# Dynamic prototype +PKGFILES_CSWgarcon-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWgarcon-dev += /opt/csw/include/xfce4/garcon/.* +PKGFILES_CSWgarcon-doc = /opt/csw/share/gtk-doc/.* + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + Added: csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/garcon/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,58 @@ +From 02036d2ec016b89a1fb0118f8c1f786f6d1f8b31 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 13:34:32 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 34 +++++++++++++++++++++++++++++----- + 1 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 05605ad..1f48884 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -618,11 +618,35 @@ _IT_SUBST(INTLTOOL_THEME_RULE) + _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + +-# Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++i# Check the gettext tools to make sure they are GNU ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/gtk-xfce-engine/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,37 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gtk-xfce-engine +VERSION = 2.99.2 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce GTK theme engine +define BLURB + Xfce GTK theme engine +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +# Catalog description +PACKAGES = CSWgtkxfceengine + +# Package description +SPKG_DESC_CSWgtkxfceengine = $(DESCRIPTION) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + + Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,79 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libxfce4ui +VERSION = 4.9.1 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Share commonly used Xfce widgets amoung the Xfce applications +define BLURB + libxfce4ui is the replacement of the old libxfce4ui library. It is used to share commonly used Xfce widgets amoung the Xfce applications. +endef + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PACKAGES = CSWlibxfce4ui CSWlibxfce4ui-dev CSWlibxfce4ui-doc + +# Package description +SPKG_DESC_CSWlibxfce4ui = $(DESCRIPTION) +SPKG_DESC_CSWlibxfce4ui-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWlibxfce4ui-doc = $(DESCRIPTION) documentation package + +# Dynamic prototype +PKGFILES_CSWlibxfce4ui-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxfce4ui-dev += /opt/csw/include/xfce4/libxfce4ui/.* +PKGFILES_CSWlibxfce4ui-doc = /opt/csw/share/gtk-doc/.* + +# Defines dependencies +RUNTIME_DEP_PKGS_CSWlibxfce4ui-dev = +RUNTIME_DEP_PKGS_CSWlibxfce4ui-doc = + +ARCHALL_CSWlibxfce4ui-doc = 1 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWpango +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfconf +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4util +RUNTIME_DEP_PKGS_CSWlibxfce4ui-dev += CSWlibxfce4ui + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) + +CPPFLAGS += -I/opt/csw/include/gtk-2.0 +CPPFLAGS += -I/opt/csw/lib/gtk-2.0/include/ +CPPFLAGS += -I/opt/csw/include/cairo +CPPFLAGS += -I/opt/csw/include/pango-1.0 +CPPFLAGS += -I/opt/csw/include/gdk-pixbuf-2.0 +CPPFLAGS += -I/opt/csw/include/atk-1.0/ + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4ui/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 197af05cfdf5f2cf9c01733f3f1af21dbf04a10f Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 00:12:53 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index b483c44..f07cfd6 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,61 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libxfce4util +VERSION = 4.9.0 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Utilities Library +define BLURB + Xfce Utilities Library +endef + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +BUILD_DEP_PKGS += CSWggettext + +# Catalog description +PACKAGES = CSWlibxfce4util CSWlibxfce4util-dev CSWlibxfce4util-doc + +# Package description +SPKG_DESC_CSWlibxfce4util = $(DESCRIPTION) +SPKG_DESC_CSWlibxfce4util-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWlibxfce4util-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWlibxfce4util-doc = 1 +ARCHALL_CSWlibxfce4util-dev = 1 + +# Dynamic prototype +PKGFILES_CSWlibxfce4util-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxfce4util-dev += /opt/csw/include/xfce4/libxfce4util/.* +PKGFILES_CSWlibxfce4util-doc = /opt/csw/share/gtk-doc/.* + +# Defines dependencies +RUNTIME_DEP_PKGS_CSWlibxfce4util-doc = +RUNTIME_DEP_PKGS_CSWlibxfce4util-dev += CSWlibxfce4util +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibglib2-0-0 + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +CHECKPKG_OVERRIDES_CSWlibxfce4util-doc += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html +CHECKPKG_OVERRIDES_CSWlibxfce4util-dev += archall-devel-package + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + + Added: csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/libxfce4util/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,55 @@ +From cf884c94cb9ba69bedef1f1d67f59fc24f215e9b Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Sun, 8 Apr 2012 16:36:53 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index b483c44..f07cfd6 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 Added: csw/mgar/pkg/xfce/xfce-4.10/newpkg-Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/newpkg-Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/newpkg-Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,28 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ${name} +VERSION = ${version} +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xfce/xfce-4.10/thunar/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,42 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Thunar +VERSION = 1.3.1 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Thunar File Manager +define BLURB + Xfce Thunar File Manager +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-x --enable-dbus --with-volume-manager=auto + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWthunar CSWthunar-doc + +# Package description +SPKG_DESC_CSWthunar = $(DESCRIPTION) +SPKG_DESC_CSWthunar-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWthunar-doc = 1 +PKGFILES_CSWthunar-doc = /opt/csw/share/gtk-doc/.* + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From a8e8c8fc254a41f604a57b0dfa8b06f21dc47250 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 19:01:09 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index a53ce6f..c0b43d1 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,41 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = thunar-volman +VERSION = 0.7.0 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Thunar Volume Manager +define BLURB + The Thunar Volume Manager is an extension for the Thunar file manager, which enables automatic management of removable drives and media. For example, if thunar-volman is installed and configured properly, and you plug in your digital camera, it will automatically launch your preferred photo application and import the new pictures from the camera into your photo collection. +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWthunarvolman CSWthunarvolman-doc + +# Package description +SPKG_DESC_CSWthunarvolman = $(DESCRIPTION) +SPKG_DESC_CSWthunarvolman-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWthunarvolman-doc = 1 +PKGFILES_CSWthunarvolman-doc = /opt/csw/share/gtk-doc/.* + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/thunar-volman/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From cbf1c7cc1703cc517a56ae0857134e43d96ebc88 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 19:32:57 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index eb1aa04..ace4e71 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/tumbler/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/tumbler/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/tumbler/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,37 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tumbler +VERSION = 0.1.24 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = A D-Bus thumbnailing service based on the thumbnail management D-Bus specification. +define BLURB + A D-Bus thumbnailing service based on the thumbnail management D-Bus specification. +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +# Catalog description +PACKAGES = CSWtumbler + +# Package description +SPKG_DESC_CSWtumbler = $(DESCRIPTION) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/tumbler/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 05dc1d908e98190928418fd236739b6ca0803f47 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 18:51:31 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index c50b573..a3bef82 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1946,10 +1946,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,39 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-appfinder +VERSION = 4.9.4 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Application Finder +define BLURB + Xfce Application Finder +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch +PATCHFILES += 0002-void-function-cannot-return-value.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +# Catalog description +PACKAGES = CSWxfce4appfinder + +# Package description +SPKG_DESC_CSWxfce4appfinder = $(DESCRIPTION) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 83cc5bd0bedcb081d0728adf3797995feadffadc Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 16:21:01 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 2e4af2e..f7e1f21 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0002-void-function-cannot-return-value.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0002-void-function-cannot-return-value.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-appfinder/trunk/files/0002-void-function-cannot-return-value.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,26 @@ +From cf185c8a645cc261fa0725e992a67b2c7d882195 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 16:24:31 +0200 +Subject: [PATCH] void function cannot return value + +--- + src/appfinder-window.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/appfinder-window.c b/src/appfinder-window.c +index 68a6bb6..37df6a9 100644 +--- a/src/appfinder-window.c ++++ b/src/appfinder-window.c +@@ -437,7 +437,9 @@ xfce_appfinder_window_unmap (GtkWidget *widget) + xfconf_channel_set_int (window->channel, "/last/window-width", width); + xfconf_channel_set_int (window->channel, "/last/pane-position", position); + ++/* + return (*GTK_WIDGET_CLASS (xfce_appfinder_window_parent_class)->unmap) (widget); ++*/ + } + + +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-dev-tools/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,31 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-dev-tools +VERSION = 4.9.1 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Development Tools +define BLURB + Xfce Development Tools +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +# Catalog description +PACKAGES = CSWxfcedevtools + +# Package description +SPKG_DESC_CSWxfcedevtools = $(DESCRIPTION) + +include gar/category.mk Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-panel +VERSION = 4.9.1 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Panel +define BLURB + Xfce Panel +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWxfce4panel + +# Package description +SPKG_DESC_CSWxfce4panel = $(DESCRIPTION) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-panel/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 1a73ff2ad3120a6261d52333c743d273ae6f0067 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 16:31:44 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 0f6c6c7..0eae4fc 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,49 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-power-manager +VERSION = 1.0.11 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = This software is a power manager for the Xfce desktop +define BLURB + This software is a power manager for the Xfce desktop, Xfce power manager manages the power sources on the computer and the devices that can be controlled to reduce their power consumption (such as LCD brightness level, monitor sleep, CPU frequency scaling). In addition, xfce4-power-manager provides a set of freedesktop-compliant DBus interfaces to inform other applications about current power level so that they can adjust their power consumption, and it provides the inhibit interface which allows applications to prevent automatic sleep actions via the power manager; as an example, the operating system?s package manager should make use of this interface while it is performing update operations. +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWxfce4powermanager CSWxfce4powermanager-dev CSWxfce4powermanager-doc + +# Package description +SPKG_DESC_CSWxfce4powermanager = $(DESCRIPTION) +SPKG_DESC_CSWxfce4powermanager-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWxfce4powermanager-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWxfce4powermanager-doc = 1 +ARCHALL_CSWxfce4powermanager-dev = 1 + +# Dynamic prototype +PKGFILES_CSWxfce4powermanager-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWxfce4powermanager-dev += /opt/csw/include/xfce4/xfce4powermanager/.* +PKGFILES_CSWxfce4powermanager-doc = /opt/csw/share/gtk-doc/.* + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-power-manager/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 7c3ce3bf7e01f665ba4417ee01dfac4e7360147c Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 16:41:23 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 665b4ca..64c09fb 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,44 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-session +VERSION = 4.9.0 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Session Manager +define BLURB + Xfce Session Manager +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# Catalog description +PACKAGES = CSWxfce4session CSWxfce4session-dev + +# Package description +SPKG_DESC_CSWxfce4session = $(DESCRIPTION) +SPKG_DESC_CSWxfce4session-dev = $(DESCRIPTION) development package + +ARCHALL_CSWxfce4session-dev = 1 + +# Dynamic prototype +PKGFILES_CSWxfce4session-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWxfce4session-dev += /opt/csw/include/xfce4/xfce4session/.* + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-session/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From a7c08ea5a5d57dc5bdff8b9ffc2301c2717e86bc Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 14:14:39 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 2e4af2e..f7e1f21 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,58 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce4-settings +VERSION = 4.9.4 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Configuration system for the Xfce desktop environment +define BLURB + Configuration system for the Xfce desktop environment +endef + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +# Catalog description +PACKAGES = CSWxfce4settings CSWxfce4settings-doc + +# Package description +SPKG_DESC_CSWxfce4settings = $(DESCRIPTION) +SPKG_DESC_CSWxfce4settings-doc = $(DESCRIPTION) documentation package + +ARCHALL_CSWxfce4settings-doc = 1 + +# Dynamic prototype +PKGFILES_CSWxfce4settings-doc = /opt/csw/share/gtk-doc/.* + +# Defines dependencies + + +CPPFLAGS += -I/opt/csw/include/gtk-2.0 +CPPFLAGS += -I/opt/csw/lib/gtk-2.0/include/ +CPPFLAGS += -I/opt/csw/include/cairo +CPPFLAGS += -I/opt/csw/include/pango-1.0 +CPPFLAGS += -I/opt/csw/include/gdk-pixbuf-2.0 +CPPFLAGS += -I/opt/csw/include/atk-1.0/ +CPPFLAGS += -I/opt/csw/include/xfce4/libxfce4ui-1/ +CPPFLAGS += -I/opt/csw/include/xfce4/ +CPPFLAGS += -I/opt/csw/include/exo-1/ +CPPFLAGS += -I/opt/csw/include/xfce4/libxfce4kbd-private-2 + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce4-settings/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 25a158ca92dd6c6e2235004af6dee9240aa22ecb Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 12:49:47 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 665b4ca..64c09fb 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfconf/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfconf/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfconf/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,64 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfconf +VERSION = 4.9.0 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfconf is a simple client-server configuration storage and query system +define BLURB + Xfconf is a simple client-server configuration storage and query system +endef + +DISTFILES = $(NAME)-$(VERSION).tar.bz2 + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 + +# Catalog description +PACKAGES = CSWxfconf CSWxfconf-dev CSWxfconf-doc + +# Package description +SPKG_DESC_CSWxfconf = $(DESCRIPTION) +SPKG_DESC_CSWxfconf-dev = $(DESCRIPTION) development package +SPKG_DESC_CSWxfconf-doc = $(DESCRIPTION) documentation package + +# Dynamic prototype +PKGFILES_CSWxfconf-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWxfconf-dev += /opt/csw/include/xfce4/xfconf/.* +PKGFILES_CSWxfconf-doc = /opt/csw/share/gtk-doc/.* + +# Required packages for compilation +BUILD_DEP_PKGS = CSWpmglib CSWpmextutilsdepends CSWpmextutpkgconf + +# Defines dependencies +ARCHALL_CSWxfconf-doc = 1 +RUNTIME_DEP_PKGS_CSWxfconf-dev += CSWxfconf + +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibxfce4util +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWxfconf += CSWperl +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWxfconf-dev += CSWxfconf +RUNTIME_DEP_PKGS_CSWxfconf-doc = + +#PATCHFILES = xf-conf-locking-utils.h.diff xfconf-gvaluefuncs.h.diff Makefile.PL.in.diff + +SITEPREFIX = /opt/csw/share +export SITEPREFIX + +TEST_SCRIPTS = + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + Added: csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfconf/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 0f0eccd985d9decf67f47024566a88a6e67b5481 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Sun, 8 Apr 2012 19:05:47 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 0f6c6c7..7e8c60c 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -619,10 +619,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,46 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfdesktop +VERSION = 4.9.2 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Desktop Manager +define BLURB + Xfce Desktop Manager +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +CONFIGURE_ARGS += --enable-desktop-icons +CONFIGURE_ARGS += --enable-file-icons +CONFIGURE_ARGS += --enable-thunarx +CONFIGURE_ARGS += --enable-exo +CONFIGURE_ARGS += --enable-menueditor +CONFIGURE_ARGS += --enable-desktop-menu +CONFIGURE_ARGS += --enable-panel-plugin + +CONFIGURE_ARGS = $(DIRPATHS) + +# Catalog description +PACKAGES = CSWxfdesktop + +# Package description +SPKG_DESC_CSWxfdesktop = $(DESCRIPTION) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) + Added: csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfdesktop/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From 020a56168b7cb036e78b10f78dd83ba09298e371 Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 15:41:33 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 2e4af2e..f7e1f21 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + Added: csw/mgar/pkg/xfce/xfce-4.10/xfwm4/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfwm4/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 16860 2012-01-20 15:19:33Z dmichelsen $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/xfce/xfce-4.10 directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @python -c 'from mako.template import Template; \ + v = { "name": "$*", "version": "x.y" }; \ + t = Template(filename="newpkg-Makefile"); \ + print t.render(**v)' > $*/trunk/Makefile + @svn add $*/trunk/Makefile + @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk + @echo + @echo "Your package is set up for editing at $*/trunk" Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/Makefile 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,38 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfwm4 +VERSION = 4.9.0 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce Window Manager +define BLURB + Xfce Window Manager +endef + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PATCHFILES += 0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-xsync --enable-render --enable-randr --enable-xinerama --enable-compositor + +# Catalog description +PACKAGES = CSWxfwm4 + +# Package description +SPKG_DESC_CSWxfwm4 = $(DESCRIPTION) + +include gar/category.mk + +pre-configure-modulated: + ( cd "${WORKSRC}" ; pwd ; autoconf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfwm4/trunk/files/0001-Under-Solaris-try-to-find-first-the-binanries-with-t.patch 2012-04-09 16:28:28 UTC (rev 17633) @@ -0,0 +1,56 @@ +From c3c8ff9af6ada88124c791107ee65f01cdc6eeca Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Mon, 9 Apr 2012 15:55:58 +0200 +Subject: [PATCH] Under Solaris try to find first the binanries with the g + prefix + +--- + aclocal.m4 | 32 ++++++++++++++++++++++++++++---- + 1 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 665b4ca..64c09fb 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -551,10 +551,34 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++OS_NAME=`uname -s` ++ ++# Under Solaris try to find first the binanries with the g prefix ++# If not found, then switch to regular name ++if test ${OS_NAME} = "SunOS"; then ++ AC_PATH_PROG(XGETTEXT, gxgettext) ++ if test -z "${XGETTEXT}" ; then ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ fi ++ ++ AC_PATH_PROG(MSGMERGE, gmsgmerge) ++ if test -z "${MSGMERGE}" ; then ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ fi ++ ++ AC_PATH_PROG(MSGFMT, gmsgfmt) ++ if test -z "${MSGFMT}" ; then ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ fi ++ ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++else ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ AC_PATH_PROG(MSGMERGE, msgmerge) ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++fi ++ + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Apr 9 18:39:13 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Apr 2012 16:39:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17634] csw/mgar/pkg/xfce/xfce-4.6/ Message-ID: Revision: 17634 http://gar.svn.sourceforge.net/gar/?rev=17634&view=rev Author: wbonnet Date: 2012-04-09 16:39:13 +0000 (Mon, 09 Apr 2012) Log Message: ----------- Move old version to a dedicated folder Added Paths: ----------- csw/mgar/pkg/xfce/xfce-4.6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Apr 9 22:46:08 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Apr 2012 20:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17635] csw/mgar/pkg/xfce/xfce-4.10 Message-ID: Revision: 17635 http://gar.svn.sourceforge.net/gar/?rev=17635&view=rev Author: wbonnet Date: 2012-04-09 20:46:08 +0000 (Mon, 09 Apr 2012) Log Message: ----------- Add dtlogin package Added Paths: ----------- csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/files/ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/files/xfce-dtlogin-4.10.tar.bz2 Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile 2012-04-09 20:46:08 UTC (rev 17635) @@ -0,0 +1,31 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce-dtlogin +VERSION = 4.10 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce lightweight desktop environment, dtlogin +define BLURB + Xfce lightweight desktop environment, dtlogin +endef + +# Catalog description +PACKAGES = CSWxfcedtlogin + +# Package description +SPKG_DESC_CSWxfcedtlogin = $(DESCRIPTION) + +ARCHALL_CSWxfcedtlogin-dev = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @gcp -fr $(WORKSRC) $(DESTDIR) + @rm -fr $(DESTDIR)/.git Added: csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/files/xfce-dtlogin-4.10.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/files/xfce-dtlogin-4.10.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/x-bzip2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Apr 9 23:24:47 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Apr 2012 21:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17636] csw/mgar/pkg/xfce/xfce-4.10 Message-ID: Revision: 17636 http://gar.svn.sourceforge.net/gar/?rev=17636&view=rev Author: wbonnet Date: 2012-04-09 21:24:46 +0000 (Mon, 09 Apr 2012) Log Message: ----------- Meta package is not yet working Modified Paths: -------------- csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/ csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/branches/ csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/tags/ csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/ csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/Makefile csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/files/ Modified: csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile 2012-04-09 20:46:08 UTC (rev 17635) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce-dtlogin/trunk/Makefile 2012-04-09 21:24:46 UTC (rev 17636) @@ -17,7 +17,7 @@ # Package description SPKG_DESC_CSWxfcedtlogin = $(DESCRIPTION) -ARCHALL_CSWxfcedtlogin-dev = 1 +ARCHALL_CSWxfcedtlogin = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Property changes on: csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfce/xfce-4.10/xfce-meta/trunk/Makefile 2012-04-09 21:24:46 UTC (rev 17636) @@ -0,0 +1,45 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xfce-meta +VERSION = 4.10 +GARTYPE = v2 +CATEGORIES = xfce4.10 + +DESCRIPTION = Xfce lightweight desktop environment, meta +define BLURB + Xfce lightweight desktop environment, meta +endef + +# Catalog description +PACKAGES = CSWxfcemeta + +# Package description +SPKG_DESC_CSWxfcemeta = $(DESCRIPTION) + +ARCHALL_CSWxfcemeta = 1 + +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWgtkxfceengine +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4ui +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4util +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfce4appfinder +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfce4panel +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfce4session +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfce4settings +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfcedtlogin +# RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfcepowermanager +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWexo +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWgarcon +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfdesktop +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfconf +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWxfwm4 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWthunar +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWthunarvolman +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWtumbler + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Apr 9 23:31:49 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 09 Apr 2012 21:31:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17637] csw/mgar/pkg/powerdns/branches Message-ID: Revision: 17637 http://gar.svn.sourceforge.net/gar/?rev=17637&view=rev Author: wilbury Date: 2012-04-09 21:31:48 +0000 (Mon, 09 Apr 2012) Log Message: ----------- powerdns/branches/pdns-current: PowerDNS 3-CURRENT Added Paths: ----------- csw/mgar/pkg/powerdns/branches/pdns-current/ csw/mgar/pkg/powerdns/branches/pdns-current/Makefile csw/mgar/pkg/powerdns/branches/pdns-current/checksums Removed Paths: ------------- csw/mgar/pkg/powerdns/branches/pdns-current/Makefile csw/mgar/pkg/powerdns/branches/pdns-current/checksums csw/mgar/pkg/powerdns/branches/pdns-current/files/0001-Make-checking-for-LUA-behave-correctly.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0003-Include-correct-sys-ethernet.h.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0005-Use-correct-namespace-for-timegm.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0006-Use-also-llber-with-lldap.patch csw/mgar/pkg/powerdns/branches/pdns-current/files/0009-Expand-SYSCONFDIR-properly.patch Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/Makefile 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,98 +0,0 @@ -# PowerDNS -# $Id$ -# -NAME = pdns -VERSION = 3.0.1 -CATEGORIES = server -GARTYPE = v2 - -DESCRIPTION = An advanced DNS server with multiple backends -define BLURB - PowerDNS is an advanced DNS server, which allows for several different - backends. Current backends include MySQL, PostgreSQL, bind, etc. -endef - -MASTER_SITES = http://downloads.powerdns.com/releases/ -SPKG_SOURCEURL = http://www.powerdns.com/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += LICENSE -DISTFILES += cswpdns -PATCHFILES += 0001-Make-checking-for-LUA-behave-correctly.patch -PATCHFILES += 0002-Use-sys-isa_defs.h-instead-of-endian.h.patch -PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch -PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch -PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch -PATCHFILES += 0006-Use-also-llber-with-lldap.patch -PATCHFILES += 0009-Expand-SYSCONFDIR-properly.patch - -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) - -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - -LICENSE = $(FILEDIR)/LICENSE -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc - -GARCOMPILER = GNU -NORUNPATH = 1 - -REINPLACEMENTS += usrlocaletc -REINPLACE_MATCH_usrlocaletc = /usr/local/etc -REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns -REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist - -REINPLACEMENTS += usrlocallib -REINPLACE_MATCH_usrlocallib = /usr/local/lib -REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns -REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist - -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-modules="ldap geo gmysql" - -# 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 - -# PowerDNS does not have any "test" target -SKIPTEST = 1 - -PACKAGES = CSWpdns -CATALOGNAME_CSWpdns = powerdns -SPKG_DESC_CSWpdns = PowerDNS -RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 -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 -RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 -BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel - -# These are not errors! -CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns - -INITSMF = /etc/opt/csw/init.d/cswpdns -PRESERVECONF = /etc/opt/csw/pdns/pdns.conf - -post-install-modulated: - @echo " ==> Installing Init Script" - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns - @echo " ==> Moving config file" - @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf - @$(MAKECOOKIE) - -include gar/category.mk Copied: csw/mgar/pkg/powerdns/branches/pdns-current/Makefile (from rev 17622, csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-current/Makefile (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-current/Makefile 2012-04-09 21:31:48 UTC (rev 17637) @@ -0,0 +1,111 @@ +# PowerDNS +# $Id$ +# +NAME = pdns +VERSION = current-r2559 +CATEGORIES = server +GARTYPE = v2 + +DESCRIPTION = An advanced DNS server with multiple backends +define BLURB + PowerDNS is an advanced DNS server, which allows for several different + backends. Current backends include MySQL, PostgreSQL, bind, etc. +endef + +# Open issues: +# -llber +# timegm() in utils.hh ldapbackend +# endian.h net.c +# +# AR libpolarssl.a +# ar: creating libpolarssl.a +# RL libpolarssl.a +# ar: one of [drqtpmx] must be specified +# gmake[5]: *** [libpolarssl.a] Error 1 +# ^^^ treba pouzit ranlib +# +# @@SYSCONFDIR@@ +# asprintf http://blogs.everycity.co.uk/alasdair/2011/07/vasprintf-and-asprintf-on-solaris-10/ +# +MASTER_SITES = http://sk.freebsd.org/pub/local/distfiles/ +SPKG_SOURCEURL = http://www.powerdns.com/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += LICENSE +DISTFILES += cswpdns + +WORKSRC = $(WORKDIR)/$(NAME) + +LICENSE = $(FILEDIR)/LICENSE +PACKAGING_PLATFORMS = solaris10-i386 + +GARCOMPILER = GNU +NORUNPATH = 1 + +REINPLACEMENTS += usrlocaletc +REINPLACE_MATCH_usrlocaletc = /usr/local/etc +REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns +REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist + +REINPLACEMENTS += usrlocallib +REINPLACE_MATCH_usrlocallib = /usr/local/lib +REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns +REINPLACE_FILES_usrlocallib = pdns/pdns.conf-dist + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns +CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns +CONFIGURE_ARGS += --enable-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" +EXTRA_CONFIGURE_ENV += "PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig" + +# 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 + +# PowerDNS does not have any "test" target +SKIPTEST = 1 + +PACKAGES = CSWpdns +CATALOGNAME_CSWpdns = powerdns +SPKG_DESC_CSWpdns = PowerDNS +RUNTIME_DEP_PKGS_CSWpdns += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibmysqlclient15 +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 +RUNTIME_DEP_PKGS_CSWpdns += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWpdns += CSWlibsqlite3-0 +BUILD_DEP_PKGS = CSWmysql-dev CSWboostdevel CSWlibsqlite3-dev CSWopenldap-dev CSWlibz-dev + +# These are not errors! +CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns + +INITSMF = /etc/opt/csw/init.d/cswpdns +PRESERVECONF = /etc/opt/csw/pdns/pdns.conf + +pre-configure-modulated: + (cd $(WORKSRC) && autoreconf -i && ./bootstrap) + @$(MAKECOOKIE) + +post-install-modulated: + @echo " ==> Installing Init Script" + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns + @echo " ==> Moving config file" + @mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf + @$(MAKECOOKIE) + +include gar/category.mk Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/checksums =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/checksums 2012-04-09 21:31:48 UTC (rev 17637) @@ -1 +0,0 @@ -a67763b2b45d9f3504a24607c5b4068d pdns-3.0.1.tar.gz Copied: csw/mgar/pkg/powerdns/branches/pdns-current/checksums (from rev 17616, csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/checksums) =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-current/checksums (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-current/checksums 2012-04-09 21:31:48 UTC (rev 17637) @@ -0,0 +1 @@ +ea2c3c45f2753f48830018e9682ca14a pdns-current-r2559.tar.gz Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0001-Make-checking-for-LUA-behave-correctly.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,25 +0,0 @@ -From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:06:09 +0200 -Subject: [PATCH 1/4] Make checking for LUA behave correctly. - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 1067417..55b5d20 100755 ---- a/configure -+++ b/configure -@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; } - - # Check whether --with-lua was given. - if test "${with_lua+set}" = set; then : -- withval=$with_lua; WITH_LUA=$withval] -+ withval=$with_lua; WITH_LUA=$withval - else - WITH_LUA=yes - fi --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,25 +0,0 @@ -From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:12:41 +0200 -Subject: [PATCH 2/4] Use sys/isa_defs.h instead of endian.h - ---- - pdns/ext/polarssl/library/net.c | 2 + - 1 file changed, 2 insertions(+), 0 deletions(-) - -diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c -index 67b52a7..8106b74 100644 ---- a/pdns/ext/polarssl/library/net.c -+++ b/pdns/ext/polarssl/library/net.c -@@ -59,6 +59,8 @@ static int wsa_init_done = 0; - #include - #elif defined(__APPLE__) - #include -+#elif defined(sun) -+#include - #else - #include - #endif --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0003-Include-correct-sys-ethernet.h.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0003-Include-correct-sys-ethernet.h.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,28 +0,0 @@ -From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 22:27:38 +0200 -Subject: [PATCH 3/4] Include correct sys/ethernet.h - ---- - pdns/dnspcap.hh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh -index 66e07b9..60596ff 100644 ---- a/pdns/dnspcap.hh -+++ b/pdns/dnspcap.hh -@@ -10,7 +10,11 @@ - #include - #include - #include -+#ifdef sun -+#include -+#else - #include -+#endif - #include - #include - #include "namespaces.hh" --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,25 +0,0 @@ -From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Tue, 3 Apr 2012 23:19:42 +0200 -Subject: [PATCH 4/4] Build only stub LUA pdns recursor implementation. Do not - check for LIBDIR - ---- - pdns/lua-pdns-recursor.cc | 2 +- - 1 file changed, 1 insertion(+), 0 deletions(-) - -diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc -index 5e0dd7f..eb6c380 100644 ---- a/pdns/lua-pdns-recursor.cc -+++ b/pdns/lua-pdns-recursor.cc -@@ -1,6 +1,6 @@ - #include "lua-pdns-recursor.hh" - --#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR) -+#if !defined(PDNS_ENABLE_LUA) - - // stub implementation - --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0005-Use-correct-namespace-for-timegm.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0005-Use-correct-namespace-for-timegm.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,25 +0,0 @@ -From f0c281399bfdd40dd9d02d5a3fe07417dd20b070 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 13:12:24 +0200 -Subject: [PATCH] Use correct namespace for timegm() - ---- - modules/ldapbackend/utils.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh -index ba60f9f..25392c3 100644 ---- a/modules/ldapbackend/utils.hh -+++ b/modules/ldapbackend/utils.hh -@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str ) - - if( tmp != NULL && *tmp == 0 ) - { -- return timegm( &tm ); -+ return Utility::timegm( &tm ); - } - - return 0; --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0006-Use-also-llber-with-lldap.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0006-Use-also-llber-with-lldap.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0006-Use-also-llber-with-lldap.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,20 +0,0 @@ -From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 4 Apr 2012 23:17:47 +0200 -Subject: [PATCH] Use also -llber with -lldap - ---- - modules/ldapbackend/OBJECTLIBS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS -index a787b8d..4adc2f0 100644 ---- a/modules/ldapbackend/OBJECTLIBS -+++ b/modules/ldapbackend/OBJECTLIBS -@@ -1 +1 @@ ---lldap_r -\ No newline at end of file -+-lldap_r -llber --- -1.7.9 - Deleted: csw/mgar/pkg/powerdns/branches/pdns-current/files/0009-Expand-SYSCONFDIR-properly.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-05 15:09:54 UTC (rev 17614) +++ csw/mgar/pkg/powerdns/branches/pdns-current/files/0009-Expand-SYSCONFDIR-properly.patch 2012-04-09 21:31:48 UTC (rev 17637) @@ -1,45 +0,0 @@ -From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Thu, 5 Apr 2012 13:36:22 +0200 -Subject: [PATCH] Expand @@SYSCONFDIR@@ properly. - ---- - pdns/dynloader.cc | 4 ++-- - pdns/receiver.cc | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc -index d810278..b7691a7 100644 ---- a/pdns/dynloader.cc -+++ b/pdns/dynloader.cc -@@ -53,9 +53,9 @@ int main(int argc, char **argv) - string s_programname="pdns"; - string localdir; - -- static char pietje[128]="!@@SYSCONFDIR@@:"; -+ static char pietje[128]="!/etc/opt/csw/pdns:"; - ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= -- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; -+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; - - ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; - ::arg().set("remote-address","Remote address to query"); -diff --git a/pdns/receiver.cc b/pdns/receiver.cc -index e92e67e..887b3eb 100644 ---- a/pdns/receiver.cc -+++ b/pdns/receiver.cc -@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv) - - static void UNIX_declareArguments() - { -- static char pietje[128]="!@@SYSCONFDIR@@:"; -+ static char pietje[128]="!/etc/opt/csw/pdns:"; - ::arg().set("config-dir","Location of configuration directory (pdns.conf)")= -- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR; -+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR; - - ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")=""; - ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR; --- -1.7.9 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 10 02:31:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Apr 2012 00:31:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17638] csw/mgar/pkg/git/trunk/files/ 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch Message-ID: Revision: 17638 http://gar.svn.sourceforge.net/gar/?rev=17638&view=rev Author: bdwalton Date: 2012-04-10 00:31:26 +0000 (Tue, 10 Apr 2012) Log Message: ----------- git/trunk: update sed workaround patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch Modified: csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch 2012-04-09 21:31:48 UTC (rev 17637) +++ csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch 2012-04-10 00:31:26 UTC (rev 17638) @@ -1,6 +1,6 @@ -From 097f067a25220fc3cc315163dfef07de6a1c5f20 Mon Sep 17 00:00:00 2001 +From 3be2e5008274f5710b61d2ac4efc35eeab014ac6 Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Mon, 9 Apr 2012 03:14:18 +0200 +Date: Tue, 10 Apr 2012 01:47:04 +0200 Subject: [PATCH] Avoid bug in Solaris xpg4/sed as used in submodule The sed provided by Solaris in /usr/xpg4/bin has a bug whereby an @@ -10,7 +10,7 @@ This is evidenced by: $ for sed in /usr/xpg4/bin/sed /usr/bin/sed /opt/csw/gnu/sed; do \ -echo 'ab' | $sed -e 's|[a]*|X|g' \ +echo 'ab' | $sed -e 's|[a]*|X|g'; \ done XXbX XbX @@ -21,33 +21,35 @@ default SANE_TOOL_PATH for Solaris. It led to paths such as ..../.. being used in the submodule .git gitdir reference. -Using the expression 's|\([^/]*\(/*\)\)|..\2|g' provides the desired -result with all three three tested sed implementations but is harder -to read. Instead, use an additional -e script to clean up after the -bug on Solaris. The second script will be a functional no-op on most -sed implementations. +As we do not need to handle fully qualfieid paths we can make the +regex match 1 or more instead of 0 or more non-/ characters so use +'s|[^/]\{1,\}|..|g' instead, which is correctly handled by all tested +sed implementations. This expression is semantically different than +the original one. It will not place leading '..' on a fully qualified +path as the original expression did. None of the paths passed to the +regex relied on this behaviour so changing it shouldn't have negative +impact. -Signed-off-by: Ben Walton +Signed-off-by: Ben Walton --- - git-submodule.sh | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + git-submodule.sh | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh -index efc86ad..0adad22 100755 +index efc86ad..2c18e0c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh -@@ -167,10 +167,12 @@ module_clone() +@@ -167,10 +167,11 @@ module_clone() a=${a%/} b=${b%/} - rel=$(echo $b | sed -e 's|[^/]*|..|g') -+ # Note: The second -e is to work around a bug in Solairs' -+ # xpg4/sed. It will be a no-op in a working implementation. -+ rel=$(echo $b | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') ++ # Turn path components into .. ++ rel=$(echo $b | sed -e 's|[^/]\{1,\}|..|g') echo "gitdir: $rel/$a" >"$path/.git" - rel=$(echo $a | sed -e 's|[^/]*|..|g') -+ rel=$(echo $a | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') ++ rel=$(echo $a | sed -e 's|[^/]\{1,\}|..|g') (clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 10 02:32:24 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Apr 2012 00:32:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17639] csw/mgar/pkg/git/trunk Message-ID: Revision: 17639 http://gar.svn.sourceforge.net/gar/?rev=17639&view=rev Author: bdwalton Date: 2012-04-10 00:32:23 +0000 (Tue, 10 Apr 2012) Log Message: ----------- git/trunk: work around broken xpg4/grep as used in the test suite Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-04-10 00:31:26 UTC (rev 17638) +++ csw/mgar/pkg/git/trunk/Makefile 2012-04-10 00:32:23 UTC (rev 17639) @@ -118,6 +118,7 @@ PATCHFILES += 0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch PATCHFILES += 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch +PATCHFILES += 0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch 2012-04-10 00:32:23 UTC (rev 17639) @@ -0,0 +1,36 @@ +From 7b0ec3913cca1607e6777ef527c39773c908ed4d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 9 Apr 2012 03:43:40 +0200 +Subject: [PATCH] Avoid problem with xpg4 grep in Solaris that broke t9400 + +The grep in Solaris' /usr/xpg4/bin as found by the default +SANE_TOOL_PATH was not properly handling the 'cvs co -c (shows module +database)' test. The [\t ] character set selection does not properly +trigger so the first grep in the test fails. + +Instead of working around this issue, switch to using the standard +test_cmp() shell function to perform the comparison instead. + +Signed-off-by: Ben Walton +--- + t/t9400-git-cvsserver-server.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh +index 9199550..df1405f 100755 +--- a/t/t9400-git-cvsserver-server.sh ++++ b/t/t9400-git-cvsserver-server.sh +@@ -500,8 +500,8 @@ test_expect_success 'cvs status (no subdirs in header)' ' + cd "$WORKDIR" + test_expect_success 'cvs co -c (shows module database)' ' + GIT_CONFIG="$git_config" cvs co -c > out && +- grep "^master[ ]\+master$" < out && +- ! grep -v "^master[ ]\+master$" < out ++ echo "master master" > out.expected && ++ test_cmp out out.expected + ' + + #------------ +-- +1.7.9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 10 10:21:11 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 10 Apr 2012 08:21:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17640] csw/mgar/pkg Message-ID: Revision: 17640 http://gar.svn.sourceforge.net/gar/?rev=17640&view=rev Author: wilbury Date: 2012-04-10 08:21:10 +0000 (Tue, 10 Apr 2012) Log Message: ----------- ragel/trunk: Initial commit. Added Paths: ----------- csw/mgar/pkg/ragel/ csw/mgar/pkg/ragel/Makefile csw/mgar/pkg/ragel/branches/ csw/mgar/pkg/ragel/tags/ csw/mgar/pkg/ragel/trunk/ csw/mgar/pkg/ragel/trunk/Makefile csw/mgar/pkg/ragel/trunk/checksums csw/mgar/pkg/ragel/trunk/files/ Added: csw/mgar/pkg/ragel/Makefile =================================================================== --- csw/mgar/pkg/ragel/Makefile (rev 0) +++ csw/mgar/pkg/ragel/Makefile 2012-04-10 08:21:10 UTC (rev 17640) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/ragel/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/ragel/trunk/Makefile =================================================================== --- csw/mgar/pkg/ragel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ragel/trunk/Makefile 2012-04-10 08:21:10 UTC (rev 17640) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ragel +VERSION = 6.7 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = Ragel State Machine Compiler +define BLURB +Ragel compiles executable finite state machines from regular languages. +Ragel targets C, C++, Objective-C, D, Java and Ruby. Ragel state machines +can not only recognize byte sequences as regular expression machines do, +but can also execute code at arbitrary points in the recognition of a +regular language. Code embedding is done using inline operators that +do not disrupt the regular language syntax. +endef + +MASTER_SITES = http://www.complang.org/ragel/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibstdc++6 + +include gar/category.mk + Property changes on: csw/mgar/pkg/ragel/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ragel/trunk/checksums =================================================================== --- csw/mgar/pkg/ragel/trunk/checksums (rev 0) +++ csw/mgar/pkg/ragel/trunk/checksums 2012-04-10 08:21:10 UTC (rev 17640) @@ -0,0 +1 @@ +f4423e0d8a6538dd4e61498fcfad3cec ragel-6.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Apr 11 14:59:10 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 11 Apr 2012 12:59:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17641] csw/mgar/pkg/samba/trunk Message-ID: Revision: 17641 http://gar.svn.sourceforge.net/gar/?rev=17641&view=rev Author: janholzh Date: 2012-04-11 12:59:10 +0000 (Wed, 11 Apr 2012) Log Message: ----------- samba/trunk: Update to 3.6.4 fixes: CVE-2012-1182 Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-04-10 08:21:10 UTC (rev 17640) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-04-11 12:59:10 UTC (rev 17641) @@ -3,7 +3,7 @@ # - secrets.tdb is searched in /opt/csw/private/secrets.tdb instead of /etc/opt/csw/samba/private/secrets.tdb NAME = samba -VERSION = 3.6.3 +VERSION = 3.6.4 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-04-10 08:21:10 UTC (rev 17640) +++ csw/mgar/pkg/samba/trunk/checksums 2012-04-11 12:59:10 UTC (rev 17641) @@ -1 +1 @@ -98ac9db9f4b6ebfc3f013aa193ffb0d1 samba-3.6.3.tar.gz +d8e070e2a3b12f202f347e4427469bc2 samba-3.6.4.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 Wed Apr 11 19:21:32 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 11 Apr 2012 17:21:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17642] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 17642 http://gar.svn.sourceforge.net/gar/?rev=17642&view=rev Author: bdwalton Date: 2012-04-11 17:21:31 +0000 (Wed, 11 Apr 2012) Log Message: ----------- git/trunk: always do tests with debug, verbose and immediate stop Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-04-11 12:59:10 UTC (rev 17641) +++ csw/mgar/pkg/git/trunk/Makefile 2012-04-11 17:21:31 UTC (rev 17642) @@ -8,7 +8,8 @@ VENDOR_URL = http://git-scm.org/ NO_SVN_TESTS=YesPlease -EXTRA_TEST_EXPORTS = NO_SVN_TESTS +GIT_TEST_OPTS="-i -v -d" +EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS # disable tests until next version bump (at the top so it stands out) # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Apr 11 19:24:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 11 Apr 2012 17:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17643] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 17643 http://gar.svn.sourceforge.net/gar/?rev=17643&view=rev Author: bdwalton Date: 2012-04-11 17:24:10 +0000 (Wed, 11 Apr 2012) Log Message: ----------- git/trunk: no quotes around GIT_TEST_OPTS value Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-04-11 17:21:31 UTC (rev 17642) +++ csw/mgar/pkg/git/trunk/Makefile 2012-04-11 17:24:10 UTC (rev 17643) @@ -8,7 +8,7 @@ VENDOR_URL = http://git-scm.org/ NO_SVN_TESTS=YesPlease -GIT_TEST_OPTS="-i -v -d" +GIT_TEST_OPTS=-i -v -d EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS # disable tests until next version bump (at the top so it stands out) 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 Apr 11 19:57:41 2012 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 11 Apr 2012 17:57:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17644] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 17644 http://gar.svn.sourceforge.net/gar/?rev=17644&view=rev Author: jake_goerzen Date: 2012-04-11 17:57:40 +0000 (Wed, 11 Apr 2012) Log Message: ----------- dovecot: update to version 2.0.20 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 2012-04-11 17:24:10 UTC (rev 17643) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2012-04-11 17:57:40 UTC (rev 17644) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.0.19 +VERSION = 2.0.20 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2012-04-11 17:24:10 UTC (rev 17643) +++ csw/mgar/pkg/dovecot/trunk/checksums 2012-04-11 17:57:40 UTC (rev 17644) @@ -1 +1 @@ -57b06c02bb7acd72bcc9d682fa2603ad dovecot-2.0.19.tar.gz +e67c16c5b7ca68244ae88569ab57903f dovecot-2.0.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 Thu Apr 12 14:19:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Apr 2012 12:19:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17645] csw/mgar/pkg/samba/trunk/Makefile Message-ID: Revision: 17645 http://gar.svn.sourceforge.net/gar/?rev=17645&view=rev Author: dmichelsen Date: 2012-04-12 12:19:12 +0000 (Thu, 12 Apr 2012) Log Message: ----------- samba: Adding smb.conf after merge is too late Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-04-11 17:57:40 UTC (rev 17644) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-04-12 12:19:12 UTC (rev 17645) @@ -345,9 +345,9 @@ -perl -pi -e 's!/\@INCLUDE_des\@//!,-I$(includedir),,!' \ $(WORKSRC)/source3/configure -post-merge: - ginstall -d $(PKGROOT)/etc/opt/csw/init.d - ginstall $(WORKDIR)/cswsamba $(PKGROOT)/etc/opt/csw/init.d/cswsamba - ginstall $(WORKDIR)/cswwinbind $(PKGROOT)/etc/opt/csw/init.d/cswwinbind - ginstall -d $(PKGROOT)/etc/opt/csw/samba - ginstall $(WORKDIR)/smb.conf $(PKGROOT)/etc/opt/csw/samba/smb.conf +post-install-modulated: + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba + ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind + ginstall -d $(DESTDIR)/etc/opt/csw/samba + ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Fri Apr 13 09:29:58 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Fri, 13 Apr 2012 07:29:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17646] csw/mgar/pkg/iozone/trunk/Makefile Message-ID: Revision: 17646 http://gar.svn.sourceforge.net/gar/?rev=17646&view=rev Author: aironskin Date: 2012-04-13 07:29:58 +0000 (Fri, 13 Apr 2012) Log Message: ----------- iozone/trunk: Reduced to platforms it builds on Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-04-12 12:19:12 UTC (rev 17645) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-04-13 07:29:58 UTC (rev 17646) @@ -23,32 +23,25 @@ DISTFILES = $(DISTNAME).tar DISTFILES += vx_ioctl.h -PATCHFILES = patch_makefile.diff -PATCHFILES += patch_manfile.diff -PATCHFILES += patch_vxioctl.diff - DOCS = IOzone_msword_98.pdf DOCS += IOzone_msword_98.doc DOCS += Iozone_ps.gz DOCS += Run_rules.doc +PATCHFILES = patch_makefile.diff +PATCHFILES += patch_manfile.diff +PATCHFILES += patch_vxioctl.diff + CONFIGURE_SCRIPTS = TEST_SCRIPTS = -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc solaris10-i386 -BUILD64 = 1 -BUILD_ARGS_5.9_sparc_32 = Solaris -BUILD_ARGS_5.9_sparc_64 = Solaris8-64-VXFS -BUILD_ARGS_5.10_sparc_32 = Solaris10 -BUILD_ARGS_5.10_sparc_64 = Solaris10cc -BUILD_ARGS_5.11_sparc_32 = Solaris10 -BUILD_ARGS_5.11_sparc_64 = Solaris10cc -BUILD_ARGS_5.9_i386_64 = Solaris8-64-VXFS -BUILD_ARGS_5.10_i386_32 = Solaris10 -BUILD_ARGS_5.10_i386_64 = Solaris10cc -BUILD_ARGS_5.11_i386_32 = Solaris10 -BUILD_ARGS_5.11_i386_64 = Solaris10cc +BUILD_ARGS_5.9_sparc_64 += Solaris8-64-VXFS +BUILD_ARGS_5.10_sparc_32 += Solaris10 +BUILD_ARGS_5.10_sparc_64 += Solaris10cc +BUILD_ARGS_5.10_i386_32 += Solaris10 +BUILD_ARGS_5.10_i386_64 += Solaris10cc BUILD_ARGS += $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORY_MODEL)) BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile 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 Apr 13 10:20:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 08:20:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17647] csw/mgar/pkg/xjobs/trunk Message-ID: Revision: 17647 http://gar.svn.sourceforge.net/gar/?rev=17647&view=rev Author: dmichelsen Date: 2012-04-13 08:20:59 +0000 (Fri, 13 Apr 2012) Log Message: ----------- xjobs/trunk: Update to 20120412 Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/Makefile csw/mgar/pkg/xjobs/trunk/checksums Modified: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile 2012-04-13 07:29:58 UTC (rev 17646) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2012-04-13 08:20:59 UTC (rev 17647) @@ -1,5 +1,5 @@ NAME = xjobs -VERSION = 20110730 +VERSION = 20120412 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums 2012-04-13 07:29:58 UTC (rev 17646) +++ csw/mgar/pkg/xjobs/trunk/checksums 2012-04-13 08:20:59 UTC (rev 17647) @@ -1 +1 @@ -4a6547455adae84dc72a1519f516f86f xjobs-20110730.tgz +6a90ab1e998241171c78e4e25d38665c xjobs-20120412.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 13 15:02:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 13:02:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17648] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 17648 http://gar.svn.sourceforge.net/gar/?rev=17648&view=rev Author: dmichelsen Date: 2012-04-13 13:02:50 +0000 (Fri, 13 Apr 2012) Log Message: ----------- libcurl4/trunk: Update to 7.25.0 Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2012-04-13 08:20:59 UTC (rev 17647) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2012-04-13 13:02:50 UTC (rev 17648) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.24.0 +VERSION = 7.25.0 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2012-04-13 08:20:59 UTC (rev 17647) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2012-04-13 13:02:50 UTC (rev 17648) @@ -1 +1 @@ -f912221d75eb8d8fe08900eaf011b023 curl-7.24.0.tar.bz2 +f0303d47d9d3e6e4f08c2863c6504823 curl-7.25.0.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 Apr 13 15:39:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 13:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17649] csw/mgar/pkg/iozone/trunk Message-ID: Revision: 17649 http://gar.svn.sourceforge.net/gar/?rev=17649&view=rev Author: dmichelsen Date: 2012-04-13 13:39:13 +0000 (Fri, 13 Apr 2012) Log Message: ----------- iozone/trunk: Rework of build process Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2012-04-13 13:02:50 UTC (rev 17648) +++ csw/mgar/pkg/iozone/trunk/Makefile 2012-04-13 13:39:13 UTC (rev 17649) @@ -14,15 +14,14 @@ read, pread ,mmap, aio_read, aio_write endef -VENDOR_URL = http://www.iozone.org/ + MASTER_SITES = http://www.iozone.org/src/current/ - DISTNAME = $(NAME)$(DISTVERSION) -DOCSRC = $(WORKDIR)$(DISTNAME)/docs DISTFILES = $(DISTNAME).tar DISTFILES += vx_ioctl.h +DOCSRC = $(WORKDIR)/$(DISTNAME)/docs DOCS = IOzone_msword_98.pdf DOCS += IOzone_msword_98.doc DOCS += Iozone_ps.gz @@ -32,19 +31,46 @@ PATCHFILES += patch_manfile.diff PATCHFILES += patch_vxioctl.diff +# Make sure to always use LDFLAGS on linking +PATCHFILES += 0001-Always-use-LDFLAGS-during-linkage.patch + +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +VENDOR_URL = http://www.iozone.org/ + +LICENSE_TEXT = This is freeware + +BUILD64 = 1 +ISAEXEC = 1 + CONFIGURE_SCRIPTS = -TEST_SCRIPTS = -PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc solaris10-i386 +BUILD_ARGS_5.9_i386_32 = Solaris +BUILD_ARGS_5.9_sparc_32 = Solaris +BUILD_ARGS_5.9_sparc_64 = Solaris8-64-VXFS +BUILD_ARGS_5.10_sparc_32 = Solaris10cc +BUILD_ARGS_5.10_sparc_64 = Solaris10cc +BUILD_ARGS_5.10_i386_32 = Solaris10cc +BUILD_ARGS_5.10_i386_64 = Solaris10cc +BUILD_TARGET = $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORYMODEL)) -BUILD_ARGS_5.9_sparc_64 += Solaris8-64-VXFS -BUILD_ARGS_5.10_sparc_32 += Solaris10 -BUILD_ARGS_5.10_sparc_64 += Solaris10cc -BUILD_ARGS_5.10_i386_32 += Solaris10 -BUILD_ARGS_5.10_i386_64 += Solaris10cc -BUILD_ARGS += $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORY_MODEL)) +BUILD_ARGS += $(BUILD_TARGET) + BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile +BUILD_OVERRIDE_VARS += CFLAGS +BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS) + +BUILD_OVERRIDE_VARS += S10CCFLAGS +BUILD_OVERRIDE_VAR_S10CCFLAGS = + +BUILD_OVERRIDE_VARS += LDFLAGS +BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) + +# There is no testsuite +TEST_SCRIPTS = + INSTALL_SCRIPTS = custom include gar/category.mk @@ -52,7 +78,7 @@ # Put the VxFS header file into the build directory post-extract-modulated: mkdir -p $(WORKSRC)/src/current - cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/src/current + cp $(WORKDIR)/vx_ioctl.h $(WORKSRC)/src/current @$(MAKECOOKIE) install-custom: Added: csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch =================================================================== --- csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch (rev 0) +++ csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch 2012-04-13 13:39:13 UTC (rev 17649) @@ -0,0 +1,27 @@ +From f8ff56d203f10bda91368020a57030dd9915a429 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 13 Apr 2012 11:03:45 +0200 +Subject: [PATCH] Always use LDFLAGS during linkage + +--- + src/current/makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/current/makefile b/src/current/makefile +index 70bb6b3..d3ef9f6 100644 +--- a/src/current/makefile ++++ b/src/current/makefile +@@ -384,8 +384,8 @@ Solaris10cc: iozone_solaris10cc.o libasync10cc.o libbif10cc.o fileop_Solaris10cc + $(CC) -O $(LDFLAGS) iozone_solaris10cc.o libasync10cc.o libbif10cc.o \ + -lthread -lpthread -lposix4 -lnsl -laio \ + -lsocket -o iozone +- $(CC) -O fileop_Solaris10cc.o -o fileop +- $(CC) -O pit_server.o -lthread -lpthread -lposix4 -lnsl -laio \ ++ $(CC) -O $(LDFLAGS) fileop_Solaris10cc.o -o fileop ++ $(CC) -O $(LDFLAGS) pit_server.o -lthread -lpthread -lposix4 -lnsl -laio \ + -lsocket -o pit_server + + # +-- +1.7.9 + 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 Apr 13 16:05:07 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 14:05:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17650] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 17650 http://gar.svn.sourceforge.net/gar/?rev=17650&view=rev Author: dmichelsen Date: 2012-04-13 14:05:07 +0000 (Fri, 13 Apr 2012) Log Message: ----------- mGAR v2: Fix merging of 64 bit Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-04-13 13:39:13 UTC (rev 17649) +++ csw/mgar/gar/v2/gar.mk 2012-04-13 14:05:07 UTC (rev 17650) @@ -780,7 +780,7 @@ MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED)) MERGE_SCRIPTS_isa-default ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate) +MERGE_SCRIPTS_isa-default64 ?= $(if $(BUILD64_ONLY),copy-relocate,copy-relocated-only copy-config-only) $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-default64) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-extra ?= copy-relocated-only copy-config-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS_isa-extra) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 13 16:39:54 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Apr 2012 14:39:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17651] csw/mgar/pkg/lang-python Message-ID: Revision: 17651 http://gar.svn.sourceforge.net/gar/?rev=17651&view=rev Author: wahwah Date: 2012-04-13 14:39:53 +0000 (Fri, 13 Apr 2012) Log Message: ----------- pkg/lang-python/python-cjson: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile csw/mgar/pkg/lang-python/python-cjson/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/python-cjson/ Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile 2012-03-19 12:17:00 UTC (rev 17457) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2012-04-13 14:39:53 UTC (rev 17651) @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = python-gflags -VERSION = 2.0 +NAME = python-cjson +VERSION = 1.0.5 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Commandline flags module for Python +DESCRIPTION = Very fast JSON encoder/decoder define BLURB This project is the python equivalent of google-gflags, a Google commandline flag implementation for C++. It is intended to be used in situations where a @@ -15,14 +15,12 @@ linked with a C++ app that uses google-gflags. endef SPKG_SOURCEURL = http://code.google.com/p/python-gflags/ -MASTER_SITES = $(GOOGLE_MIRROR) DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz +TEST_SCRIPTS = -UPSTREAM_MASTER_SITES = http://code.google.com/p/$(NAME)/downloads/list -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWpy-cjson += surplus-dependency|CSWpython -PACKAGES = CSWpy-gflags -CATALOGNAME = py_gflags -ARCHALL_CSWpy-gflags = 1 +PACKAGES = CSWpy-cjson include gar/category.mk Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-gflags/trunk/checksums 2012-03-19 12:17:00 UTC (rev 17457) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/checksums 2012-04-13 14:39:53 UTC (rev 17651) @@ -1 +1 @@ -c3ab70218dbf945cc32c0cd64c51d162 python-gflags-2.0.tar.gz +4d55b66ecdf0300313af9d030d9644a3 python-cjson-1.0.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 13 16:43:02 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Apr 2012 14:43:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17652] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 17652 http://gar.svn.sourceforge.net/gar/?rev=17652&view=rev Author: wahwah Date: 2012-04-13 14:43:02 +0000 (Fri, 13 Apr 2012) Log Message: ----------- lang-python/python/trunk: Version bump to 2.6.8 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/checksums Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-04-13 14:39:53 UTC (rev 17651) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-04-13 14:43:02 UTC (rev 17652) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.6.7 +VERSION = 2.6.8 CATEGORIES = lang GARTYPE = v2 VER = 2.6 Modified: csw/mgar/pkg/lang-python/python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/checksums 2012-04-13 14:39:53 UTC (rev 17651) +++ csw/mgar/pkg/lang-python/python/trunk/checksums 2012-04-13 14:43:02 UTC (rev 17652) @@ -1 +1 @@ -d40ef58ed88438a870bbeb0ac5d4217b Python-2.6.7.tar.bz2 +c6e0420a21d8b23dee8b0195c9b9a125 Python-2.6.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 13 18:08:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Apr 2012 16:08:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17653] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 17653 http://gar.svn.sourceforge.net/gar/?rev=17653&view=rev Author: bdwalton Date: 2012-04-13 16:08:37 +0000 (Fri, 13 Apr 2012) Log Message: ----------- apache2/trunk: depend on CSWlibaprutil1-ldap for dlopen() from the auth_ldap module; Mantis 4930 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-04-13 14:43:02 UTC (rev 17652) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-04-13 16:08:37 UTC (rev 17653) @@ -90,6 +90,8 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2 +# the loadable ldap module dynamically opens files in this apr sub-package +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-ldap RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl0-9-8 CSWlibz1 RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1 RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 13 18:11:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Apr 2012 16:11:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17654] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 17654 http://gar.svn.sourceforge.net/gar/?rev=17654&view=rev Author: wahwah Date: 2012-04-13 16:11:26 +0000 (Fri, 13 Apr 2012) Log Message: ----------- python: Force multiprocessing to work There are 10 kinds of stupid people: Those who hardcode HAVE_SEM_OPEN to 0 and those who hardcode it to 1. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/trunk/files/0019-Force-multiprocess-to-compile.patch Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-04-13 16:08:37 UTC (rev 17653) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-04-13 16:11:26 UTC (rev 17654) @@ -68,6 +68,9 @@ PATCHFILES += 0017-Random-insignificant-removals-of-usr-local.patch PATCHFILES += 0018-Removing-usr-local-from-mailcap.patch +PATCHFILES_5.10 += 0019-Force-multiprocess-to-compile.patch +PATCHFILES += $(PATCHFILES_$(GAROSREL)) + # Test for sunaudiodev fails. SKIPTEST = 1 Added: csw/mgar/pkg/lang-python/python/trunk/files/0019-Force-multiprocess-to-compile.patch =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/0019-Force-multiprocess-to-compile.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/0019-Force-multiprocess-to-compile.patch 2012-04-13 16:11:26 UTC (rev 17654) @@ -0,0 +1,27 @@ +From 18b33cfa2e9179cb0d3fc571d808bd0789bb1748 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 13 Apr 2012 17:02:51 +0200 +Subject: [PATCH] Force multiprocess to compile + +--- + setup.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index d7b6b07..3d7ce83 100644 +--- a/setup.py ++++ b/setup.py +@@ -1410,8 +1410,8 @@ class PyBuildExt(build_ext): + + elif platform == 'sunos5': + macros = dict( # Solaris +- HAVE_SEM_OPEN=0, # Not Implemented +- HAVE_SEM_TIMEDWAIT=0, # Not Implemented ++ HAVE_SEM_OPEN=1, # Not Implemented ++ HAVE_SEM_TIMEDWAIT=1, # Not Implemented + HAVE_FD_TRANSFER=1, + ) + libraries = ['rt'] +-- +1.7.9 + 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 Apr 13 18:12:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 16:12:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17655] csw/mgar/pkg/automake/trunk Message-ID: Revision: 17655 http://gar.svn.sourceforge.net/gar/?rev=17655&view=rev Author: dmichelsen Date: 2012-04-13 16:12:28 +0000 (Fri, 13 Apr 2012) Log Message: ----------- automake/trunk: Update to 1.11.5 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/automake/trunk/checksums Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2012-04-13 16:11:26 UTC (rev 17654) +++ csw/mgar/pkg/automake/trunk/Makefile 2012-04-13 16:12:28 UTC (rev 17655) @@ -1,10 +1,10 @@ NAME = automake -VERSION = 1.11.2 +VERSION = 1.11.5 CATEGORIES = devel GARTYPE = v2 EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.2 +MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.5 DESCRIPTION = A tool for automatically generating Makefiles. define BLURB @@ -64,7 +64,7 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* # alternatives [options] --install link name path priority [- # -slave link name path]... [--initscript service] Modified: csw/mgar/pkg/automake/trunk/checksums =================================================================== --- csw/mgar/pkg/automake/trunk/checksums 2012-04-13 16:11:26 UTC (rev 17654) +++ csw/mgar/pkg/automake/trunk/checksums 2012-04-13 16:12:28 UTC (rev 17655) @@ -1,5 +1,5 @@ 03bc9ebfa805f9ee5635f1f53fa1fa5f automake-1.10.3.tar.gz -79ad64a9f6e83ea98d6964cef8d8a0bc automake-1.11.2.tar.gz +bf6548f750693e195367d0339c893ff3 automake-1.11.5.tar.gz 2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz eb25355e3cf00aac83c580dde970a0b4 automake-1.7.9.tar.gz ce0662da5df68014eb1683c184c47a8e automake-1.8.5.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 Apr 13 18:36:03 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2012 16:36:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17656] csw/mgar/pkg/jbigkit/trunk/Makefile Message-ID: Revision: 17656 http://gar.svn.sourceforge.net/gar/?rev=17656&view=rev Author: dmichelsen Date: 2012-04-13 16:36:02 +0000 (Fri, 13 Apr 2012) Log Message: ----------- jbigkit/trunk: Fix relocation of amd64 library Modified Paths: -------------- csw/mgar/pkg/jbigkit/trunk/Makefile Modified: csw/mgar/pkg/jbigkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/jbigkit/trunk/Makefile 2012-04-13 16:12:28 UTC (rev 17655) +++ csw/mgar/pkg/jbigkit/trunk/Makefile 2012-04-13 16:36:02 UTC (rev 17656) @@ -48,8 +48,16 @@ REINPLACE_FILES_gmake += pbmtools/Makefile # Generate position independent code for shared library -EXTRA_CFLAGS = -xcode=pic13 +EXTRA_CFLAGS-sparc = -xcode=pic13 +# Use -Kpic on amd64 or this error will be thrown on ldd -r: +# ld.so.1: lddstub: fatal: relocation error: R_AMD64_32: file /opt/csw/lib/amd64/libjbig.so.2: symbol (unknown): value 0xfffffd7fff37aa9c does not fit +# See for details +# http://developers.sun.com/solaris/articles/about_amd64_abi.html +EXTRA_CFLAGS-i386 = -Kpic + +EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GARCH)) + # There is no configure CONFIGURE_SCRIPTS = @@ -69,10 +77,10 @@ ginstall -d $(DESTDIR)$(bindir) cd $(WORKSRC)/pbmtools && ginstall jbgtopbm jbgtopbm85 pbmtojbg pbmtojbg85 $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(libdir) - $(CC) $(LDFLAGS) -z allextract -G -h libjbig.so.2 -o $(DESTDIR)$(libdir)/libjbig.so.2.0 $(WORKSRC)/libjbig/libjbig.a + $(CC) $(LDFLAGS) -z allextract -z defs -G -h libjbig.so.2 -o $(DESTDIR)$(libdir)/libjbig.so.2.0 $(WORKSRC)/libjbig/libjbig.a -lc gln -s libjbig.so.2 $(DESTDIR)$(libdir)/libjbig.so gln -s libjbig.so.2.0 $(DESTDIR)$(libdir)/libjbig.so.2 - $(CC) $(LDFLAGS) -z allextract -G -h libjbig85.so.2 -o $(DESTDIR)$(libdir)/libjbig85.so.2.0 $(WORKSRC)/libjbig/libjbig85.a + $(CC) $(LDFLAGS) -z allextract -z defs -G -h libjbig85.so.2 -o $(DESTDIR)$(libdir)/libjbig85.so.2.0 $(WORKSRC)/libjbig/libjbig85.a -lc gln -s libjbig85.so.2 $(DESTDIR)$(libdir)/libjbig85.so gln -s libjbig85.so.2.0 $(DESTDIR)$(libdir)/libjbig85.so.2 ginstall -d $(DESTDIR)$(docdir)/libjbig_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 13 18:37:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Apr 2012 16:37:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17657] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 17657 http://gar.svn.sourceforge.net/gar/?rev=17657&view=rev Author: wahwah Date: 2012-04-13 16:37:09 +0000 (Fri, 13 Apr 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: version bump to 5.5.23 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-04-13 16:36:02 UTC (rev 17656) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-04-13 16:37:09 UTC (rev 17657) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 22 +PATCHLEVEL = 23 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-04-13 16:36:02 UTC (rev 17656) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-04-13 16:37:09 UTC (rev 17657) @@ -1 +1 @@ -c5b151a70e9ceed5308f108f1ece7b3b mysql-5.5.22.tar.gz +b614481967dc146c148027b598397b54 mysql-5.5.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 13 22:37:06 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Apr 2012 20:37:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17658] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 17658 http://gar.svn.sourceforge.net/gar/?rev=17658&view=rev Author: bdwalton Date: 2012-04-13 20:37:06 +0000 (Fri, 13 Apr 2012) Log Message: ----------- apache2/trunk: override apr-ldap excess dep Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-04-13 16:37:09 UTC (rev 17657) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-04-13 20:37:06 UTC (rev 17658) @@ -124,6 +124,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibapr-dev CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-ldap CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Apr 13 22:39:19 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 13 Apr 2012 20:39:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[17659] csw/mgar/pkg/libwnck/trunk Message-ID: Revision: 17659 http://gar.svn.sourceforge.net/gar/?rev=17659&view=rev Author: wbonnet Date: 2012-04-13 20:39:18 +0000 (Fri, 13 Apr 2012) Log Message: ----------- Bump version to 2.30.7 Modified Paths: -------------- csw/mgar/pkg/libwnck/trunk/Makefile csw/mgar/pkg/libwnck/trunk/checksums Modified: csw/mgar/pkg/libwnck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwnck/trunk/Makefile 2012-04-13 20:37:06 UTC (rev 17658) +++ csw/mgar/pkg/libwnck/trunk/Makefile 2012-04-13 20:39:18 UTC (rev 17659) @@ -1,10 +1,11 @@ NAME = libwnck -VERSION = 2.18.3 +VERSION = 2.30.7 # 2.18.3 = .so.18 # 2.19.92 = so.22 # 2.20.3 = .so.22 # 2.24.2 = .so.22 # 2.28.0 = .so.22 +# 2.30.7 = .so.22 CATEGORIES = lib GARTYPE = v2 @@ -23,32 +24,42 @@ BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWgtk2devel -PACKAGES += CSWlibwnck1-18 -SPKG_DESC_CSWlibwnck1-18 = Library used for writing pagers and tasks lists, libwnck-1.so.18 -PKGFILES_CSWlibwnck1-18 += $(call pkgfiles_lib,libwnck-1.so.18) -PKGFILES_CSWlibwnck1-18 += $(sharedstatedir)/locale/.*/libwnck\.mo -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWstartupnotif -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWpango -OBSOLETED_BY_CSWlibwnck1-18 += CSWlibwnck +PACKAGES += CSWlibwnck1-22 +SPKG_DESC_CSWlibwnck1-22 = Library used for writing pagers and tasks lists, libwnck-1.so.22 +PKGFILES_CSWlibwnck1-22 += $(call pkgfiles_lib,libwnck-1.so.22) +PKGFILES_CSWlibwnck1-22 += $(sharedstatedir)/locale/.*/libwnck\.mo +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWstartupnotif +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwnck1-22 += CSWpango +OBSOLETED_BY_CSWlibwnck1-22 += CSWlibwnck PACKAGES += CSWlibwnck-dev -SPKG_DESC_CSWlibwnck-dev = Development files for libwnck-1.so.18 +SPKG_DESC_CSWlibwnck-dev = Development files for libwnck-1.so.22 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWlibwnck1-18 +RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWlibwnck1-22 RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWglib2devel RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWgtk2devel +CPPFLAGS += -I/opt/csw/include/glib-2.0 +CPPFLAGS += -I/opt/csw/lib/glib-2.0/include/ +CPPFLAGS += -I/opt/csw/lib/gtk-2.0/include/ +CPPFLAGS += -I/opt/csw/include/gdk-pixbuf-2.0/ +CPPFLAGS += -I/opt/csw/include/gtk-2.0/ +CPPFLAGS += -I/opt/csw/include/cairo +CPPFLAGS += -I/opt/csw/include/pango-1.0 +CPPFLAGS += -I/opt/csw/include/atk-1.0/ +CPPFLAGS += -I/opt/csw/include/startup-notification-1.0/ + # For cos(3m) EXTRA_LINKER_FLAGS = -lm Modified: csw/mgar/pkg/libwnck/trunk/checksums =================================================================== --- csw/mgar/pkg/libwnck/trunk/checksums 2012-04-13 20:37:06 UTC (rev 17658) +++ csw/mgar/pkg/libwnck/trunk/checksums 2012-04-13 20:39:18 UTC (rev 17659) @@ -1 +1 @@ -1badcbb50e7bc59865f72ec270c15125 libwnck-2.18.3.tar.bz2 +9bef4b8560acca78cd6f08a95039af9c libwnck-2.30.7.tar.bz2 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 Apr 14 04:09:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Apr 2012 02:09:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17660] csw/mgar/pkg/git/trunk/files/ 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch Message-ID: Revision: 17660 http://gar.svn.sourceforge.net/gar/?rev=17660&view=rev Author: bdwalton Date: 2012-04-14 02:09:08 +0000 (Sat, 14 Apr 2012) Log Message: ----------- git/trunk: another update to the sed workaround patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch Modified: csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch 2012-04-13 20:39:18 UTC (rev 17659) +++ csw/mgar/pkg/git/trunk/files/0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch 2012-04-14 02:09:08 UTC (rev 17660) @@ -1,6 +1,6 @@ -From 3be2e5008274f5710b61d2ac4efc35eeab014ac6 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 10 Apr 2012 01:47:04 +0200 +From 7f273d2cfb16def4be2eb4110bfa9f30973c38da Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 11 Apr 2012 22:22:24 +0200 Subject: [PATCH] Avoid bug in Solaris xpg4/sed as used in submodule The sed provided by Solaris in /usr/xpg4/bin has a bug whereby an @@ -21,9 +21,9 @@ default SANE_TOOL_PATH for Solaris. It led to paths such as ..../.. being used in the submodule .git gitdir reference. -As we do not need to handle fully qualfieid paths we can make the -regex match 1 or more instead of 0 or more non-/ characters so use -'s|[^/]\{1,\}|..|g' instead, which is correctly handled by all tested +As we do not need to handle fully qualfied paths we can make the regex +match 1 or more instead of 0 or more non-/ characters so use +'s|[^/][^/]*|..|g' instead, which is correctly handled by all tested sed implementations. This expression is semantically different than the original one. It will not place leading '..' on a fully qualified path as the original expression did. None of the paths passed to the @@ -32,24 +32,23 @@ Signed-off-by: Ben Walton --- - git-submodule.sh | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + git-submodule.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh -index efc86ad..2c18e0c 100755 +index efc86ad..7aa9e95 100755 --- a/git-submodule.sh +++ b/git-submodule.sh -@@ -167,10 +167,11 @@ module_clone() +@@ -167,10 +167,10 @@ module_clone() a=${a%/} b=${b%/} - rel=$(echo $b | sed -e 's|[^/]*|..|g') -+ # Turn path components into .. -+ rel=$(echo $b | sed -e 's|[^/]\{1,\}|..|g') ++ rel=$(echo $b | sed -e 's|[^/][^/]*|..|g') echo "gitdir: $rel/$a" >"$path/.git" - rel=$(echo $a | sed -e 's|[^/]*|..|g') -+ rel=$(echo $a | sed -e 's|[^/]\{1,\}|..|g') ++ rel=$(echo $a | sed -e 's|[^/][^/]*|..|g') (clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sat Apr 14 10:44:14 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 14 Apr 2012 08:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17661] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 17661 http://gar.svn.sourceforge.net/gar/?rev=17661&view=rev Author: cgrzemba Date: 2012-04-14 08:44:14 +0000 (Sat, 14 Apr 2012) Log Message: ----------- poppler/trunk: add privat xpdf headers; Manits 0004666 Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-04-14 02:09:08 UTC (rev 17660) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-04-14 08:44:14 UTC (rev 17661) @@ -102,6 +102,8 @@ EXTRA_LINKER_FLAGS = -norunpath -xnorunpath CONFIGURE_ARGS = $(DIRPATHS) +### Install unsupported xpdf headers. +CONFIGURE_ARGS += --enable-xpdf-headers 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 Sat Apr 14 12:34:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Apr 2012 10:34:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17662] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: Revision: 17662 http://gar.svn.sourceforge.net/gar/?rev=17662&view=rev Author: dmichelsen Date: 2012-04-14 10:34:19 +0000 (Sat, 14 Apr 2012) Log Message: ----------- Manual: Rename Bootstrapping to Getting Started Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Removed Paths: ------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst Deleted: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst 2012-04-14 08:44:14 UTC (rev 17661) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst 2012-04-14 10:34:19 UTC (rev 17662) @@ -1,190 +0,0 @@ -------------- -Bootstrapping -------------- - -OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities to -automatically download, install and update packages. It needs to be installed -manually once, after that all maintenance is done via pkgutil. - -On a Solaris 10 system, you can use the capacity of pkgadd to download -and install it via http in one step:: - - pkgadd -d http://get.opencsw.org/now - -On Solaris 8 and 9 you need to download the package manually, e.g. using wget -and then install it:: - - wget http://mirror.opencsw.org/opencsw/pkgutil.pkg - pkgadd -d pkgutil.pkg all - -For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of PATH, -and ``/opt/csw/share/man`` in front of MANPATH. - -You can now start installing packages. For a list of available packages use:: - - pkgutil -l - -As the list is quite long and you probably have an idea what you are looking for the -list can be fuzzy-matched with:: - - root# pkgutil -a vim - common package catalog size - gvim CSWgvim 7.3.055,REV=2010.11.25 1.1 MB - vim CSWvim 7.3.055,REV=2010.11.25 1002.2 KB - vimrt CSWvimrt 7.3.055,REV=2010.11.25 7.3 MB - -Lets just go ahead and try one:: - - root# pkgutil -y -i vim - ... - root# vim - -Voila! You have installed your first package! - - ------------------- -Selecting a mirror ------------------- - -Now that you are about to install lots of stuff it may be a good time to select -one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors -are listed at:: - - http://www.opencsw.org/get-it/mirrors/ - -It is important to note that ``pkgutil`` can use **two** configuration files: - -- ``/etc/opt/csw/pkgutil.conf`` -- ``/opt/csw/etc/pkgutil.conf`` - -This may seem confusing, the reason why there are two is that it is possible to run -OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In this scenario -you use configurations in ``/opt/csw/etc`` for global settings and ``/etc/opt/csw`` -for zone-specific setting. Both ``pkgutil.conf`` are identical on installation with all -configuration options commented out, so you can just pick one for now. As a rule of thumb it is -recommended to prefer the more prominent ``/etc/opt/csw``. Please uncomment the line -with ``mirror`` so it looks similar to this with the URL replaced by the mirror you picked:: - - mirror=http://mirror.opencsw.org/opencsw/unstable - -You can verify the setting with ``pkgutil -V``:: - - ... - maxpkglist 10000 (default: 10000) - mirror http://mirror.opencsw.org/opencsw/unstable - (default: http://mirror.opencsw.org/opencsw/unstable) - noncsw false (default: false) - ... - -On the next catalog update with ``pkgutil -U`` the catalogs are pulled from the new mirror. - - -------------------------------------- -Setting up cryptographic verification -------------------------------------- - -The catalog is signed with PGP and it is a good idea to set up your system to verify -the integrity of the catalog. As the catalog itself contains hashes for all packages -in the catalog this ensures you actually install the packages which were officially -released. First you need to install ``pgp`` (of course with pkgutil!):: - - pkgutil -y -i gpg - -Then you need to import the public key:: - - root# wget -O - http://www.opencsw.org/security/ | gpg --import - - -The current fingerprint looks like this:: - - root# gpg --fingerprint board at opencsw.org - pub 1024D/9306CC77 2011-08-31 - Key fingerprint = 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 - uid OpenCSW catalog signing - sub 2048g/971EDE93 2011-08-31 - -You may also trust the key once you verified the fingerprint:: - root# /opt/csw/bin/gpg --edit-key board at opencsw.org trust - -Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf`` -and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this:: - - use_gpg=true - use_md5=true - -You can verify that it worked with ``pkgutil -V``:: - - root at login [login]:/etc/opt/csw > pkgutil -V - ... - show_current true (default: true) - stop_on_hook_soft_error not set (default: false) - use_gpg true (default: false) - use_md5 true (default: false) - wgetopts not set (default: none) - -On the next ``pkgutil -U`` you should see a catalog integrity verification wit ``gpg``:: - - ... - Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg. - gpg: Signature made Sat Jan 21 18:34:45 2012 CET using DSA key ID 9306CC77 - gpg: Good signature from "OpenCSW catalog signing " - gpg: WARNING: This key is not certified with a trusted signature! - gpg: There is no indication that the signature belongs to the owner. - Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 - ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 - ... - - --------------------- -Package dependencies --------------------- - -The OpenCSW packages have been compiled to allow easy forward migration and -crossgrades/mixing between Sparc and x64 CPUs. That means the same version of the -package is available for Solaris 10 and 11 for both Sparc and i386. There are -some exceptions where the software is absolutely not available or has a version -mismatch (e.g. acroread). To allow this there are usually no dependencies to -SUNW packages. This sometimes leads to large dependency chains (and people -thinking of OpenCSW packages as "bloated") but that is the price to pay for -the interoperability and we feel that in times of ever growing disks the -flexibility is worth more than the saved bytes. - -Package dependencies are modeled in the OpenCSW `catalogs`_ to allow automatic -dependency resolution via pkgutil. To view the current dependencies for a -package you can use:: - - pkgutil --deptree - - ---------------------------- -Setting up a private mirror ---------------------------- - -Sometimes it is sufficient to just go on with a mirror on the internet. However, there are situations -where a local mirror can be useful. When you have a lot of servers accessing the repository, want to control -the package updates exactly or when your production servers just can't access the internet at all -a local mirror is necessary. - -To set up the mirror you should use rsync as it can update your local copy quickly and with low -bandwidth use and also preserves hardlinks. Not all mirrors provide access via the rsync protocol, -a list can be found at http://www.opencsw.org/get-it/mirrors/ . -To make a full copy of the OpenCSW repository use this:: - - pkgutil -y -i rsync - rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo - -The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil clients. -Use http://myserver/url-to-repo/ for HTTP and file:///myserver/dir-to-repo for NFS as -mirror option in pkgutil. - - -Mirroring only a subset -======================= - -You can also mirror only a subset of the repository, e.g. the 'unstable' catalog or even -just a few packages. - -pkgutil --stream - - -Layout of the mirror -==================== Copied: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst (from rev 17611, csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst) =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 10:34:19 UTC (rev 17662) @@ -0,0 +1,190 @@ +--------------- +Getting started +--------------- + +OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities to +automatically download, install and update packages. It needs to be installed +manually once, after that all maintenance is done via pkgutil. + +On a Solaris 10 system, you can use the capacity of pkgadd to download +and install it via http in one step:: + + pkgadd -d http://get.opencsw.org/now + +On Solaris 8 and 9 you need to download the package manually, e.g. using wget +and then install it:: + + wget http://mirror.opencsw.org/opencsw/pkgutil.pkg + pkgadd -d pkgutil.pkg all + +For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of PATH, +and ``/opt/csw/share/man`` in front of MANPATH. + +You can now start installing packages. For a list of available packages use:: + + pkgutil -l + +As the list is quite long and you probably have an idea what you are looking for the +list can be fuzzy-matched with:: + + root# pkgutil -a vim + common package catalog size + gvim CSWgvim 7.3.055,REV=2010.11.25 1.1 MB + vim CSWvim 7.3.055,REV=2010.11.25 1002.2 KB + vimrt CSWvimrt 7.3.055,REV=2010.11.25 7.3 MB + +Lets just go ahead and try one:: + + root# pkgutil -y -i vim + ... + root# vim + +Voila! You have installed your first package! + + +------------------ +Selecting a mirror +------------------ + +Now that you are about to install lots of stuff it may be a good time to select +one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors +are listed at:: + + http://www.opencsw.org/get-it/mirrors/ + +It is important to note that ``pkgutil`` can use **two** configuration files: + +- ``/etc/opt/csw/pkgutil.conf`` +- ``/opt/csw/etc/pkgutil.conf`` + +This may seem confusing, the reason why there are two is that it is possible to run +OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In this scenario +you use configurations in ``/opt/csw/etc`` for global settings and ``/etc/opt/csw`` +for zone-specific setting. Both ``pkgutil.conf`` are identical on installation with all +configuration options commented out, so you can just pick one for now. As a rule of thumb it is +recommended to prefer the more prominent ``/etc/opt/csw``. Please uncomment the line +with ``mirror`` so it looks similar to this with the URL replaced by the mirror you picked:: + + mirror=http://mirror.opencsw.org/opencsw/unstable + +You can verify the setting with ``pkgutil -V``:: + + ... + maxpkglist 10000 (default: 10000) + mirror http://mirror.opencsw.org/opencsw/unstable + (default: http://mirror.opencsw.org/opencsw/unstable) + noncsw false (default: false) + ... + +On the next catalog update with ``pkgutil -U`` the catalogs are pulled from the new mirror. + + +------------------------------------- +Setting up cryptographic verification +------------------------------------- + +The catalog is signed with PGP and it is a good idea to set up your system to verify +the integrity of the catalog. As the catalog itself contains hashes for all packages +in the catalog this ensures you actually install the packages which were officially +released. First you need to install ``pgp`` (of course with pkgutil!):: + + pkgutil -y -i gpg + +Then you need to import the public key:: + + root# wget -O - http://www.opencsw.org/security/ | gpg --import - + +The current fingerprint looks like this:: + + root# gpg --fingerprint board at opencsw.org + pub 1024D/9306CC77 2011-08-31 + Key fingerprint = 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 + uid OpenCSW catalog signing + sub 2048g/971EDE93 2011-08-31 + +You may also trust the key once you verified the fingerprint:: + root# /opt/csw/bin/gpg --edit-key board at opencsw.org trust + +Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf`` +and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this:: + + use_gpg=true + use_md5=true + +You can verify that it worked with ``pkgutil -V``:: + + root at login [login]:/etc/opt/csw > pkgutil -V + ... + show_current true (default: true) + stop_on_hook_soft_error not set (default: false) + use_gpg true (default: false) + use_md5 true (default: false) + wgetopts not set (default: none) + +On the next ``pkgutil -U`` you should see a catalog integrity verification wit ``gpg``:: + + ... + Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg. + gpg: Signature made Sat Jan 21 18:34:45 2012 CET using DSA key ID 9306CC77 + gpg: Good signature from "OpenCSW catalog signing " + gpg: WARNING: This key is not certified with a trusted signature! + gpg: There is no indication that the signature belongs to the owner. + Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 + ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 + ... + + +-------------------- +Package dependencies +-------------------- + +The OpenCSW packages have been compiled to allow easy forward migration and +crossgrades/mixing between Sparc and x64 CPUs. That means the same version of the +package is available for Solaris 10 and 11 for both Sparc and i386. There are +some exceptions where the software is absolutely not available or has a version +mismatch (e.g. acroread). To allow this there are usually no dependencies to +SUNW packages. This sometimes leads to large dependency chains (and people +thinking of OpenCSW packages as "bloated") but that is the price to pay for +the interoperability and we feel that in times of ever growing disks the +flexibility is worth more than the saved bytes. + +Package dependencies are modeled in the OpenCSW `catalogs`_ to allow automatic +dependency resolution via pkgutil. To view the current dependencies for a +package you can use:: + + pkgutil --deptree + + +--------------------------- +Setting up a private mirror +--------------------------- + +Sometimes it is sufficient to just go on with a mirror on the internet. However, there are situations +where a local mirror can be useful. When you have a lot of servers accessing the repository, want to control +the package updates exactly or when your production servers just can't access the internet at all +a local mirror is necessary. + +To set up the mirror you should use rsync as it can update your local copy quickly and with low +bandwidth use and also preserves hardlinks. Not all mirrors provide access via the rsync protocol, +a list can be found at http://www.opencsw.org/get-it/mirrors/ . +To make a full copy of the OpenCSW repository use this:: + + pkgutil -y -i rsync + rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo + +The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil clients. +Use http://myserver/url-to-repo/ for HTTP and file:///myserver/dir-to-repo for NFS as +mirror option in pkgutil. + + +Mirroring only a subset +======================= + +You can also mirror only a subset of the repository, e.g. the 'unstable' catalog or even +just a few packages. + +pkgutil --stream + + +Layout of the mirror +==================== Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-14 08:44:14 UTC (rev 17661) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-14 10:34:19 UTC (rev 17662) @@ -8,7 +8,7 @@ :maxdepth: 2 introduction - bootstrapping + gettint-started configuring-services pkgutil-reference glossary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 14 12:38:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Apr 2012 10:38:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17663] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/index.rst Message-ID: Revision: 17663 http://gar.svn.sourceforge.net/gar/?rev=17663&view=rev Author: dmichelsen Date: 2012-04-14 10:38:14 +0000 (Sat, 14 Apr 2012) Log Message: ----------- opencsw-manual: Typo Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-14 10:34:19 UTC (rev 17662) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-14 10:38:14 UTC (rev 17663) @@ -8,7 +8,7 @@ :maxdepth: 2 introduction - gettint-started + getting-started configuring-services pkgutil-reference glossary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:32:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:32:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17664] csw/mgar/gar/v2/lib Message-ID: Revision: 17664 http://gar.svn.sourceforge.net/gar/?rev=17664&view=rev Author: wahwah Date: 2012-04-14 11:32:23 +0000 (Sat, 14 Apr 2012) Log Message: ----------- pkgdb: Use cjson, it's 10 times faster Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py csw/mgar/gar/v2/lib/python/rest.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-14 10:38:14 UTC (rev 17663) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-14 11:32:23 UTC (rev 17664) @@ -11,6 +11,7 @@ """ from Cheetah import Template +import cjson import json import catalog import common_constants @@ -189,12 +190,51 @@ if options.from_json: with open(options.from_json, "rb") as fd: logging.info("Loading %s", options.from_json) - diffs_by_catalogname = json.load(fd) + bundles_by_md5, jsonable_catalogs, diffs_by_catalogname = cjson.decode(fd.read()) + catalogs = dict((tuple(cjson.decode(x)), jsonable_catalogs[x]) for x in jsonable_catalogs) else: - diffs_by_catalogname = GetDiffsByCatalogname( + catalogs, diffs_by_catalogname = GetDiffsByCatalogname( catrel_from, catrel_to, options.include_downgrades, options.include_version_changes) + bundles_by_md5 = {} + bundles_missing = set() + cp = CachedPkgstats("pkgstats.db") + for key in catalogs: + for pkg in catalogs[key]: + # logging.debug("%r", pkg) + md5 = pkg["md5_sum"] + if md5 not in bundles_by_md5 and md5 not in bundles_missing: + stats = cp.GetPkgstats(md5) + bundle_key = "OPENCSW_BUNDLE" + # pprint.pprint(stats) + if stats: + if bundle_key in stats["pkginfo"]: + bundles_by_md5[md5] = stats["pkginfo"][bundle_key] + else: + logging.info( + "%r (%r) does not have the bundle set", + stats["basic_stats"]["pkg_basename"], md5) + bundles_missing.add(md5) + # Here's a good place to calculate the mapping between catalognames and + # bundle names. + change_types = "new_pkgs", "removed_pkgs", "updated_pkgs" + bundles_by_catalogname = {} + for catalogname in diffs_by_catalogname: + l = bundles_by_catalogname.setdefault(catalogname, set()) + for change_type in change_types: + if change_type in diffs_by_catalogname[catalogname]: + for change_info in diffs_by_catalogname[catalogname][change_type]: + pkg = change_info[2] + if "to" in pkg: + md5s = [x["md5_sum"] for x in (pkg["from"], pkg["to"])] + else: + md5s = [pkg["md5_sum"]] + for md5 in md5s: + if md5 in bundles_by_md5: + l.add(bundles_by_md5[md5]) namespace = { + "bundles_by_catalogname": bundles_by_catalogname, + "bundles_by_md5": bundles_by_md5, "diffs_by_catalogname": diffs_by_catalogname, "catrel_to": catrel_to, "catrel_from": catrel_from, @@ -202,7 +242,9 @@ } if options.save_json: with open(options.save_json, "wb") as fd: - json.dump(diffs_by_catalogname, fd) + jsonable_catalogs = dict((cjson.encode(x), catalogs[x]) for x in catalogs) + fd.write(cjson.encode( + (bundles_by_md5, jsonable_catalogs, diffs_by_catalogname))) t = Template.Template(CATALOG_MOD_TMPL, searchList=[namespace]) if options.output_file: logging.info("Saving output to %s", options.output_file) Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-04-14 10:38:14 UTC (rev 17663) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-04-14 11:32:23 UTC (rev 17664) @@ -2,7 +2,7 @@ import logging import urllib2 -import json +import cjson DEFAULT_URL = "http://buildfarm.opencsw.org" @@ -27,7 +27,7 @@ logging.debug("GetPkgByMd5(): GET %s", url) try: data = urllib2.urlopen(url).read() - return json.loads(data) + return cjson.decode(data) except urllib2.HTTPError, e: logging.warning("%s -- %s", url, e) if e.code == 404: @@ -53,7 +53,7 @@ logging.debug("GetCatalog(): GET %s", url) try: data = urllib2.urlopen(url).read() - return json.loads(data) + return cjson.decode(data) except urllib2.HTTPError, e: logging.warning("%s -- %s", url, e) return None @@ -67,4 +67,4 @@ # The server is no longer returning 404 when the package is absent. If # a HTTP error code is returned, we're letting the application fail. data = urllib2.urlopen(url).read() - return json.loads(data) + return cjson.decode(data) Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-04-14 10:38:14 UTC (rev 17663) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2012-04-14 11:32:23 UTC (rev 17664) @@ -6,11 +6,12 @@ import os sys.path.append(os.path.join(os.path.split(__file__)[0], "..", "..")) -import web -import sqlobject +import cjson import json import logging import pprint +import sqlobject +import web from lib.python import models from lib.python import configuration @@ -56,6 +57,7 @@ render = web.template.render(templatedir) +# TODO(maciej): Convert this extension to cjson. class PkgStatsEncoder(json.JSONEncoder): """Maps frozensets to lists.""" def default(self, obj): @@ -211,7 +213,7 @@ class RestMaintainerDetail(object): def GET(self, id): maintainer = models.Maintainer.selectBy(id=id).getOne() - return json.dumps(maintainer.GetRestRepr()) + return cjson.encode(maintainer.GetRestRepr()) class MaintainerCheckpkgReport(object): @@ -275,7 +277,7 @@ raise web.notfound() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=srv4-list') pkgs_data = [p.GetRestRepr(quick)[1] for p in pkgs] - return json.dumps(pkgs_data) + return cjson.encode(pkgs_data) class PkgnameByFilename(object): @@ -292,7 +294,7 @@ web.header('X-Rest-Info', 'I could tell you about the format, but I won\'t') web.header('Content-Disposition', 'attachment; filename=%s' % send_filename) - return json.dumps(sorted(pkgs)) + return cjson.encode(sorted(pkgs)) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() @@ -313,7 +315,7 @@ 'application/x-vnd.opencsw.pkg;type=pkgname-list') web.header('Content-Disposition', 'attachment; filename=%s' % send_filename) - return json.dumps(data) + return cjson.encode(data) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() @@ -326,7 +328,7 @@ mimetype, data_structure = pkg.GetRestRepr() web.header('Content-type', mimetype) web.header('Access-Control-Allow-Origin', '*') - return json.dumps(data_structure) + return cjson.encode(data_structure) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() @@ -346,7 +348,7 @@ "line": file_obj.line, } serializable_files = [FileDict(x) for x in files] - return json.dumps(serializable_files) + return cjson.encode(serializable_files) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() @@ -389,9 +391,9 @@ mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) web.header('Access-Control-Allow-Origin', '*') - return json.dumps(data) + return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: - return json.dumps(None) + return cjson.encode(None) except sqlobject.dberrors.OperationalError, e: raise web.internalerror(e) @@ -424,9 +426,9 @@ srv4 = res.getOne() mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) - return json.dumps(data) + return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: - return json.dumps(None) + return cjson.encode(None) except sqlobject.dberrors.OperationalError, e: raise web.internalerror(e) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:32:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17665] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17665 http://gar.svn.sourceforge.net/gar/?rev=17665&view=rev Author: wahwah Date: 2012-04-14 11:32:45 +0000 (Sat, 14 Apr 2012) Log Message: ----------- pkgdb: Add bundle information to integrations When doing the integration, display which bundle each catalogname belongs to. In the general case, one catalogname across all catalogs can belong to multiple bundles, so a list is used. There are some slight spacing issues, but I won't fix them in this iteration. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-14 11:32:23 UTC (rev 17664) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-14 11:32:45 UTC (rev 17665) @@ -12,6 +12,7 @@ from Cheetah import Template import cjson +import gdbm import json import catalog import common_constants @@ -71,10 +72,10 @@ #end for #for catalogname in $sorted($diffs_by_catalogname): #if "new_pkgs" in $diffs_by_catalogname[$catalogname]: -new_pkg_$catalogname +new_pkg_$catalogname# #end if #if "removed_pkgs" in $diffs_by_catalogname[$catalogname]: -remove_pkg_$catalogname +remove_pkg_$catalogname# #end if #if "updated_pkgs" in $diffs_by_catalogname[$catalogname]: #if $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["direction"] == "downgrade": @@ -85,10 +86,15 @@ $catalogname# # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] # #if $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] == 'version' -$diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["from"]["version"] to $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["to"]["version"] +$diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["from"]["version"] to $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["to"]["version"]# #end if #end if + # bundles:# +#for bundle in $bundles_by_catalogname[$catalogname]: +$bundle # #end for + +#end for """ @@ -99,17 +105,41 @@ """Wrong usage.""" -def IndexByCatalogname(catalog): - return dict((x["catalogname"], x) for x in catalog) +def IndexDictByField(d, field): + return dict((x[field], x) for x in d) +class CachedPkgstats(object): + """Class responsible for holding and caching package stats. + + Wraps RestClient and provides a caching layer. + """ + + def __init__(self, filename): + self.filename = filename + self.d = gdbm.open(filename, "c") + self.rest_client = rest.RestClient() + self.local_cache = {} + + def GetPkgstats(self, md5): + if md5 in self.local_cache: + return self.local_cache[md5] + elif str(md5) in self.d: + return cjson.decode(self.d[md5]) + else: + pkgstats = self.rest_client.GetPkgstatsByMd5(md5) + self.d[md5] = cjson.encode(pkgstats) + self.local_cache[md5] = pkgstats + return pkgstats + + def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades, include_version_changes): rest_client = rest.RestClient() - diffs_by_catalogname = {} def GetCatalog(rest_client, r_catrel, r_arch, r_osrel): - catalog = rest_client.GetCatalog(r_catrel, r_arch, r_osrel) - return ((r_catrel, r_arch, r_osrel), catalog) + key = r_catrel, r_arch, r_osrel + catalog = rest_client.GetCatalog(*key) + return (key, catalog) # TODO(maciej): Enable this once the multiprocessing module is fixed. # https://www.opencsw.org/mantis/view.php?id=4894 # proc_pool = multiprocessing.Pool(20) @@ -120,6 +150,43 @@ catalogs_to_fetch_args.append((rest_client, catrel, arch, osrel)) # Convert this to pool.map when multiprocessing if fixed. catalogs = dict(map(lambda x: GetCatalog(*x), catalogs_to_fetch_args)) + diffs_by_catalogname = ComposeDiffsByCatalogname( + catalogs, catrel_from, catrel_to, include_version_changes) + return catalogs, diffs_by_catalogname + +def ComposeDiffsByCatalogname(catalogs, catrel_from, catrel_to, + include_version_changes): + """Get a data structure indexed with catalognames. + + { + catalogname: { + "updated_pkgs": [ + [ + "sparc", + "SunOS5.9", + { + "basename": ..., + "catalogname": ..., + "file_basename": ..., + "md5_sum": ..., + "mtime": ..., + "rev": ..., + "size": ..., + "version": ..., + "version_string": ..., + } + ], + ], + "new_pkgs": [ + ... + ], + "removed_pkgs": [ + ... + ], + }, + } + """ + diffs_by_catalogname = {} for arch in common_constants.PHYSICAL_ARCHITECTURES: logging.debug("Architecture: %s", arch) for osrel in common_constants.OS_RELS: @@ -131,8 +198,8 @@ cat_from = [] if cat_to is None: cat_to = [] - cat_from_by_c = IndexByCatalogname(cat_from) - cat_to_by_c = IndexByCatalogname(cat_to) + cat_from_by_c = IndexDictByField(cat_from, "catalogname") + cat_to_by_c = IndexDictByField(cat_to, "catalogname") comparator = catalog.CatalogComparator() new_pkgs, removed_pkgs, updated_pkgs = comparator.GetCatalogDiff( cat_to_by_c, cat_from_by_c) @@ -147,7 +214,7 @@ for pkg_pair in updated_pkgs: update_decision_by_type = { "revision": True, - "version": include_version_changes + "version": include_version_changes, } if (update_decision_by_type[pkg_pair["type"]] and (pkg_pair["direction"] == "upgrade" or include_downgrades)): Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-04-14 11:32:23 UTC (rev 17664) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-04-14 11:32:45 UTC (rev 17665) @@ -38,6 +38,22 @@ # Other HTTP errors are should be thrown. raise + def GetPkgstatsByMd5(self, md5_sum): + url = self.rest_url + self.PKGDB_APP + "/srv4/%s/pkg-stats/" % md5_sum + logging.debug("GetPkgstatsByMd5(): GET %s", url) + try: + data = urllib2.urlopen(url).read() + return cjson.decode(data) + except urllib2.HTTPError, e: + logging.warning("%s -- %s", url, e) + if e.code == 404: + # Code 404 is fine, it means that the package with given md5 does not + # exist. + return None + else: + # Other HTTP errors are should be thrown. + raise + def GetMaintainerByMd5(self, md5_sum): pkg = self.GetPkgByMd5(md5_sum) if not pkg: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:33:07 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:33:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17666] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: Revision: 17666 http://gar.svn.sourceforge.net/gar/?rev=17666&view=rev Author: wahwah Date: 2012-04-14 11:33:07 +0000 (Sat, 14 Apr 2012) Log Message: ----------- manual: Line wraps to 80 columns Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-04-14 11:32:45 UTC (rev 17665) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-04-14 11:33:07 UTC (rev 17666) @@ -5,35 +5,27 @@ /etc/opt/csw vs. /opt/csw/etc ============================= -There are two locations where configuration files are stored. This may look confusing at first, -the reason is that we try to support both sparse zones and full zones as good as possible. -Remember that in a sparse root environment `/opt` is shared from the global zone. As a rule -of thumb configuration files which are specific to a zone are kept in `/etc/opt/csw` which is -also generally preferred (these are in fact most of the configuration files), whereas -`/opt/csw/etc` is used for configuration files which are globally set. Some packages honour -both locations, where the global `/opt/csw/etc` is read first and can be customized by -`/etc/opt/csw`, but this is specific to the package as not all upstream software allows -this easily. +There are two locations where configuration files are stored. This may look +confusing at first, the reason is that we try to support both sparse zones and +full zones as good as possible. Remember that in a sparse root environment +`/opt` is shared from the global zone. As a rule of thumb configuration files +which are specific to a zone are kept in `/etc/opt/csw` which is also generally +preferred (these are in fact most of the configuration files), whereas +`/opt/csw/etc` is used for configuration files which are globally set. Some +packages honour both locations, where the global `/opt/csw/etc` is read first +and can be customized by `/etc/opt/csw`, but this is specific to the package as +not all upstream software allows this easily. -There are some exceptions like Apache, where the configuration files are historically in -`/opt/csw/apache2/etc`, but these are likely to go away some time. +There are some exceptions like Apache, where the configuration files are +historically in `/opt/csw/apache2/etc`, but these are likely to go away some +time. preserveconf ============ -Configuration files are usually shipped as template with a `.CSW` suffix which is copied during installation -to the native name without the suffix. This file is meant to be user-adjustable. On package -deinstallation or update the template is deinstalled whereas the configuration file without suffix -is kept unless it hasn't been modified. - - -RC/SMF -====== - -... - -csw.conf -======== - -... +Configuration files are usually shipped as template with a `.CSW` suffix which +is copied during installation to the native name without the suffix. This file +is meant to be user-adjustable. On package deinstallation or update the +template is deinstalled whereas the configuration file without suffix is kept +unless it hasn't been modified. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:32:45 UTC (rev 17665) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:07 UTC (rev 17666) @@ -47,8 +47,8 @@ ------------------ Now that you are about to install lots of stuff it may be a good time to select -one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors -are listed at:: +one of the mirrors from ``mirror.opencsw.org`` close to you. The official +mirrors are listed at:: http://www.opencsw.org/get-it/mirrors/ @@ -57,13 +57,14 @@ - ``/etc/opt/csw/pkgutil.conf`` - ``/opt/csw/etc/pkgutil.conf`` -This may seem confusing, the reason why there are two is that it is possible to run -OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In this scenario -you use configurations in ``/opt/csw/etc`` for global settings and ``/etc/opt/csw`` -for zone-specific setting. Both ``pkgutil.conf`` are identical on installation with all -configuration options commented out, so you can just pick one for now. As a rule of thumb it is -recommended to prefer the more prominent ``/etc/opt/csw``. Please uncomment the line -with ``mirror`` so it looks similar to this with the URL replaced by the mirror you picked:: +This may seem confusing, the reason why there are two is that it is possible to +run OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In +this scenario you use configurations in ``/opt/csw/etc`` for global settings +and ``/etc/opt/csw`` for zone-specific setting. Both ``pkgutil.conf`` are +identical on installation with all configuration options commented out, so you +can just pick one for now. As a rule of thumb it is recommended to prefer the +more prominent ``/etc/opt/csw``. Please uncomment the line with ``mirror`` so +it looks similar to this with the URL replaced by the mirror you picked:: mirror=http://mirror.opencsw.org/opencsw/unstable @@ -83,10 +84,11 @@ Setting up cryptographic verification ------------------------------------- -The catalog is signed with PGP and it is a good idea to set up your system to verify -the integrity of the catalog. As the catalog itself contains hashes for all packages -in the catalog this ensures you actually install the packages which were officially -released. First you need to install ``pgp`` (of course with pkgutil!):: +The catalog is signed with PGP and it is a good idea to set up your system to +verify the integrity of the catalog. As the catalog itself contains hashes for +all packages in the catalog this ensures you actually install the packages +which were officially released. First you need to install ``pgp`` (of course +with pkgutil!):: pkgutil -y -i gpg @@ -159,29 +161,31 @@ Setting up a private mirror --------------------------- -Sometimes it is sufficient to just go on with a mirror on the internet. However, there are situations -where a local mirror can be useful. When you have a lot of servers accessing the repository, want to control -the package updates exactly or when your production servers just can't access the internet at all -a local mirror is necessary. +Sometimes it is sufficient to just go on with a mirror on the internet. +However, there are situations where a local mirror can be useful. When you have +a lot of servers accessing the repository, want to control the package updates +exactly or when your production servers just can't access the internet at all a +local mirror is necessary. -To set up the mirror you should use rsync as it can update your local copy quickly and with low -bandwidth use and also preserves hardlinks. Not all mirrors provide access via the rsync protocol, -a list can be found at http://www.opencsw.org/get-it/mirrors/ . -To make a full copy of the OpenCSW repository use this:: +To set up the mirror you should use rsync as it can update your local copy +quickly and with low bandwidth use and also preserves hardlinks. Not all +mirrors provide access via the rsync protocol, a list can be found at +http://www.opencsw.org/get-it/mirrors/ . To make a full copy of the OpenCSW +repository use this:: pkgutil -y -i rsync rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo -The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil clients. -Use http://myserver/url-to-repo/ for HTTP and file:///myserver/dir-to-repo for NFS as -mirror option in pkgutil. +The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil +clients. Use http://myserver/url-to-repo/ for HTTP and +file:///myserver/dir-to-repo for NFS as mirror option in pkgutil. Mirroring only a subset ======================= -You can also mirror only a subset of the repository, e.g. the 'unstable' catalog or even -just a few packages. +You can also mirror only a subset of the repository, e.g. the 'unstable' +catalog or even just a few packages. pkgutil --stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:33:30 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:33:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17667] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: Revision: 17667 http://gar.svn.sourceforge.net/gar/?rev=17667&view=rev Author: wahwah Date: 2012-04-14 11:33:29 +0000 (Sat, 14 Apr 2012) Log Message: ----------- manual: Move the /etc/opt/csw info Moving it to a separate file so we don't confuse a stressed newcomer with two configuration files. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-04-14 11:33:07 UTC (rev 17666) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/configuring-services.rst 2012-04-14 11:33:29 UTC (rev 17667) @@ -3,26 +3,41 @@ ==================== /etc/opt/csw vs. /opt/csw/etc -============================= +----------------------------- There are two locations where configuration files are stored. This may look confusing at first, the reason is that we try to support both sparse zones and full zones as good as possible. Remember that in a sparse root environment -`/opt` is shared from the global zone. As a rule of thumb configuration files -which are specific to a zone are kept in `/etc/opt/csw` which is also generally -preferred (these are in fact most of the configuration files), whereas -`/opt/csw/etc` is used for configuration files which are globally set. Some -packages honour both locations, where the global `/opt/csw/etc` is read first -and can be customized by `/etc/opt/csw`, but this is specific to the package as -not all upstream software allows this easily. +``/opt`` is shared from the global zone. As a rule of thumb configuration files +which are specific to a zone are kept in ``/etc/opt/csw`` which is also +generally preferred (these are in fact most of the configuration files), +whereas ``/opt/csw/etc`` is used for configuration files which are globally +set. Some packages honour both locations, where the global ``/opt/csw/etc`` is +read first and can be customized by ``/etc/opt/csw``, but this is specific to +the package as not all upstream software allows this easily. There are some exceptions like Apache, where the configuration files are -historically in `/opt/csw/apache2/etc`, but these are likely to go away some +historically in ``/opt/csw/apache2/etc``, but these are likely to go away some time. +pkgutil ++++++++ +``pkgutil`` can use **two** configuration files: + +- ``/etc/opt/csw/pkgutil.conf`` +- ``/opt/csw/etc/pkgutil.conf`` + +This may seem confusing, the reason why there are two is that it is possible to +run OpenCSW in a sparse root environment where ``/opt`` is not writable. In +this scenario you use configurations in ``/opt/csw/etc`` for global settings +and ``/etc/opt/csw`` for zone-specific setting. Both ``pkgutil.conf`` are +identical on installation with all configuration options commented out, so you +can just pick one for now. As a rule of thumb it is recommended to prefer the +more prominent ``/etc/opt/csw``. + preserveconf -============ +------------ Configuration files are usually shipped as template with a `.CSW` suffix which is copied during installation to the native name without the suffix. This file Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:07 UTC (rev 17666) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:29 UTC (rev 17667) @@ -52,20 +52,9 @@ http://www.opencsw.org/get-it/mirrors/ -It is important to note that ``pkgutil`` can use **two** configuration files: +Please uncomment the line with ``mirror`` so it looks similar to this with the +URL replaced by the mirror you picked:: -- ``/etc/opt/csw/pkgutil.conf`` -- ``/opt/csw/etc/pkgutil.conf`` - -This may seem confusing, the reason why there are two is that it is possible to -run OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In -this scenario you use configurations in ``/opt/csw/etc`` for global settings -and ``/etc/opt/csw`` for zone-specific setting. Both ``pkgutil.conf`` are -identical on installation with all configuration options commented out, so you -can just pick one for now. As a rule of thumb it is recommended to prefer the -more prominent ``/etc/opt/csw``. Please uncomment the line with ``mirror`` so -it looks similar to this with the URL replaced by the mirror you picked:: - mirror=http://mirror.opencsw.org/opencsw/unstable You can verify the setting with ``pkgutil -V``:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:33:50 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:33:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17668] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17668 http://gar.svn.sourceforge.net/gar/?rev=17668&view=rev Author: wahwah Date: 2012-04-14 11:33:50 +0000 (Sat, 14 Apr 2012) Log Message: ----------- manual: Add a note about testing vs stable Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:29 UTC (rev 17667) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:50 UTC (rev 17668) @@ -57,6 +57,9 @@ mirror=http://mirror.opencsw.org/opencsw/unstable +By default, pkgutil is configured to use the ``testing`` catalog. You might +change it to ``unstable`` if you want to use newer versions of packages. + You can verify the setting with ``pkgutil -V``:: ... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 14 13:34:11 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Apr 2012 11:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17669] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17669 http://gar.svn.sourceforge.net/gar/?rev=17669&view=rev Author: wahwah Date: 2012-04-14 11:34:11 +0000 (Sat, 14 Apr 2012) Log Message: ----------- manual: pkgutil --stream for restricted net access Add a note that --stream can be used to install packages with no Internet access. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:33:50 UTC (rev 17668) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-14 11:34:11 UTC (rev 17669) @@ -177,10 +177,13 @@ ======================= You can also mirror only a subset of the repository, e.g. the 'unstable' -catalog or even just a few packages. +catalog or even just a few packages.:: -pkgutil --stream + pkgutil --stream vim +This option is useful when you want to install a package with dependencies on a +host with no direct Internet access. + Layout of the mirror ==================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Apr 14 16:07:00 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 14 Apr 2012 14:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17670] csw/mgar/pkg/powerdns/branches Message-ID: Revision: 17670 http://gar.svn.sourceforge.net/gar/?rev=17670&view=rev Author: wilbury Date: 2012-04-14 14:07:00 +0000 (Sat, 14 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc2: Adjusted ARCHFLAGS for SPARC Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/ Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc1/Makefile 2012-04-14 11:34:11 UTC (rev 17669) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile 2012-04-14 14:07:00 UTC (rev 17670) @@ -2,7 +2,7 @@ # $Id$ # NAME = pdns -VERSION = 3.1-rc1 +VERSION = 3.1-rc2 CATEGORIES = server GARTYPE = v2 @@ -36,7 +36,6 @@ WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) PATCHFILES = 0003-Patch-for-Solaris-compilation.patch -PATCHFILES += 0004-Add-llber-to-make-OpenLDAP-happy.patch LICENSE = $(FILEDIR)/LICENSE PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -76,6 +75,9 @@ EXTRA_INC = /opt/csw/gxx/include LDFLAGS += -L/opt/csw/gxx/lib +# Needed for BOOST on SPARC +ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 + # PowerDNS does not have any "test" target SKIPTEST = 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 Sat Apr 14 16:42:04 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 14 Apr 2012 14:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17671] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 17671 http://gar.svn.sourceforge.net/gar/?rev=17671&view=rev Author: cgrzemba Date: 2012-04-14 14:42:04 +0000 (Sat, 14 Apr 2012) Log Message: ----------- typo: PACKAGING_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-04-14 14:07:00 UTC (rev 17670) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-04-14 14:42:04 UTC (rev 17671) @@ -16,7 +16,7 @@ DISTFILES += old_libs_sparc.tar.bz2 GARCOMPILER = SOS12U3 -PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PATCHFILES += missing-includes.patch PATCHFILES += ltmain.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 14 16:44:17 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 14 Apr 2012 14:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17672] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 17672 http://gar.svn.sourceforge.net/gar/?rev=17672&view=rev Author: rthurner Date: 2012-04-14 14:44:16 +0000 (Sat, 14 Apr 2012) Log Message: ----------- mod_wsgi, remove comment Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2012-04-14 14:42:04 UTC (rev 17671) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2012-04-14 14:44:16 UTC (rev 17672) @@ -40,11 +40,4 @@ # checkpkg doesn't know why CSWpython is needed CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython -# : As far as I can tell, python-config returns good values -# -## Fix Makefile LDFLAGS to correct broken python-config return values -# post-configure-modulated: -# @( perl -i -plne 's|^LDFLAGS = .*|LDFLAGS = -L/opt/csw/lib|' \ -# $(WORKSRC)/Makefile ) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 14 16:56:09 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 14 Apr 2012 14:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17673] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 17673 http://gar.svn.sourceforge.net/gar/?rev=17673&view=rev Author: rthurner Date: 2012-04-14 14:56:09 +0000 (Sat, 14 Apr 2012) Log Message: ----------- python-2.7, upgrade to python-2.7.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2012-04-14 14:44:16 UTC (rev 17672) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2012-04-14 14:56:09 UTC (rev 17673) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.7.1 +VERSION = 2.7.3 CATEGORIES = lang VER = 2.7 DVER = 2-7 Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2012-04-14 14:44:16 UTC (rev 17672) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2012-04-14 14:56:09 UTC (rev 17673) @@ -1 +1 @@ -aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +c57477edd6d18bd9eeca2f21add73919 Python-2.7.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 14 16:57:46 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 14 Apr 2012 14:57:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17674] csw/mgar/pkg/lang-python/python/branches/python-3.2 Message-ID: Revision: 17674 http://gar.svn.sourceforge.net/gar/?rev=17674&view=rev Author: rthurner Date: 2012-04-14 14:57:45 +0000 (Sat, 14 Apr 2012) Log Message: ----------- python, upgrade to python-3.2.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile 2012-04-14 14:56:09 UTC (rev 17673) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile 2012-04-14 14:57:45 UTC (rev 17674) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 3.2.2 +VERSION = 3.2.3 CATEGORIES = lang VER = 3.2 DVER = 3-2 Modified: csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums 2012-04-14 14:56:09 UTC (rev 17673) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums 2012-04-14 14:57:45 UTC (rev 17674) @@ -1 +1 @@ -9d763097a13a59ff53428c9e4d098a05 Python-3.2.2.tar.bz2 +cea34079aeb2e21e7b60ee82a0ac286b Python-3.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Apr 14 18:35:29 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Apr 2012 16:35:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17675] csw/mgar/gar/v2/lib/python/build_tier_list.py Message-ID: Revision: 17675 http://gar.svn.sourceforge.net/gar/?rev=17675&view=rev Author: wbonnet Date: 2012-04-14 16:35:28 +0000 (Sat, 14 Apr 2012) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/gar/v2/lib/python/build_tier_list.py Added: csw/mgar/gar/v2/lib/python/build_tier_list.py =================================================================== --- csw/mgar/gar/v2/lib/python/build_tier_list.py (rev 0) +++ csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 16:35:28 UTC (rev 17675) @@ -0,0 +1,158 @@ +#!/opt/csw/bin/python + +import sys +import os +from optparse import OptionParser + +catalog = {}; + + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class CommandLineParser(object): + """Command line parser. This class is a helper used to retrive options from command line + """ + + def __init__(self): + # Create the option parser + self.parser = OptionParser() + + # Add the different command line options to the parser + self.parser.add_option("-c", "--catalog", help="Defines the catalog to parse. Default is ./catalog", + action="store", dest="catalog", type="string") + self.parser.add_option("-1", "--tier1-list", help="List of tier 1 packages", + action="store", dest="tier1", type="string") + self.parser.add_option("-2", "--tier2-list", help="List of tier 2 packages", + action="store", dest="tier2", type="string") + self.parser.add_option("-3", "--tier3-list", help="List of tier 3 packages", + action="store", dest="tier3", type="string") + self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") + + def parse(self): + (self.options, self.args) = self.parser.parse_args() + return self.options, self.args + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class ConfigurationParser(object): + """This class is a helper providing getter and setter on the option from command line + """ + + def __init__(self, args): + + if args.verbose != None: + self.verbose = args.verbose + else: + self.verbose = False + + if args.catalog != None: + self.catalog = args.catalog + else: + self.catalog = "./catalog" + + if args.tier1 != None: + self.tier1 = args.tier1 + else: + self.tier1 = "./tier1" + + if args.tier2 != None: + self.tier2 = args.tier2 + else: + self.tier2 = "./tier2" + + if args.tier3 != None: + self.tier3 = args.tier3 + else: + self.tier3 = "./tier3" + + # ----------------------------------------------------------------------------------------------------------------- + + def getCatalog(self): + return self.catalog + + def getTierInputFile(self, tier): + if (tier == 1): + return self.tier1 + + if (tier == 2): + return self.tier2 + + if (tier == 3): + return self.tier3 + + return None + + def getTierOutputFile(self, tier): + return "%(filename)s.out" % { 'filename' : self.getTierInputFile(tier) } + + def getVerbose(self): + return self.verbose + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class Package: + """ Defines a package. A package has a name (CSWfoo), a list of dependencies (same syntax as + catalog (CSWfoo|CSWbar) and a tier (1, 2, 3 or None if undefined) + """ + def __init__(self, name=None, depends=None, tier=None): + self.name = name + if (depends != "none"): + self.depends = depends + else: + self.depends = None + self.tier = 3 + + def setTier(self, tier): + # Access to the global variable storing the catalog + global catalog + + # Check if tier is lower or undefined, then we need to do something + if self.tier > tier : + # Set the new tier value + self.tier = tier + # And iterate the list of dependencies to recursivly call the setTier method + if (self.depends != None): + for pkg in self.depends.split('|'): + catalog[pkg].setTier(tier) + +def main(): + + global catalog + outputFile = {} + + # Parse command line + cliParser = CommandLineParser() + (opts, args) = cliParser.parse() + configParser = ConfigurationParser(opts) + + # Read catalog content + for line in open(configParser.getCatalog(), 'r'): + pkgInfo = line.split(' ') + name = pkgInfo[2] + depends = pkgInfo[6] + catalog[name] = Package(name,depends) + + for tier in (1 ,2 ,3): + # Create the three files for outputing tier content + outputFile[tier] = open(configParser.getTierOutputFile(tier), 'w') + + # Check if the specific tier file exist + if os.path.isfile(configParser.getTierInputFile(tier)): + for line in open(configParser.getTierInputFile(tier) , 'r'): + name = line.split('\n') + catalog[name[0]].setTier(tier) + else: + print "File %(filename)s does not exit. Skipping this file" % { 'filename' : configParser.getTierInputFile(tier) } + + for pkg in catalog: + outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) + + for tier in (1 ,2 ,3): + outputFile[tier].close() + +# On sort en rendant le code de retour de main +if __name__ == '__main__': + sys.exit(main()) Property changes on: csw/mgar/gar/v2/lib/python/build_tier_list.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Apr 14 19:41:15 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Apr 2012 17:41:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17676] csw/mgar/gar/v2/lib/python/build_tier_list.py Message-ID: Revision: 17676 http://gar.svn.sourceforge.net/gar/?rev=17676&view=rev Author: wbonnet Date: 2012-04-14 17:41:15 +0000 (Sat, 14 Apr 2012) Log Message: ----------- Tier 2 is computed from the revision date Modified Paths: -------------- csw/mgar/gar/v2/lib/python/build_tier_list.py Modified: csw/mgar/gar/v2/lib/python/build_tier_list.py =================================================================== --- csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 16:35:28 UTC (rev 17675) +++ csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 17:41:15 UTC (rev 17676) @@ -2,7 +2,10 @@ import sys import os +import re from optparse import OptionParser +from datetime import date +from datetime import timedelta catalog = {}; @@ -97,22 +100,58 @@ """ Defines a package. A package has a name (CSWfoo), a list of dependencies (same syntax as catalog (CSWfoo|CSWbar) and a tier (1, 2, 3 or None if undefined) """ - def __init__(self, name=None, depends=None, tier=None): + def __init__(self, name=None, version=None, depends=None): + # Copy the name, depend lsit and tier self.name = name if (depends != "none"): self.depends = depends else: self.depends = None + + # By default tier is set to 3. If the package is less than one year old, then it + # will be promoted to tier 2 later. This is pretty crappy, but at this time there is + # no way to be sure the catalog is fully parsed self.tier = 3 + + # Compute the date. This information can be missing in some packages + # Thus date is initialized to None. If it is possible to extract one from + # revision string, then it will be set + self.date = None + # Retrieve the date from the revision string, if it exists + re_revisionString = re.compile(',REV=(?P20\d\d\.\d\d\.\d\d)') + d1 = re_revisionString.search(version) + + # Check if d1 is defined, if not, the regexp matched no revision string + if d1: + # Split the date to retrieve the year month day components + d2 = d1.group('date').split('.') + self.date = date(year=int(d2[0]) , month=int(d2[1]), day=int(d2[2])) + + # Compute the time elapsed between today and the update date + delta = date.today() - self.date + + # If the delta between date is more than 365 days, then it has not been updated for a year + # it goes to tier 3 + if delta.days > 365: + self.tier = 3 + # Otherwise there is a quite recent update, it moves to tier 2 + else: + self.tier = 2 + + def setTier(self, tier): # Access to the global variable storing the catalog global catalog # Check if tier is lower or undefined, then we need to do something - if self.tier > tier : + if self.tier >= tier : + if self.tier > tier : + print "%(pkg)s : %(t1)d => %(t2)d" % { 'pkg' : self.name , 't1' : self.tier , 't2' : tier } + # Set the new tier value self.tier = tier + # And iterate the list of dependencies to recursivly call the setTier method if (self.depends != None): for pkg in self.depends.split('|'): @@ -130,11 +169,16 @@ # Read catalog content for line in open(configParser.getCatalog(), 'r'): - pkgInfo = line.split(' ') - name = pkgInfo[2] - depends = pkgInfo[6] - catalog[name] = Package(name,depends) + pkgInfo = line.split(' ') + version = pkgInfo[1] + name = pkgInfo[2] + depends = pkgInfo[6] + catalog[name] = Package(name, version, depends) + # Iterates the catalog once parsed to propagated tier values to depends + for pkg in catalog: + catalog[pkg].setTier(catalog[pkg].tier) + for tier in (1 ,2 ,3): # Create the three files for outputing tier content outputFile[tier] = open(configParser.getTierOutputFile(tier), 'w') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Apr 14 20:28:00 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Apr 2012 18:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17677] csw/mgar/gar/v2/lib/python/build_tier_list.py Message-ID: Revision: 17677 http://gar.svn.sourceforge.net/gar/?rev=17677&view=rev Author: wbonnet Date: 2012-04-14 18:28:00 +0000 (Sat, 14 Apr 2012) Log Message: ----------- Add some statistics Modified Paths: -------------- csw/mgar/gar/v2/lib/python/build_tier_list.py Modified: csw/mgar/gar/v2/lib/python/build_tier_list.py =================================================================== --- csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 17:41:15 UTC (rev 17676) +++ csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 18:28:00 UTC (rev 17677) @@ -30,6 +30,7 @@ action="store", dest="tier2", type="string") self.parser.add_option("-3", "--tier3-list", help="List of tier 3 packages", action="store", dest="tier3", type="string") + self.parser.add_option("-s", "--simulate", help="Computes only the number of packages per tier. Do not output the lists", action="store_true", dest="simulate") self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") def parse(self): @@ -50,6 +51,11 @@ else: self.verbose = False + if args.simulate != None: + self.simulate = args.simulate + else: + self.simulate = False + if args.catalog != None: self.catalog = args.catalog else: @@ -90,6 +96,9 @@ def getTierOutputFile(self, tier): return "%(filename)s.out" % { 'filename' : self.getTierInputFile(tier) } + def getSimulate(self): + return self.simulate + def getVerbose(self): return self.verbose @@ -146,8 +155,8 @@ # Check if tier is lower or undefined, then we need to do something if self.tier >= tier : - if self.tier > tier : - print "%(pkg)s : %(t1)d => %(t2)d" % { 'pkg' : self.name , 't1' : self.tier , 't2' : tier } +# if self.tier > tier : +# print "%(pkg)s : %(t1)d => %(t2)d" % { 'pkg' : self.name , 't1' : self.tier , 't2' : tier } # Set the new tier value self.tier = tier @@ -162,6 +171,9 @@ global catalog outputFile = {} + # Defines the counter used to stored for number of package in each tier + countPkg = [ [ 0, 0, 0 ] , [ 0, 0, 0 ] , [ 0, 0, 0 ] ] + # Parse command line cliParser = CommandLineParser() (opts, args) = cliParser.parse() @@ -174,11 +186,19 @@ name = pkgInfo[2] depends = pkgInfo[6] catalog[name] = Package(name, version, depends) + + # Iterates the catalog to compute the initial tiering before rule propagation + for pkg in catalog: + countPkg[0][catalog[pkg].tier-1] += 1 # Iterates the catalog once parsed to propagated tier values to depends for pkg in catalog: catalog[pkg].setTier(catalog[pkg].tier) + # Iterates the catalog to compute the tiering after rule propagation + for pkg in catalog: + countPkg[1][catalog[pkg].tier-1] += 1 + for tier in (1 ,2 ,3): # Create the three files for outputing tier content outputFile[tier] = open(configParser.getTierOutputFile(tier), 'w') @@ -189,14 +209,26 @@ name = line.split('\n') catalog[name[0]].setTier(tier) else: - print "File %(filename)s does not exit. Skipping this file" % { 'filename' : configParser.getTierInputFile(tier) } + if configParser.getVerbose() == True: + print "File %(filename)s does not exit. Skipping this file" % { 'filename' : configParser.getTierInputFile(tier) } for pkg in catalog: - outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) + # If simulation mode is off the output to the file + if configParser.getSimulate() == False: + outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) + # Iterates the catalog to compute the tiering after rule propagation + countPkg[2][catalog[pkg].tier-1] += 1 + for tier in (1 ,2 ,3): outputFile[tier].close() + + if configParser.getSimulate() == True: + print "\tInit\tProp\tFile" + for tier in (0, 1 ,2 ): + print "tier %(tier)d\t%(1)d\t%(2)d\t%(3)d" % { 'tier' : tier + 1 , '1' : countPkg[0][tier], '2' : countPkg[1][tier],'3' : countPkg[2][tier] } + # On sort en rendant le code de retour de main if __name__ == '__main__': sys.exit(main()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Apr 14 20:31:31 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Apr 2012 18:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17678] csw/mgar/gar/v2/lib/python/build_tier_list.py Message-ID: Revision: 17678 http://gar.svn.sourceforge.net/gar/?rev=17678&view=rev Author: wbonnet Date: 2012-04-14 18:31:30 +0000 (Sat, 14 Apr 2012) Log Message: ----------- Add some more statistics : impact column Modified Paths: -------------- csw/mgar/gar/v2/lib/python/build_tier_list.py Modified: csw/mgar/gar/v2/lib/python/build_tier_list.py =================================================================== --- csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 18:28:00 UTC (rev 17677) +++ csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-14 18:31:30 UTC (rev 17678) @@ -225,9 +225,9 @@ if configParser.getSimulate() == True: - print "\tInit\tProp\tFile" + print "\tInit\tProp\tFile\tImpact" for tier in (0, 1 ,2 ): - print "tier %(tier)d\t%(1)d\t%(2)d\t%(3)d" % { 'tier' : tier + 1 , '1' : countPkg[0][tier], '2' : countPkg[1][tier],'3' : countPkg[2][tier] } + print "tier %(tier)d\t%(1)d\t%(2)d\t%(3)d\t%(4)d" % { 'tier' : tier + 1 , '1' : countPkg[0][tier], '2' : countPkg[1][tier],'3' : countPkg[2][tier] , '4' : countPkg[2][tier] - countPkg[1][tier] } # On sort en rendant le code de retour de main if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sat Apr 14 20:58:06 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sat, 14 Apr 2012 18:58:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17679] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 17679 http://gar.svn.sourceforge.net/gar/?rev=17679&view=rev Author: phipsy Date: 2012-04-14 18:58:06 +0000 (Sat, 14 Apr 2012) Log Message: ----------- puppet: 2.7.13 testing Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2012-04-14 18:31:30 UTC (rev 17678) +++ csw/mgar/pkg/puppet/trunk/Makefile 2012-04-14 18:58:06 UTC (rev 17679) @@ -7,8 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -# 2.7.12 is broken, don't use it! (http://projects.puppetlabs.com/issues/13204) -VERSION = 2.7.12 +VERSION = 2.7.13 CATEGORIES = apps GARTYPE = v2 @@ -30,7 +29,7 @@ DISTFILES += CSWpuppet.postinstall # pkgutil.rb https://raw.github.com/domcleal/puppet/tickets/master/8011c/lib/puppet/provider/package/pkgutil.rb # Should be headed into 2.7 code - supports -t REPO -# Still not in 2.7.12 as of 24-Mar-12 +# Still not in 2.7.10 as of 19-Feb-12 DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2012-04-14 18:31:30 UTC (rev 17678) +++ csw/mgar/pkg/puppet/trunk/checksums 2012-04-14 18:58:06 UTC (rev 17679) @@ -12,3 +12,4 @@ 64cca5cd88b8df10eb0d3829470890cc puppet-2.7.10.tar.gz ca1141b3c7d077a128d20458db3b4102 puppet-2.7.11.tar.gz be0a220cb66fe149bdbc08a9790fc2d1 puppet-2.7.12.tar.gz +8062f371cc7ec5c7e5cd5f4b6c3f9278 puppet-2.7.13.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2012-04-14 18:31:30 UTC (rev 17678) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2012-04-14 18:58:06 UTC (rev 17679) @@ -80,23 +80,8 @@ | grep "${__s}" } -get_pid_file() { - # The default pid file is /var/opt/csw/puppet/run/agent.pid - # but a different pid file can be set in puppet.conf. - __pidfile="/var/opt/csw/puppet/run/agent.pid" - conffile="/etc/opt/csw/puppet/puppet.conf" - if [ -r "$conffile" ]; then - pid_line=`get_line_with pidfile ${conffile}` - if [ -n "${pid_line}" ]; then - echo "${pid_line}" | cut -d= -f2 | tr -d ' ' - return - fi - fi - echo "${__pidfile}" -} +pidfile=`$prefix/bin/puppet agent --configprint pidfile` -pidfile=`$prefix/bin/puppet agent --genconf | awk '/pidfile/ { print $3 }'` - case "$1" in start) printf "Starting Puppet client services:" 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 Apr 15 00:58:20 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Apr 2012 22:58:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17680] csw/mgar/pkg Message-ID: Revision: 17680 http://gar.svn.sourceforge.net/gar/?rev=17680&view=rev Author: bdwalton Date: 2012-04-14 22:58:20 +0000 (Sat, 14 Apr 2012) Log Message: ----------- tidy/trunk: stub package template Added Paths: ----------- csw/mgar/pkg/tidy/ csw/mgar/pkg/tidy/Makefile csw/mgar/pkg/tidy/branches/ csw/mgar/pkg/tidy/tags/ csw/mgar/pkg/tidy/trunk/ csw/mgar/pkg/tidy/trunk/Makefile csw/mgar/pkg/tidy/trunk/checksums csw/mgar/pkg/tidy/trunk/files/ Copied: csw/mgar/pkg/tidy/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/tidy/Makefile (rev 0) +++ csw/mgar/pkg/tidy/Makefile 2012-04-14 22:58:20 UTC (rev 17680) @@ -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/tidy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + Added: csw/mgar/pkg/tidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tidy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tidy/trunk/Makefile 2012-04-14 22:58:20 UTC (rev 17680) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tidy +VERSION = x.y +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/tidy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tidy/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Apr 15 01:46:11 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 14 Apr 2012 23:46:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17681] csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2 Message-ID: Revision: 17681 http://gar.svn.sourceforge.net/gar/?rev=17681&view=rev Author: wilbury Date: 2012-04-14 23:46:10 +0000 (Sat, 14 Apr 2012) Log Message: ----------- powerdns/branches/pdns-3.1-rc2: More Solaris specific patches. Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums Added Paths: ----------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch Removed Paths: ------------- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile 2012-04-14 22:58:20 UTC (rev 17680) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/Makefile 2012-04-14 23:46:10 UTC (rev 17681) @@ -33,10 +33,12 @@ DISTFILES += LICENSE DISTFILES += cswpdns +PATCHFILES += 0003-Use-opt-csw-bin-gar.patch +PATCHFILES += 0004-Use-gethrtime-on-SPARC.patch +PATCHFILES += 0006-Use-empty-epollmplexer.cc-on-Solaris.patch + WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -PATCHFILES = 0003-Patch-for-Solaris-compilation.patch - LICENSE = $(FILEDIR)/LICENSE PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -78,6 +80,12 @@ # Needed for BOOST on SPARC ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 +EXTRA_CFLAGS_sparc = -D__SPARC__ +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) + +EXTRA_CXXFLAGS_sparc = -D__SPARC__ +EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) + # PowerDNS does not have any "test" target SKIPTEST = 1 Modified: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums 2012-04-14 22:58:20 UTC (rev 17680) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/checksums 2012-04-14 23:46:10 UTC (rev 17681) @@ -1 +1 @@ -3e1ac551b4fb9d75be513e9dcfe59115 pdns-3.1-rc1.tar.gz +9b0eda4c8b202e4f7a907da6e5ee1d2e pdns-3.1-rc2.tar.gz Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch 2012-04-14 22:58:20 UTC (rev 17680) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Patch-for-Solaris-compilation.patch 2012-04-14 23:46:10 UTC (rev 17681) @@ -1,160 +0,0 @@ -From 050de1b8fdc43e512e71b1e1c3119f8a07d60f89 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Thu, 5 Apr 2012 22:45:30 +0200 -Subject: [PATCH] Patch for Solaris compilation. - ---- - modules/ldapbackend/utils.hh | 2 +- - pdns/backends/gsql/gsqlbackend.cc | 71 ++++++++++++++ - pdns/dnspcap.hh | 4 + - pdns/ext/polarssl-1.1.1/library/Makefile | 2 +- - pdns/ext/polarssl-1.1.1/library/net.c | 2 + - 5 files changed, 157 insertions(+), 80 deletions(-) - -diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh -index ba60f9f..25392c3 100644 ---- a/modules/ldapbackend/utils.hh -+++ b/modules/ldapbackend/utils.hh -@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str ) - - if( tmp != NULL && *tmp == 0 ) - { -- return timegm( &tm ); -+ return Utility::timegm( &tm ); - } - - return 0; -diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc -index 2bd8ffc..aede8e6 100644 ---- a/pdns/backends/gsql/gsqlbackend.cc -+++ b/pdns/backends/gsql/gsqlbackend.cc -@@ -21,6 +21,7 @@ - # pragma warning ( disable: 4786 ) - #endif // WIN32 - -+#include - #include - #include - -@@ -760,6 +761,76 @@ bool GSQLBackend::get(DNSResourceRecord &r) - return false; - } - -+#if (defined (__SVR4) && defined (__sun)) -+ -+extern "C" { -+#define INIT_SZ 128 -+ -+/* VARARGS2 */ -+int -+vasprintf(char **str, const char *format, va_list ap) -+{ -+ char string[INIT_SZ]; -+ char *newstr; -+ int ret; -+ size_t len; -+ -+ *str = NULL; -+ ret = vsnprintf(string, INIT_SZ, format, ap); -+ if (ret < 0) /* retain the value of errno from vsnprintf() */ -+ return (-1); -+ if (ret < INIT_SZ) { -+ len = ret + 1; -+ if ((newstr = (char*) malloc(len)) == NULL) -+ return (-1); /* retain errno from malloc() */ -+ (void) strlcpy(newstr, string, len); -+ *str = newstr; -+ return (ret); -+ } -+ /* -+ * We will perform this loop more than once only if some other -+ * thread modifies one of the vasprintf() arguments after our -+ * previous call to vsnprintf(). -+ */ -+ for (;;) { -+ if (ret == INT_MAX) { /* Bad length */ -+ errno = ENOMEM; -+ return (-1); -+ } -+ len = ret + 1; -+ if ((newstr = (char*) malloc(len)) == NULL) -+ return (-1); /* retain errno from malloc() */ -+ ret = vsnprintf(newstr, len, format, ap); -+ if (ret < 0) { /* retain errno from vsnprintf() */ -+ free(newstr); -+ return (-1); -+ } -+ if (ret < len) { -+ *str = newstr; -+ return (ret); -+ } -+ free(newstr); -+ } -+} -+ -+int -+asprintf(char **str, const char *format, ...) -+{ -+ va_list ap; -+ int ret; -+ -+ *str = NULL; -+ va_start(ap, format); -+ ret = vasprintf(str, format, ap); -+ va_end(ap); -+ -+ return (ret); -+} -+ -+} /* extern "C" */ -+ -+#endif -+ - bool GSQLBackend::feedRecord(const DNSResourceRecord &r) - { - char *output; -diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh -index 66e07b9..607a397 100644 ---- a/pdns/dnspcap.hh -+++ b/pdns/dnspcap.hh -@@ -10,7 +10,11 @@ - #include - #include - #include -+#if defined (__sun) -+#include -+#else - #include -+#endif - #include - #include - #include "namespaces.hh" -diff --git a/pdns/ext/polarssl-1.1.1/library/Makefile b/pdns/ext/polarssl-1.1.1/library/Makefile -index 26de4d7..624994c 100644 ---- a/pdns/ext/polarssl-1.1.1/library/Makefile -+++ b/pdns/ext/polarssl-1.1.1/library/Makefile -@@ -49,7 +49,7 @@ libpolarssl.a: $(OBJS) - echo " AR $@" - $(AR) r $@ $(OBJS) - echo " RL $@" -- $(AR) s $@ -+ ranlib $@ - - libpolarssl.so: libpolarssl.a - echo " LD $@" -diff --git a/pdns/ext/polarssl-1.1.1/library/net.c b/pdns/ext/polarssl-1.1.1/library/net.c -index 9724c07..e30aebb 100644 ---- a/pdns/ext/polarssl-1.1.1/library/net.c -+++ b/pdns/ext/polarssl-1.1.1/library/net.c -@@ -63,6 +63,8 @@ static int wsa_init_done = 0; - #include - #elif defined(__APPLE__) - #include -+#elif defined(sun) -+#include - #else - #include - #endif --- -1.7.9 - Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0003-Use-opt-csw-bin-gar.patch 2012-04-14 23:46:10 UTC (rev 17681) @@ -0,0 +1,24 @@ +From ac3e2204b79ffe6060559f385e3e76bee1fe7318 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sat, 14 Apr 2012 16:20:02 +0200 +Subject: [PATCH] Use /opt/csw/bin/gar + +--- + pdns/ext/polarssl-1.1.1/library/Makefile | 3 + + 1 file changed, 3 insertion(+), 0 deletions(-) + +--- a/pdns/ext/polarssl-1.1.1/library/Makefile ++++ b/pdns/ext/polarssl-1.1.1/library/Makefile +@@ -13,6 +13,9 @@ OFLAGS = -O + # To compile as a shared library: + # CFLAGS += -fPIC + ++# OpenCSW ``ar'' ++AR=/opt/csw/bin/gar ++ + SONAME=libpolarssl.so.0 + + DLEXT=so +-- +1.7.9 + Deleted: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch 2012-04-14 22:58:20 UTC (rev 17680) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Add-llber-to-make-OpenLDAP-happy.patch 2012-04-14 23:46:10 UTC (rev 17681) @@ -1,20 +0,0 @@ -From be1063f6b42879daeab42f956fc9e59f2bdda6c5 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Thu, 5 Apr 2012 23:15:17 +0200 -Subject: [PATCH] Add -llber to make OpenLDAP happy. - ---- - modules/ldapbackend/OBJECTLIBS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS -index a787b8d..4adc2f0 100644 ---- a/modules/ldapbackend/OBJECTLIBS -+++ b/modules/ldapbackend/OBJECTLIBS -@@ -1 +1 @@ ---lldap_r -\ No newline at end of file -+-lldap_r -llber --- -1.7.9 - Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0004-Use-gethrtime-on-SPARC.patch 2012-04-14 23:46:10 UTC (rev 17681) @@ -0,0 +1,46 @@ +From d2a6a26e669ba42229fbc735224635cf38b4face Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 15 Apr 2012 01:18:42 +0200 +Subject: [PATCH] Use gethrtime() on SPARC. + +--- + pdns/htimer.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/pdns/htimer.cc b/pdns/htimer.cc +index b2881c2..e94a20a 100644 +--- a/pdns/htimer.cc ++++ b/pdns/htimer.cc +@@ -2,6 +2,10 @@ + #include "htimer.hh" + #include + ++#ifdef __SPARC__ ++#include ++#endif // __SPARC__ ++ + HTimer::timers_t HTimer::s_timers; + + #include "namespaces.hh" +@@ -35,12 +39,17 @@ HTimer::timers_t HTimer::s_timers; + Waiting for packets + */ + ++#ifdef __SPARC__ ++#define RDTSC(qp) \ ++ qp = (unsigned long long) gethrtime(); ++#else + #define RDTSC(qp) \ + do { \ +- unsigned long lowPart, highPart; \ ++ unsigned long lowPart, highPart; \ + __asm__ __volatile__("rdtsc" : "=a" (lowPart), "=d" (highPart)); \ + qp = (((unsigned long long) highPart) << 32) | lowPart; \ + } while (0) ++#endif + + HTimer::HTimer(const std::string& name) : d_accumulated(0), d_started(0) + { +-- +1.7.10 + Added: csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch =================================================================== --- csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/powerdns/branches/pdns-3.1-rc2/files/0006-Use-empty-epollmplexer.cc-on-Solaris.patch 2012-04-14 23:46:10 UTC (rev 17681) @@ -0,0 +1,275 @@ +From 2fe74639eeb571a36a28cb71e7a895fd5bfd9790 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 15 Apr 2012 01:40:09 +0200 +Subject: [PATCH 6/6] Use empty epollmplexer.cc on Solaris + +--- + codedocs/Makefile | 156 +++++++++++++++++++++++++------------------------- + pdns/epollmplexer.cc | 3 +- + 2 files changed, 80 insertions(+), 79 deletions(-) + +diff --git a/codedocs/Makefile b/codedocs/Makefile +index 76f458b..8606fcc 100644 +--- a/codedocs/Makefile ++++ b/codedocs/Makefile +@@ -31,8 +31,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = x86_64-unknown-linux-gnu +-host_triplet = x86_64-unknown-linux-gnu ++build_triplet = sparc-sun-solaris2.10 ++host_triplet = sparc-sun-solaris2.10 + subdir = codedocs + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -47,51 +47,51 @@ CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/ahu/auto-build/pdns/missing --run aclocal-1.11 +-AMTAR = ${SHELL} /home/ahu/auto-build/pdns/missing --run tar ++ACLOCAL = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run tar + AR = ar +-AUTOCONF = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/ahu/auto-build/pdns/missing --run automake-1.11 ++AUTOCONF = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run autoconf ++AUTOHEADER = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run autoheader ++AUTOMAKE = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run automake-1.11 + AWK = gawk +-BOOST_CPPFLAGS = +-BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/usr/local/lib -R/usr/local/lib +-BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options-mt ++BOOST_CPPFLAGS = -I/opt/csw/gxx/include ++BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib ++BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options + BOOST_ROOT = +-BOOST_SERIALIZATION_LDFLAGS = -L/usr/local/lib -R/usr/local/lib +-BOOST_SERIALIZATION_LIBS = -lboost_serialization-mt +-CC = gcc ++BOOST_SERIALIZATION_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib ++BOOST_SERIALIZATION_LIBS = -lboost_serialization ++CC = /opt/csw/bin/gcc-4.6 + CCDEPMODE = depmode=gcc3 + CDB_CFLAGS = + CDB_LIBS = +-CFLAGS = -g -O2 +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXCPP = g++ -E ++CFLAGS = -O2 -pipe -mcpu=v9 -D__SPARC__ ++CPP = /opt/csw/bin/gcc-4.6 -E ++CPPFLAGS = -I/opt/csw/gxx/include -I/opt/csw/include ++CXX = /opt/csw/bin/g++-4.6 ++CXXCPP = /opt/csw/bin/g++-4.6 -E + CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -D_GNU_SOURCE -Wall -O2 ++CXXFLAGS = -D_REENTRANT -O2 -pipe -mcpu=v9 -D__SPARC__ + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps +-DISTCHECK_CONFIGURE_FLAGS = '--with-boost=' ++DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw/gxx' + DSYMUTIL = + DUMPBIN = +-DYNLINKFLAGS = -rdynamic ++DYNLINKFLAGS = + ECHO_C = + ECHO_N = -n + ECHO_T = +-EGREP = /bin/grep -E ++EGREP = /opt/csw/bin/ggrep -E + EXEEXT = +-FGREP = /bin/grep -F +-GREP = /bin/grep +-INSTALL = /usr/bin/install -c ++FGREP = /opt/csw/bin/ggrep -F ++GREP = /opt/csw/bin/ggrep ++INSTALL = /opt/csw/bin/ginstall -c + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LD = /usr/bin/ld -m elf_x86_64 +-LDFLAGS = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib ++LD = /usr/ccs/bin/ld ++LDFLAGS = -L/opt/csw/lib -L/opt/csw/gxx/lib + LEX = flex + LEXLIB = -lfl + LEX_OUTPUT_ROOT = lex.yy +@@ -99,21 +99,21 @@ LIBCRYPT = -lcrypt + LIBDL = -ldl + LIBLDAP = ldap_r + LIBOBJS = +-LIBOPENDBX = opendbx +-LIBS = -lz -lcrypt ++LIBOPENDBX = ++LIBS = -lposix4 -lresolv -lnsl -lsocket -lpthread -lrt -lz + LIBTOOL = $(SHELL) $(top_builddir)/libtool + LIPO = + LN_S = ln -s + LTLIBOBJS = +-LUA_CFLAGS = -I/usr/include/lua5.1 +-LUA_LIBS = -llua5.1 +-MAKEINFO = ${SHELL} /home/ahu/auto-build/pdns/missing --run makeinfo +-MKDIR_P = /bin/mkdir -p +-MYSQL_incdir = /usr/include/mysql +-MYSQL_lib = +-NM = /usr/bin/nm -B ++LUA_CFLAGS = ++LUA_LIBS = ++MAKEINFO = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/missing --run makeinfo ++MKDIR_P = /opt/csw/bin/gmkdir -p ++MYSQL_incdir = /opt/csw/include/mysql ++MYSQL_lib = -L/opt/csw/lib ++NM = /usr/ccs/bin/nm -p + NMEDIT = +-OBJDUMP = objdump ++OBJDUMP = false + OBJEXT = o + OTOOL = + OTOOL64 = +@@ -125,78 +125,78 @@ PACKAGE_TARNAME = + PACKAGE_URL = + PACKAGE_VERSION = + PATH_SEPARATOR = : +-PGSQL_incdir = /opt/postgresql/include +-PGSQL_lib = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib +-PKG_CONFIG = /usr/bin/pkg-config ++PGSQL_incdir = ++PGSQL_lib = ++PKG_CONFIG = /opt/csw/bin/pkg-config + RANLIB = ranlib +-SED = /bin/sed ++SED = /opt/csw/bin/gsed + SET_MAKE = + SHELL = /bin/bash +-SQLITE3_CFLAGS = +-SQLITE3_LIBS = -lsqlite3 +-SQLITE_incdir = /usr/include/ ++SQLITE3_CFLAGS = -I/opt/csw/include ++SQLITE3_LIBS = -L/opt/csw/lib -lsqlite3 ++SQLITE_incdir = + SQLITE_lib = + STRIP = strip +-THREADFLAGS = -pthread +-UNIXODBC_incdir = /usr/include/ ++THREADFLAGS = ++UNIXODBC_incdir = + UNIXODBC_lib = + VERSION = 3.1-rc2 + YACC = bison -y + YFLAGS = +-abs_builddir = /home/ahu/auto-build/pdns/codedocs +-abs_srcdir = /home/ahu/auto-build/pdns/codedocs +-abs_top_builddir = /home/ahu/auto-build/pdns +-abs_top_srcdir = /home/ahu/auto-build/pdns +-ac_ct_CC = gcc +-ac_ct_CXX = g++ ++abs_builddir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/codedocs ++abs_srcdir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/codedocs ++abs_top_builddir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2 ++abs_top_srcdir = /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2 ++ac_ct_CC = /opt/csw/bin/gcc-4.6 ++ac_ct_CXX = + ac_ct_DUMPBIN = + am__include = include + am__leading_dot = . + am__quote = + am__tar = ${AMTAR} chof - "$$tardir" + am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = x86_64-unknown-linux-gnu ++bindir = /opt/csw/bin ++build = sparc-sun-solaris2.10 + build_alias = +-build_cpu = x86_64 +-build_os = linux-gnu +-build_vendor = unknown ++build_cpu = sparc ++build_os = solaris2.10 ++build_vendor = sun + builddir = . +-datadir = ${datarootdir} ++datadir = /opt/csw/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = x86_64-unknown-linux-gnu ++exec_prefix = /opt/csw ++host = sparc-sun-solaris2.10 + host_alias = +-host_cpu = x86_64 +-host_os = linux-gnu +-host_vendor = unknown ++host_cpu = sparc ++host_os = solaris2.10 ++host_vendor = sun + htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = ${SHELL} /home/ahu/auto-build/pdns/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++includedir = /opt/csw/include ++infodir = /opt/csw/share/info ++install_sh = ${SHELL} /home/wilbury/b/powerdns/branches/pdns-3.1-rc2/work/solaris10-sparc/build-isa-sparcv8plus/pdns-3.1-rc2/install-sh ++libdir = /opt/csw/lib/pdns ++libexecdir = /opt/csw/libexec + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var ++localstatedir = /var/opt/csw + lt_ECHO = echo +-mandir = ${datarootdir}/man +-mkdir_p = /bin/mkdir -p +-moduledirs = mydnsbackend gmysqlbackend mongodbbackend luabackend gpgsqlbackend xdbbackend pipebackend oraclebackend pipebackend db2backend odbcbackend ldapbackend gsqlitebackend gsqlite3backend geobackend goraclebackend opendbxbackend godbcbackend +-modulelibs = -lmysqlclient -lz -lmysqlclient -L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system -llua5.1 -lpq -lssl -lcrypto -lresolv -lnsl -ltdb -L$(ORACLE_HOME)/lib -lclntsh -lldap_r -llber -lsqlite -lsqlite3 -L$(ORACLE_HOME)/lib -lclient9 -lclntst9 -lopendbx +-moduleobjects = ../modules/mydnsbackend/mydnsbackend.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/mongodbbackend/mongodbbackend.o ../modules/mongodbbackend/minimal.o ../modules/mongodbbackend/slave.o ../modules/mongodbbackend/master.o ../modules/mongodbbackend/reload.o ../modules/mongodbbackend/private.o ../modules/mongodbbackend/dnssec.o ../modules/mongodbbackend/supermaster.o ../modules/mongodbbackend/crc32.o ../modules/luabackend/luabackend.o ../modules/luabackend/minimal.o ../modules/luabackend/reload.o ../modules/luabackend/lua_functions.o ../modules/luabackend/master.o ../modules/luabackend/private.o ../modules/luabackend/slave.o ../modules/luabackend/supermaster.o ../modules/luabackend/dnssec.o ../modules/gpgsqlbackend/gpgsqlbackend.o ../modules/gpgsqlbackend/spgsql.o ../modules/xdbbackend/xdbbackend.o ../modules/xdbbackend/xtdb.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/oraclebacke nd/oraclebackend.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/db2backend/DB2Backend.o ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/gsqlitebackend/gsqlitebackend.o ../modules/gsqlitebackend/ssqlite.o ../modules/gsqlite3backend/gsqlite3backend.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/goraclebackend/goraclebackend.o ../modules/goraclebackend/soracle.o ../modules/opendbxbackend/odbxbackend.o ../modules/opendbxbackend/odbxprivate.o ++mandir = /opt/csw/share/man ++mkdir_p = /opt/csw/bin/gmkdir -p ++moduledirs = ldapbackend geobackend gmysqlbackend gsqlite3backend pipebackend ++modulelibs = -lldap_r -llber -lmysqlclient -lsqlite3 ++moduleobjects = ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/gsqlite3backend/gsqlite3backend.o + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local ++prefix = /opt/csw + program_transform_name = s,x,x, + programdescend = pdns + psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com ++sbindir = /opt/csw/sbin ++sharedstatedir = /opt/csw/share + socketdir = /var/run + srcdir = . +-sysconfdir = ${prefix}/etc ++sysconfdir = /etc//opt/csw/pdns + target_alias = + top_build_prefix = ../ + top_builddir = .. +diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc +index b5e2276..2ed03dc 100644 +--- a/pdns/epollmplexer.cc ++++ b/pdns/epollmplexer.cc +@@ -1,3 +1,5 @@ ++#if 0 ++ + #include "mplexer.hh" + #include "sstuff.hh" + #include +@@ -135,7 +137,6 @@ int EpollFDMultiplexer::run(struct timeval* now) + return 0; + } + +-#if 0 + void acceptData(int fd, funcparam_t& parameter) + { + cout<<"Have data on fd "< Revision: 17682 http://gar.svn.sourceforge.net/gar/?rev=17682&view=rev Author: bdwalton Date: 2012-04-15 00:08:41 +0000 (Sun, 15 Apr 2012) Log Message: ----------- tidy/trunk: lay out the basics using a locally created tarball from the CVS checkout Modified Paths: -------------- csw/mgar/pkg/tidy/trunk/Makefile csw/mgar/pkg/tidy/trunk/checksums Modified: csw/mgar/pkg/tidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tidy/trunk/Makefile 2012-04-14 23:46:10 UTC (rev 17681) +++ csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 00:08:41 UTC (rev 17682) @@ -2,28 +2,20 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tidy -VERSION = x.y +VERSION = 20090325cvs GARTYPE = v2 -CATEGORIES = category +CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = An HTML Syntax Checker and Reformatter define BLURB - Long description +An HTML Syntax Checker and Reformatter endef -MASTER_SITES = +MASTER_SITES = http://tidy.sourceforge.net DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk +pre-configure-modulated: + @(cd $(WORKSRC); bash build/gnuauto/setup.sh ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tidy/trunk/checksums =================================================================== --- csw/mgar/pkg/tidy/trunk/checksums 2012-04-14 23:46:10 UTC (rev 17681) +++ csw/mgar/pkg/tidy/trunk/checksums 2012-04-15 00:08:41 UTC (rev 17682) @@ -0,0 +1 @@ +a99519d57738d5677659b8e55f3868f9 tidy-20090325cvs.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 15 03:16:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Apr 2012 01:16:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17683] csw/mgar/pkg/tidy/trunk/Makefile Message-ID: Revision: 17683 http://gar.svn.sourceforge.net/gar/?rev=17683&view=rev Author: bdwalton Date: 2012-04-15 01:16:22 +0000 (Sun, 15 Apr 2012) Log Message: ----------- tidy/trunk: ensure we have a license file Modified Paths: -------------- csw/mgar/pkg/tidy/trunk/Makefile Modified: csw/mgar/pkg/tidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 00:08:41 UTC (rev 17682) +++ csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 01:16:22 UTC (rev 17683) @@ -14,8 +14,11 @@ MASTER_SITES = http://tidy.sourceforge.net DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE + include gar/category.mk pre-configure-modulated: - @(cd $(WORKSRC); bash build/gnuauto/setup.sh ) + @(cd $(WORKSRC); bash build/gnuauto/setup.sh; \ + lynx --dump htmldoc/license.html > LICENSE ) @$(MAKECOOKIE) 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 Apr 15 03:44:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Apr 2012 01:44:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17684] csw/mgar/pkg/tidy/trunk/Makefile Message-ID: Revision: 17684 http://gar.svn.sourceforge.net/gar/?rev=17684&view=rev Author: bdwalton Date: 2012-04-15 01:44:17 +0000 (Sun, 15 Apr 2012) Log Message: ----------- tidy/trunk: add the splits, obsolete the old name for this package Modified Paths: -------------- csw/mgar/pkg/tidy/trunk/Makefile Modified: csw/mgar/pkg/tidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 01:16:22 UTC (rev 17683) +++ csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 01:44:17 UTC (rev 17684) @@ -16,6 +16,21 @@ LICENSE = LICENSE +PACKAGES = CSWtidy CSWlibtidy0-99 CSWtidy-dev + +OBSOLETED_BY_CSWtidy = CSWhtmltidy + +SPKG_DESC_CSWtidy = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWtidy = CSWlibtidy0-99 + +SPKG_DESC_CSWtidy-dev = Development files for libtidy +RUNTIME_DEP_PKGS_CSWtidy-dev = CSWlibtidy0-99 + +SPKG_DESC_CSWlibtidy0-99 = Tidy, libtidy-0.99.so + +PKGFILES_CSWtidy-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibtidy0-99 = $(call baseisadirs,$(libdir),libtidy-0\.99\.so(\.\d+)*) + include gar/category.mk pre-configure-modulated: 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 Apr 15 04:13:16 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Apr 2012 02:13:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17685] csw/mgar/pkg/tidy/trunk Message-ID: Revision: 17685 http://gar.svn.sourceforge.net/gar/?rev=17685&view=rev Author: bdwalton Date: 2012-04-15 02:13:16 +0000 (Sun, 15 Apr 2012) Log Message: ----------- tidy/trunk: patch the test suite so it runs and add a custom test-modulated target to drive it Modified Paths: -------------- csw/mgar/pkg/tidy/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tidy/trunk/files/0001-correct-the-path-to-tidy-for-use-by-tests.patch Modified: csw/mgar/pkg/tidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 01:44:17 UTC (rev 17684) +++ csw/mgar/pkg/tidy/trunk/Makefile 2012-04-15 02:13:16 UTC (rev 17685) @@ -13,6 +13,7 @@ MASTER_SITES = http://tidy.sourceforge.net DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-correct-the-path-to-tidy-for-use-by-tests.patch LICENSE = LICENSE @@ -37,3 +38,7 @@ @(cd $(WORKSRC); bash build/gnuauto/setup.sh; \ lynx --dump htmldoc/license.html > LICENSE ) @$(MAKECOOKIE) + +test-modulated: + @(cd $(WORKSRC)/test; ./testall.sh) + @$(MAKECOOKIE) Added: csw/mgar/pkg/tidy/trunk/files/0001-correct-the-path-to-tidy-for-use-by-tests.patch =================================================================== --- csw/mgar/pkg/tidy/trunk/files/0001-correct-the-path-to-tidy-for-use-by-tests.patch (rev 0) +++ csw/mgar/pkg/tidy/trunk/files/0001-correct-the-path-to-tidy-for-use-by-tests.patch 2012-04-15 02:13:16 UTC (rev 17685) @@ -0,0 +1,26 @@ +From 92890f40847267999c547496090af8bae7d744a3 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 15 Apr 2012 04:05:54 +0200 +Subject: [PATCH] correct the path to tidy for use by tests + +Signed-off-by: Ben Walton +--- + test/testone.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/testone.sh b/test/testone.sh +index 8abb3b9..b3dbd0f 100755 +--- a/test/testone.sh ++++ b/test/testone.sh +@@ -24,7 +24,7 @@ set +f + + TESTNO=$1 + EXPECTED=$2 +-TIDY=../bin/tidy ++TIDY=../console/tidy + INFILES=./input/in_${TESTNO}.*ml + CFGFILE=./input/cfg_${TESTNO}.txt + +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 15 10:11:11 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 15 Apr 2012 08:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17686] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17686 http://gar.svn.sourceforge.net/gar/?rev=17686&view=rev Author: cgrzemba Date: 2012-04-15 08:11:10 +0000 (Sun, 15 Apr 2012) Log Message: ----------- netsnmp/trunk: SKIP_TEST because it runs very long or hang Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-15 02:13:16 UTC (rev 17685) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-15 08:11:10 UTC (rev 17686) @@ -5,7 +5,7 @@ # NAME = netsnmp -VERSION = 5.6.1 +VERSION = 5.6.1.1 CATEGORIES = apps GARTYPE = v2 @@ -32,7 +32,7 @@ BUILD_DEP_PKGS = CSWpysetuptools RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWpython -BUILD64 = 1 +# BUILD64 = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite CPPFLAGS = @@ -63,8 +63,8 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) # Solaris /bin/bash does not allow empty lists in "for i in ; do echo; done" -CONFIG_SHELL = /opt/csw/bin/bash -EXTRA_CONFIGURE_ENV = CONFIG_SHELL +EXTRA_CONFIGURE_EXPORTS = CONFIG_SHELL +EXTRA_CONFIGURE_ENV_CONFIG_SHELL = /opt/csw/bin/bash # TBD: Make alternatives # - with embedded Perl and disabled modules @@ -74,7 +74,7 @@ # Disable testsuite until this has been fixed or /tmp will fill up: # https://sourceforge.net/tracker/?func=detail&aid=3006962&group_id=12694&atid=112694 -# SKIPTEST ?= 1 +SKIPTEST ?= 1 TEST_TARGET = test Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2012-04-15 02:13:16 UTC (rev 17685) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2012-04-15 08:11:10 UTC (rev 17686) @@ -1 +1 @@ -b4e30ead5783b0bb1d280172c6095ea4 net-snmp-5.6.1.tar.gz +79e2b9cac947567a01ae2cc67ad8fe53 net-snmp-5.6.1.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 Sun Apr 15 10:30:00 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Apr 2012 08:30:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17687] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 17687 http://gar.svn.sourceforge.net/gar/?rev=17687&view=rev Author: wahwah Date: 2012-04-15 08:30:00 +0000 (Sun, 15 Apr 2012) Log Message: ----------- checkpkg: Tolerate file names with unicode 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 2012-04-15 08:11:10 UTC (rev 17686) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2012-04-15 08:30:00 UTC (rev 17687) @@ -502,11 +502,15 @@ reasons_to_be_arch_specific = [] pkgmap_paths = [x["path"] for x in pkgmap] for pkgmap_path in pkgmap_paths: - if re.search(ARCH_RE, str(pkgmap_path)): - reasons_to_be_arch_specific.append(( - "archall-with-arch-paths", - pkgmap_path, - "path %s looks arch-specific" % pkgmap_path)) + try: + path_str = str(pkgmap_path) + if re.search(ARCH_RE, path_str): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + except UnicodeDecodeError, e: + logging.warning(e) for binary in binaries: reasons_to_be_arch_specific.append(( "archall-with-binaries", 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 Apr 15 10:31:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Apr 2012 08:31:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17688] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17688 http://gar.svn.sourceforge.net/gar/?rev=17688&view=rev Author: wahwah Date: 2012-04-15 08:31:21 +0000 (Sun, 15 Apr 2012) Log Message: ----------- safe-remove-package: Initial commit A script to help safely remove packages. Checks reverse dependencies of a package, and prints out what to do (csw-upload-pkg --remove or bailout with a reason). Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py csw/mgar/gar/v2/lib/python/rest.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-15 08:30:00 UTC (rev 17687) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-15 08:31:21 UTC (rev 17688) @@ -109,30 +109,6 @@ return dict((x[field], x) for x in d) -class CachedPkgstats(object): - """Class responsible for holding and caching package stats. - - Wraps RestClient and provides a caching layer. - """ - - def __init__(self, filename): - self.filename = filename - self.d = gdbm.open(filename, "c") - self.rest_client = rest.RestClient() - self.local_cache = {} - - def GetPkgstats(self, md5): - if md5 in self.local_cache: - return self.local_cache[md5] - elif str(md5) in self.d: - return cjson.decode(self.d[md5]) - else: - pkgstats = self.rest_client.GetPkgstatsByMd5(md5) - self.d[md5] = cjson.encode(pkgstats) - self.local_cache[md5] = pkgstats - return pkgstats - - def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades, include_version_changes): rest_client = rest.RestClient() @@ -265,7 +241,7 @@ options.include_version_changes) bundles_by_md5 = {} bundles_missing = set() - cp = CachedPkgstats("pkgstats.db") + cp = rest.CachedPkgstats("pkgstats.db") for key in catalogs: for pkg in catalogs[key]: # logging.debug("%r", pkg) Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-04-15 08:30:00 UTC (rev 17687) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-04-15 08:31:21 UTC (rev 17688) @@ -1,8 +1,9 @@ #!/usr/bin/env python2.6 +import cjson +import gdbm import logging import urllib2 -import cjson DEFAULT_URL = "http://buildfarm.opencsw.org" @@ -84,3 +85,27 @@ # a HTTP error code is returned, we're letting the application fail. data = urllib2.urlopen(url).read() return cjson.decode(data) + + +class CachedPkgstats(object): + """Class responsible for holding and caching package stats. + + Wraps RestClient and provides a caching layer. + """ + + def __init__(self, filename): + self.filename = filename + self.d = gdbm.open(filename, "c") + self.rest_client = RestClient() + self.local_cache = {} + + def GetPkgstats(self, md5): + if md5 in self.local_cache: + return self.local_cache[md5] + elif str(md5) in self.d: + return cjson.decode(self.d[md5]) + else: + pkgstats = self.rest_client.GetPkgstatsByMd5(md5) + self.d[md5] = cjson.encode(pkgstats) + self.local_cache[md5] = pkgstats + return pkgstats Added: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py (rev 0) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-04-15 08:31:21 UTC (rev 17688) @@ -0,0 +1,116 @@ +#!/usr/bin/env python2.6 + +"""Helps to safely remove a package (by catalogname) from the catalog. + +Takes a catalog name and: + + - checks all the catalogs and gets the md5 sums for each catalog + - checks for reverse dependencies; if there are any, stops + - when there are no rev deps, prints a csw-upload-pkg --remove call +""" + +import optparse +import rest +import common_constants +import pprint +import gdbm +import logging +import sys +import os +import cjson + + +class RevDeps(object): + + def __init__(self): + self.cached_catalogs = {} + self.rest_client = rest.RestClient() + self.cp = rest.CachedPkgstats("pkgstats.db") + + def MakeRevIndex(self, catrel, arch, osrel): + key = (catrel, arch, osrel) + if key in self.cached_catalogs: + return + fn = "revdeps-%s-%s-%s.json" % key + if os.path.exists(fn): + with open(fn, "r") as fd: + self.cached_catalogs[key] = cjson.decode(fd.read()) + return + catalog = self.rest_client.GetCatalog(*key) + rev_deps = {} + for pkg_simple in catalog: + # pprint.pprint(pkg_simple) + md5 = pkg_simple["md5_sum"] + pkg = self.cp.GetPkgstats(md5) + if not pkg: + logging.warning("No package for %r", md5) + continue + for dep_pkgname, _ in pkg["depends"]: + rev_dep_set = rev_deps.setdefault(dep_pkgname, list()) + rev_dep_set.append((md5, pkg["basic_stats"]["pkgname"])) + sys.stdout.write(".") + sys.stdout.flush() + sys.stdout.write("\n") + self.cached_catalogs[key] = rev_deps + with open(fn, "w") as fd: + fd.write(cjson.encode(self.cached_catalogs[key])) + + def RevDeps(self, catrel, arch, osrel, md5_sum): + self.MakeRevIndex(catrel, arch, osrel) + pkg = self.cp.GetPkgstats(md5_sum) + pkgname = pkg["basic_stats"]["pkgname"] + key = (catrel, arch, osrel) + if pkgname in self.cached_catalogs[key]: + return self.cached_catalogs[key][pkgname] + else: + return [] + + +class PackageRemover(object): + + def RemovePackage(self, catalogname): + # Get md5 sums + rest_client = rest.RestClient() + rd = RevDeps() + rev_deps = {} + to_remove = {} + for osrel in common_constants.OS_RELS: + if osrel in common_constants.OBSOLETE_OS_RELS: + continue + for arch in common_constants.PHYSICAL_ARCHITECTURES: + pkg_simple = rest_client.Srv4ByCatalogAndCatalogname("unstable", arch, osrel, catalogname) + md5 = pkg_simple["md5_sum"] + pkg = rd.cp.GetPkgstats(md5) + key = "unstable", arch, osrel + cat_rev_deps = rd.RevDeps("unstable", arch, osrel, md5) + if cat_rev_deps: + rev_deps[key] = cat_rev_deps + f = ( + "/home/mirror/opencsw/unstable/%s/%s/%s" + % (arch, osrel.replace("SunOS", ""), pkg["basic_stats"]["pkg_basename"])) + files = to_remove.setdefault(osrel, []) + files.append(f) + if rev_deps: + print "Reverse dependencies found. Bailing out." + pprint.pprint(rev_deps) + else: + for osrel in to_remove: + print ( + "csw-upload-pkg --remove --os-release %s %s" + % (osrel, " ".join(to_remove[osrel]))) + + + +def main(): + parser = optparse.OptionParser() + parser.add_option("-c", "--catalogname", dest="catalogname") + parser.add_option("--debug", dest="debug", action="store_true") + options, args = parser.parse_args() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + pr = PackageRemover() + pr.RemovePackage(options.catalogname) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/safe_remove_package.py ___________________________________________________________________ Added: svn:executable + * 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 Apr 15 10:31:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Apr 2012 08:31:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17689] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 17689 http://gar.svn.sourceforge.net/gar/?rev=17689&view=rev Author: wahwah Date: 2012-04-15 08:31:44 +0000 (Sun, 15 Apr 2012) Log Message: ----------- safe-remove-package: Enable the dangerous mode Add the --execute flag which allows to run and actually remove packages from the catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-04-15 08:31:21 UTC (rev 17688) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-04-15 08:31:44 UTC (rev 17689) @@ -18,6 +18,7 @@ import sys import os import cjson +import subprocess class RevDeps(object): @@ -68,7 +69,7 @@ class PackageRemover(object): - def RemovePackage(self, catalogname): + def RemovePackage(self, catalogname, execute=False): # Get md5 sums rest_client = rest.RestClient() rd = RevDeps() @@ -95,9 +96,11 @@ pprint.pprint(rev_deps) else: for osrel in to_remove: - print ( - "csw-upload-pkg --remove --os-release %s %s" - % (osrel, " ".join(to_remove[osrel]))) + args = ["csw-upload-pkg", "--remove", "--os-release", + osrel] + to_remove[osrel] + print " ".join(args) + if execute: + subprocess.call(args) @@ -105,11 +108,12 @@ parser = optparse.OptionParser() parser.add_option("-c", "--catalogname", dest="catalogname") parser.add_option("--debug", dest="debug", action="store_true") + parser.add_option("--execute", dest="execute", action="store_true") options, args = parser.parse_args() if options.debug: logging.basicConfig(level=logging.DEBUG) pr = PackageRemover() - pr.RemovePackage(options.catalogname) + pr.RemovePackage(options.catalogname, options.execute) if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 15 10:32:06 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Apr 2012 08:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17690] csw/mgar/gar/v2/lib/python/opencsw_test.py Message-ID: Revision: 17690 http://gar.svn.sourceforge.net/gar/?rev=17690&view=rev Author: wahwah Date: 2012-04-15 08:32:06 +0000 (Sun, 15 Apr 2012) Log Message: ----------- opencsw_test: New test case Add a test case for a package with no OS release in the filename. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2012-04-15 08:31:44 UTC (rev 17689) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2012-04-15 08:32:06 UTC (rev 17690) @@ -118,6 +118,13 @@ self.assertEqual(parsed["catalogname"], "boost-jam") self.assertEqual(parsed["vendortag"], "UNCOMMITTED") + def testParsePackageFileName_Achievo(self): + file_name = ("achievo-0.8.4-all-CSW.pkg.gz") + parsed = opencsw.ParsePackageFileName(file_name) + self.assertEqual(parsed["arch"], "all") + self.assertEqual(parsed["catalogname"], "achievo") + self.assertEqual(parsed["osrel"], "unspecified") + def testParsePackageFileName_Nonsense(self): """Checks if the function can sustain a non-conformant string.""" file_name = "What if I wrote a letter to my grandma here?" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Sun Apr 15 13:32:03 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Sun, 15 Apr 2012 11:32:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17691] csw/mgar/pkg/tomcat7/trunk Message-ID: Revision: 17691 http://gar.svn.sourceforge.net/gar/?rev=17691&view=rev Author: janholzh Date: 2012-04-15 11:32:03 +0000 (Sun, 15 Apr 2012) Log Message: ----------- tomcat7: Update to 7.0.27 Modified Paths: -------------- csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums Modified: csw/mgar/pkg/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile 2012-04-15 08:32:06 UTC (rev 17690) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2012-04-15 11:32:03 UTC (rev 17691) @@ -1,5 +1,5 @@ NAME = tomcat7 -VERSION = 7.0.26 +VERSION = 7.0.27 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat7/trunk/checksums 2012-04-15 08:32:06 UTC (rev 17690) +++ csw/mgar/pkg/tomcat7/trunk/checksums 2012-04-15 11:32:03 UTC (rev 17691) @@ -1 +1 @@ -00d310f2f4e15821951e9d206af45c6b apache-tomcat-7.0.26.tar.gz +486769ec1094fb45f000d30f237b3643 apache-tomcat-7.0.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 13:44:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 11:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17692] csw/mgar/pkg/cpan/Time-Period/trunk Message-ID: Revision: 17692 http://gar.svn.sourceforge.net/gar/?rev=17692&view=rev Author: dmichelsen Date: 2012-04-15 11:44:26 +0000 (Sun, 15 Apr 2012) Log Message: ----------- cpan/Time-Period/trunk: Update to 1.23 Modified Paths: -------------- csw/mgar/pkg/cpan/Time-Period/trunk/Makefile csw/mgar/pkg/cpan/Time-Period/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Time-Period/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/Makefile 2012-04-15 11:32:03 UTC (rev 17691) +++ csw/mgar/pkg/cpan/Time-Period/trunk/Makefile 2012-04-15 11:44:26 UTC (rev 17692) @@ -1,18 +1,22 @@ -NAME = Period -VERSION = 1.20 +NAME = Time-Period +VERSION = 1.23 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = PRYAN +AUTHOR = PBOYD DESCRIPTION = A Perl module to deal with time periods define BLURB endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpmtimeperiod -CATALOGNAME = pm_timeperiod +LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-time-period +CATALOGNAME_CSWpm-time-period = pm_time_period +SPKG_DESC_CSWpm-time-period = A Perl module to deal with time periods +ARCHALL_CSWpm-time-period = 1 +OBSOLETED_BY_CSWpm-time-period += CSWpmtimeperiod +CATALOGNAME_CSWpmtimeperiod = pm_timeperiod_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Time-Period/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/checksums 2012-04-15 11:32:03 UTC (rev 17691) +++ csw/mgar/pkg/cpan/Time-Period/trunk/checksums 2012-04-15 11:44:26 UTC (rev 17692) @@ -1 +1 @@ -63b073af8ec96e7fa48801cd6fcccdd1 Period-1.20.tar.gz +c677ed3e0b7f3f1ea1bc1c03efae699b Time-Period-1.23.tar.gz Deleted: csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING 2012-04-15 11:32:03 UTC (rev 17691) +++ csw/mgar/pkg/cpan/Time-Period/trunk/files/COPYING 2012-04-15 11:44:26 UTC (rev 17692) @@ -1,5 +0,0 @@ -Copyright (c) 1997 Patrick Ryan. All rights reserved. - -This Perl module uses the conditions given by Perl. This module may only -be distributed and or modified under the conditions given by Perl. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 15 14:06:37 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 15 Apr 2012 12:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17693] csw/mgar/pkg/poppler-data/trunk Message-ID: Revision: 17693 http://gar.svn.sourceforge.net/gar/?rev=17693&view=rev Author: cgrzemba Date: 2012-04-15 12:06:37 +0000 (Sun, 15 Apr 2012) Log Message: ----------- poppler-data/trunk: bump version 0.4.5 Modified Paths: -------------- csw/mgar/pkg/poppler-data/trunk/Makefile csw/mgar/pkg/poppler-data/trunk/checksums Modified: csw/mgar/pkg/poppler-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler-data/trunk/Makefile 2012-04-15 11:44:26 UTC (rev 17692) +++ csw/mgar/pkg/poppler-data/trunk/Makefile 2012-04-15 12:06:37 UTC (rev 17693) @@ -1,5 +1,5 @@ NAME = poppler-data -VERSION = 0.4.0 +VERSION = 0.4.5 CATEGORIES = lib GARTYPE = v2 @@ -7,8 +7,10 @@ define BLURB endef -PACKAGES = CSWpopplerdata -CATALOGNAME_CSWpopplerdata = poppler_data +PACKAGES = CSWpoppler-data +CATALOGNAME_CSWpoppler-data = poppler_data +SPKG_DESC_CSWpoppler-data = $(DESCRIPTION), encoding data +OBSOLETED_BY_CSWpoppler-data = CSWpopplerdata MASTER_SITES = http://poppler.freedesktop.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz Modified: csw/mgar/pkg/poppler-data/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler-data/trunk/checksums 2012-04-15 11:44:26 UTC (rev 17692) +++ csw/mgar/pkg/poppler-data/trunk/checksums 2012-04-15 12:06:37 UTC (rev 17693) @@ -1 +1 @@ -6975bf8e9ea2cfb42b9ecdbcc257cf57 poppler-data-0.4.0.tar.gz +448dd7c5077570e340340706cef931aa poppler-data-0.4.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 Sun Apr 15 15:22:20 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Apr 2012 13:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17694] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 17694 http://gar.svn.sourceforge.net/gar/?rev=17694&view=rev Author: bdwalton Date: 2012-04-15 13:22:20 +0000 (Sun, 15 Apr 2012) Log Message: ----------- php5/trunk: update tidy module deps to use the library split and require the dev split at build time Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-04-15 12:06:37 UTC (rev 17693) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-04-15 13:22:20 UTC (rev 17694) @@ -63,7 +63,7 @@ BUILD_DEP_PKGS += CSWoldapdevel CSWlibkrb5-dev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql-dev CSWunixodbc BUILD_DEP_PKGS += CSWlibpq CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp -BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWhtmltidy CSWpostgresql +BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql BUILD_DEP_PKGS += CSWlibfreetype-dev # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... @@ -211,7 +211,7 @@ $(eval $(call php5_subpackage,sysvmsg,CSWlibz1)) $(eval $(call php5_subpackage,sysvsem,CSWlibz1)) $(eval $(call php5_subpackage,sysvshm,CSWlibz1)) -$(eval $(call php5_subpackage,tidy,CSWhtmltidy CSWlibz1)) +$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99 CSWlibz1)) $(eval $(call php5_subpackage,tokenizer,CSWlibz1)) $(eval $(call php5_subpackage,wddx,CSWlibz1)) $(eval $(call php5_subpackage,xmlreader,CSWlibiconv2 CSWlibxml2-2 CSWlibz1)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Apr 15 15:53:45 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 15 Apr 2012 13:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17695] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 17695 http://gar.svn.sourceforge.net/gar/?rev=17695&view=rev Author: cgrzemba Date: 2012-04-15 13:53:45 +0000 (Sun, 15 Apr 2012) Log Message: ----------- netsnmp/trunk: bump version 5.6.1.1 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-15 13:22:20 UTC (rev 17694) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-15 13:53:45 UTC (rev 17695) @@ -30,21 +30,23 @@ VENDOR_URL = http://www.net-snmp.org/ BUILD_DEP_PKGS = CSWpysetuptools -RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWpython +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWpython +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl + # BUILD64 = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite CPPFLAGS = EXTRA_CFLAGS = $(INCLUDE_FLAGS) +# link not to the old already installed libs +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -xnorunpath CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes # Enable Perl for 64 bit later -# CONFIGURE_ARGS_mm-32 = --enable-embedded-perl --with-perl-modules=yes - -# This throws compile error, investigate later -# CONFIGURE_ARGS_mm-32 += --with-python-modules=yes - +# # CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules CONFIGURE_ARGS_mm-64 = --enable-embedded-perl --with-perl-modules CONFIGURE_ARGS_mm-64 += --without-python-modules @@ -78,13 +80,26 @@ TEST_TARGET = test +INSTALL_OVERRIDE_VARS += SHELL +INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash + EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod # Overriding specific libs is not possible right now. Refine when finished. # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so -CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found -CHECKPKG_OVERRIDES_CSWnetsnmp += missing-dependency|CSWperl +# CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert + include gar/category.mk #post-install-isa-sparcv8: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Apr 15 16:17:16 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 15 Apr 2012 14:17:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17696] csw/mgar/gar/v2 Message-ID: Revision: 17696 http://gar.svn.sourceforge.net/gar/?rev=17696&view=rev Author: wilbury Date: 2012-04-15 14:17:16 +0000 (Sun, 15 Apr 2012) Log Message: ----------- Removed warning on line 921. Requested by D. Michelsen. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-04-15 13:53:45 UTC (rev 17695) +++ csw/mgar/gar/v2/gar.conf.mk 2012-04-15 14:17:16 UTC (rev 17696) @@ -293,7 +293,7 @@ ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_SOS12U3_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus - ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus + ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 MEMORYMODEL_sparcv8plus = 32 ARCHFLAGS_SOS11_sparcv8 = -xarch=v8 Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-04-15 13:53:45 UTC (rev 17695) +++ csw/mgar/gar/v2/gar.lib.mk 2012-04-15 14:17:16 UTC (rev 17696) @@ -971,12 +971,12 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - @cd $* && /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + cd $* && /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @cd $* && $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/GNUmakefile: Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-04-15 13:53:45 UTC (rev 17695) +++ csw/mgar/gar/v2/gar.mk 2012-04-15 14:17:16 UTC (rev 17696) @@ -918,7 +918,6 @@ # This merges the merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated - $(warning M: $(MERGE_DIRS)) @$(MAKECOOKIE) # Copy the whole tree verbatim This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 16:18:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 14:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17697] csw/mgar/pkg/GeoIP/trunk Message-ID: Revision: 17697 http://gar.svn.sourceforge.net/gar/?rev=17697&view=rev Author: dmichelsen Date: 2012-04-15 14:18:25 +0000 (Sun, 15 Apr 2012) Log Message: ----------- GeoIP/trunk: Update to 1.4.8, split package, general rework Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile csw/mgar/pkg/GeoIP/trunk/checksums Added Paths: ----------- csw/mgar/pkg/GeoIP/trunk/files/0001-Remove-gcc-specific-flags.patch csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch csw/mgar/pkg/GeoIP/trunk/files/0003-Explicitly-print-NULL-when-passed-nullpointer-instea.patch Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2012-04-15 14:17:16 UTC (rev 17696) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2012-04-15 14:18:25 UTC (rev 17697) @@ -1,45 +1,68 @@ NAME = GeoIP -VERSION = 1.4.7 +VERSION = 1.4.8 CATEGORIES = net GARTYPE = v2 -GARTYPE = v2 DESCRIPTION = GeoIP C API -define BLURB - GeoIP C API -endef MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/c/ DISTFILES = $(NAME)-$(VERSION).tar.gz + +PATCHFILES += 0001-Remove-gcc-specific-flags.patch +PATCHFILES += 0002-Do-not-use-unnamed-union.patch +PATCHFILES += 0003-Explicitly-print-NULL-when-passed-nullpointer-instea.patch + VENDOR_URL = http://www.maxmind.com/app/c -PACKAGES += CSWgeoip -CATALOGNAME_CSWgeoip = geoip -SPKG_DESC_CSWgeoip = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc4corert +PACKAGES += CSWgeoip +SPKG_DESC_CSWgeoip = GeoIP C API +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgeoip += CSWlibgeoip1 -PACKAGES += CSWgeoip-dev -CATALOGNAME_CSWgeoip-dev = geoip_dev -SPKG_DESC_CSWgeoip-dev = GeoIP C API development support -RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip -INCOMPATIBLE_PKGS_CSWgeoip-dev = CSWgeoipdevel -PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) +PACKAGES += CSWgeoip-update +SPKG_DESC_CSWgeoip-update = Updater for GeoIP.dat directly from MaxMind +PKGFILES_CSWgeoip-update += $(sysconfdir)/.* +PKGFILES_CSWgeoip-update += $(bindir)/geoipupdate +PKGFILES_CSWgeoip-update += $(mandir)/man1/geoipupdate\.1 +RUNTIME_DEP_PKGS_CSWgeoip-update += CSWlibgeoipupdate0 +RUNTIME_DEP_PKGS_CSWgeoip-update += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWgeoip-update += CSWlibz1 -GARCOMPILER = GCC4 +PACKAGES += CSWlibgeoip1 +SPKG_DESC_CSWlibgeoip1 = GeoIP library, libGeoIP.so.1 +PKGFILES_CSWlibgeoip1 += $(call pkgfiles_lib,libGeoIP.so.1) +RUNTIME_DEP_PKGS_CSWlibgeoip1 += CSWgeolitedb +CHECKPKG_OVERRIDES_CSWlibgeoip1 += surplus-dependency|CSWgeolitedb -# Tests require internet connection -TEST_TARGET = +PACKAGES += CSWlibgeoipupdate0 +SPKG_DESC_CSWlibgeoipupdate0 = GeoIP database update library, libGeoIPUpdate.so.0 +PKGFILES_CSWlibgeoipupdate0 += $(call pkgfiles_lib,libGeoIPUpdate.so.0) +RUNTIME_DEP_PKGS_CSWlibgeoipupdate0 += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWlibgeoipupdate0 += CSWlibz1 -EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ +PACKAGES += CSWgeoip-dev +SPKG_DESC_CSWgeoip-dev = GeoIP development files for libGeoIP.so.1 +PKGFILES_CSWgeoip-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWgeoip-dev += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWgeoip-dev += CSWlibgeoipupdate0 BUILD64_LIBS_ONLY = 1 -STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw -CONFIGURE_ARGS += --disable-static +# CONFIGURE_ARGS = $(DIRPATHS) +# CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +# CONFIGURE_ARGS += --disable-static -CHECKPKG_OVERRIDES_CSWgeoip += non-uniform-lib-versions-in-package|sonames=libGeoIP.so.1,libGeoIPUpdate.so.0 -CHECKPKG_OVERRIDES_CSWgeoip += surplus-dependency|CSWgeolitedb +# There is one test failing on sparcv9, skip for now +SKIPTEST ?= 1 +EXTRA_MERGE_EXCLUDE_FILES += $(sharedstatedir)/GeoIP/GeoIP\.dat +EXTRA_MERGE_EXCLUDE_FILES += $(sysconfdir)/GeoIP\.conf\.default + +PRESERVECONF += $(sysconfdir)/GeoIP.conf + include gar/category.mk + +post-patch-modulated: + -cd $(WORKSRC) && ./bootstrap + -cd $(WORKSRC) && /opt/csw/bin/libtoolize + @$(MAKECOOKIE) Modified: csw/mgar/pkg/GeoIP/trunk/checksums =================================================================== --- csw/mgar/pkg/GeoIP/trunk/checksums 2012-04-15 14:17:16 UTC (rev 17696) +++ csw/mgar/pkg/GeoIP/trunk/checksums 2012-04-15 14:18:25 UTC (rev 17697) @@ -1 +1 @@ -a802175d5b7e2b57b540a7dd308d9205 GeoIP-1.4.7.tar.gz +05b7300435336231b556df5ab36f326d GeoIP-1.4.8.tar.gz Added: csw/mgar/pkg/GeoIP/trunk/files/0001-Remove-gcc-specific-flags.patch =================================================================== --- csw/mgar/pkg/GeoIP/trunk/files/0001-Remove-gcc-specific-flags.patch (rev 0) +++ csw/mgar/pkg/GeoIP/trunk/files/0001-Remove-gcc-specific-flags.patch 2012-04-15 14:18:25 UTC (rev 17697) @@ -0,0 +1,67 @@ +From 91d2141f9891e71491609a8cd1295b1722db568a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Apr 2012 19:04:53 +0200 +Subject: [PATCH 1/2] Remove gcc-specific flags + +--- + Makefile.am | 2 +- + apps/Makefile.am | 6 +++--- + libGeoIP/Makefile.am | 2 +- + test/Makefile.am | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index bd4da3a..5c12337 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = -Wall -ansi ++INCLUDES = + + SUBDIRS = \ + libGeoIP \ +diff --git a/apps/Makefile.am b/apps/Makefile.am +index 46cf501..19fac17 100644 +--- a/apps/Makefile.am ++++ b/apps/Makefile.am +@@ -1,8 +1,8 @@ + INCLUDES = \ +- -I$(top_srcdir)/libGeoIP \ +- -Wall ++ -I$(top_srcdir)/libGeoIP ++ + +-AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -Wall ++AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" + + DEPS = $(top_builddir)/libGeoIP/libGeoIP.la + LDADDS = $(top_builddir)/libGeoIP/libGeoIP.la +diff --git a/libGeoIP/Makefile.am b/libGeoIP/Makefile.am +index 5fa0a90..90c2cdf 100644 +--- a/libGeoIP/Makefile.am ++++ b/libGeoIP/Makefile.am +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libGeoIP.la libGeoIPUpdate.la + + EXTRA_DIST = Makefile.vc md5.h global.h types.h GeoIP_internal.h + +-AM_CPPFLAGS = -DGEOIPDATADIR=\"$(pkgdatadir)\" -Wall ++AM_CPPFLAGS = -DGEOIPDATADIR=\"$(pkgdatadir)\" + + libGeoIP_la_SOURCES = GeoIP.c GeoIPCity.c regionName.c timeZone.c + include_HEADERS = GeoIP.h GeoIPCity.h GeoIPUpdate.h +diff --git a/test/Makefile.am b/test/Makefile.am +index fffcbed..2745604 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,6 +1,6 @@ + INCLUDES = \ +- -I$(top_srcdir)/libGeoIP \ +- -Wall ++ -I$(top_srcdir)/libGeoIP ++ + + check_PROGRAMS = test-geoip + +-- +1.7.10 + Added: csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch =================================================================== --- csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch (rev 0) +++ csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch 2012-04-15 14:18:25 UTC (rev 17697) @@ -0,0 +1,99 @@ +From 75432862a6a889ebfcfbb9305b12df021e209188 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Apr 2012 19:17:40 +0200 +Subject: [PATCH 2/2] Do not use unnamed union + +--- + apps/geoiplookup.c | 6 +++--- + apps/geoiplookup6.c | 2 +- + libGeoIP/GeoIPCity.c | 2 +- + libGeoIP/GeoIPCity.h | 2 +- + test/test-geoip-city.c | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/apps/geoiplookup.c b/apps/geoiplookup.c +index bd3c6fc..43915e6 100644 +--- a/apps/geoiplookup.c ++++ b/apps/geoiplookup.c +@@ -309,7 +309,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) + } + else { + printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), +- gir->latitude, gir->longitude, gir->metro_code, gir->area_code); ++ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code); + _say_range_by_ip(gi, ipnum); + GeoIPRecord_delete(gir); + } +@@ -327,7 +327,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) + _mk_conf_str(gir->postal_conf, postal_str, 5); + + printf("%s: %s, %s, %s, %s, %f, %f, %d, %d, %s, %s, %s, %s\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), +- gir->latitude, gir->longitude, gir->metro_code, gir->area_code, ++ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code, + country_str, region_str, city_str, postal_str + ); + _say_range_by_ip(gi, ipnum); +@@ -351,7 +351,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) + strcpy(accuracy_radius_str,"N/A");} + + printf("%s: %s, %s, %s, %s, %f, %f, %d, %d, %s, %s, %s, %s, %s\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), +- gir->latitude, gir->longitude, gir->metro_code, gir->area_code, ++ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code, + country_str, region_str, city_str, postal_str, accuracy_radius_str + ); + _say_range_by_ip(gi, ipnum); +diff --git a/apps/geoiplookup6.c b/apps/geoiplookup6.c +index dc0ff9b..00c9101 100644 +--- a/apps/geoiplookup6.c ++++ b/apps/geoiplookup6.c +@@ -175,7 +175,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) + } + else { + printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), +- gir->latitude, gir->longitude, gir->metro_code, gir->area_code); ++ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code); + } + } + +diff --git a/libGeoIP/GeoIPCity.c b/libGeoIP/GeoIPCity.c +index d308b45..d716e79 100644 +--- a/libGeoIP/GeoIPCity.c ++++ b/libGeoIP/GeoIPCity.c +@@ -228,7 +228,7 @@ _extract_record(GeoIP * gi, unsigned int seek_record, int *next_record_ptr) + record_buf += 3; + for (j = 0; j < 3; ++j) + metroarea_combo += (record_buf[j] << (j * 8)); +- record->metro_code = metroarea_combo / 1000; ++ record->code.metro_code = metroarea_combo / 1000; + record->area_code = metroarea_combo % 1000; + } + } +diff --git a/libGeoIP/GeoIPCity.h b/libGeoIP/GeoIPCity.h +index f6f8fc8..0ed752f 100644 +--- a/libGeoIP/GeoIPCity.h ++++ b/libGeoIP/GeoIPCity.h +@@ -42,7 +42,7 @@ typedef struct GeoIPRecordTag { + union { + int metro_code; /* metro_code is a alias for dma_code */ + int dma_code; +- }; ++ } code; + int area_code; + int charset; + char *continent_code; +diff --git a/test/test-geoip-city.c b/test/test-geoip-city.c +index 4a48fde..c32291a 100644 +--- a/test/test-geoip-city.c ++++ b/test/test-geoip-city.c +@@ -68,7 +68,7 @@ main(int argc, char *argv[]) + _mk_NA(gir->postal_code), + gir->latitude, + gir->longitude, +- gir->metro_code, ++ gir->code.metro_code, + gir->area_code, + _mk_NA(time_zone), + ret[0], +-- +1.7.10 + Added: csw/mgar/pkg/GeoIP/trunk/files/0003-Explicitly-print-NULL-when-passed-nullpointer-instea.patch =================================================================== --- csw/mgar/pkg/GeoIP/trunk/files/0003-Explicitly-print-NULL-when-passed-nullpointer-instea.patch (rev 0) +++ csw/mgar/pkg/GeoIP/trunk/files/0003-Explicitly-print-NULL-when-passed-nullpointer-instea.patch 2012-04-15 14:18:25 UTC (rev 17697) @@ -0,0 +1,62 @@ +From 8697780bf0c23c0cbd47711eefceb6d383c4df9b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Apr 2012 19:56:55 +0200 +Subject: [PATCH] Explicitly print NULL when passed nullpointer instead of + dumping core + +--- + test/test-geoip.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/test-geoip.c b/test/test-geoip.c +index 4bb209e..63bc38e 100644 +--- a/test/test-geoip.c ++++ b/test/test-geoip.c +@@ -63,22 +63,22 @@ int main () { + while (fscanf(f, "%s%s%s", ipAddress, expectedCountry, expectedCountry3) != EOF) { + returnedCountry = GeoIP_country_code_by_addr(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry) != 0) { +- fprintf(stderr,"Test addr %d for %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test addr %d for %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + returnedCountry = GeoIP_country_code_by_name(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry) != 0) { +- fprintf(stderr,"Test name %d for %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test name %d for %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + returnedCountry = GeoIP_country_code3_by_addr(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry3) != 0) { +- fprintf(stderr,"Test addr %d for %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test addr %d for %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + returnedCountry = GeoIP_country_code3_by_name(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry3) != 0) { +- fprintf(stderr,"Test name %d for %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test name %d for %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + test_num++; +@@ -89,7 +89,7 @@ int main () { + while (fscanf(f, "%s%s", ipAddress, expectedCountry ) != EOF) { + returnedCountry = GeoIP_country_code_by_addr(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry) != 0) { +- fprintf(stderr,"Test addr %d %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test addr %d %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + test_num++; +@@ -100,7 +100,7 @@ int main () { + while (fscanf(f, "%s%s", ipAddress, expectedCountry) != EOF) { + returnedCountry = GeoIP_country_code_by_name(gi,ipAddress); + if (returnedCountry == NULL || strcmp(returnedCountry, expectedCountry) != 0) { +- fprintf(stderr,"Test addr %d %s failed, got %s, expected %s\n",test_num,ipAddress,returnedCountry,expectedCountry); ++ fprintf(stderr,"Test addr %d %s failed, got %s, expected %s\n",test_num,ipAddress,(returnedCountry == NULL ? "NULL" : returnedCountry),expectedCountry); + failed = 1; + } + test_num++; +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Sun Apr 15 16:19:19 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Sun, 15 Apr 2012 16:19:19 +0200 Subject: [csw-devel] SF.net SVN: gar:[17696] csw/mgar/gar/v2 In-Reply-To: References: Message-ID: <4F8AD8E7.3060407@opencsw.org> On 04/15/2012 04:17 PM, wilbury at users.sourceforge.net wrote: > Revision: 17696 > http://gar.svn.sourceforge.net/gar/?rev=17696&view=rev > Author: wilbury > Date: 2012-04-15 14:17:16 +0000 (Sun, 15 Apr 2012) > Log Message: > ----------- > Removed warning on line 921. Requested by D. Michelsen. > > Modified Paths: > -------------- > csw/mgar/gar/v2/gar.conf.mk > csw/mgar/gar/v2/gar.lib.mk > csw/mgar/gar/v2/gar.mk > > Modified: csw/mgar/gar/v2/gar.conf.mk > =================================================================== > --- csw/mgar/gar/v2/gar.conf.mk 2012-04-15 13:53:45 UTC (rev 17695) > +++ csw/mgar/gar/v2/gar.conf.mk 2012-04-15 14:17:16 UTC (rev 17696) > @@ -293,7 +293,7 @@ > ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc > ARCHFLAGS_SOS12U3_sparcv8plus = -m32 -xarch=sparc > ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus > - ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus > + ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 > MEMORYMODEL_sparcv8plus = 32 And when I am at it, I've also changed mcpu to proper "v9" for SPARCV8+ -- Juraj Lutter From cgrzemba at users.sourceforge.net Sun Apr 15 16:29:16 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 15 Apr 2012 14:29:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17698] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17698 http://gar.svn.sourceforge.net/gar/?rev=17698&view=rev Author: cgrzemba Date: 2012-04-15 14:29:16 +0000 (Sun, 15 Apr 2012) Log Message: ----------- evince/trunk: build without nautilus Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-04-15 14:18:25 UTC (rev 17697) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-04-15 14:29:16 UTC (rev 17698) @@ -26,6 +26,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-dbus +CONFIGURE_ARGS += --disable-nautilus # CONFIGURE_ARGS += --enable-introspection # CONFIGURE_ARGS_DBG = --enable-debug # CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Apr 15 17:18:29 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 15 Apr 2012 15:18:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17699] csw/mgar/pkg Message-ID: Revision: 17699 http://gar.svn.sourceforge.net/gar/?rev=17699&view=rev Author: wilbury Date: 2012-04-15 15:18:28 +0000 (Sun, 15 Apr 2012) Log Message: ----------- jboss/trunk: Initial commit. JBoss 7.1.1 Added Paths: ----------- csw/mgar/pkg/jboss/ csw/mgar/pkg/jboss/Makefile csw/mgar/pkg/jboss/branches/ csw/mgar/pkg/jboss/tags/ csw/mgar/pkg/jboss/trunk/ csw/mgar/pkg/jboss/trunk/Makefile csw/mgar/pkg/jboss/trunk/checksums csw/mgar/pkg/jboss/trunk/files/ csw/mgar/pkg/jboss/trunk/files/jboss4 csw/mgar/pkg/jboss/trunk/files/jboss4.conf csw/mgar/pkg/jboss/trunk/files/jboss4.xml csw/mgar/pkg/jboss/trunk/files/svc-jboss4 Added: csw/mgar/pkg/jboss/Makefile =================================================================== --- csw/mgar/pkg/jboss/Makefile (rev 0) +++ csw/mgar/pkg/jboss/Makefile 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jboss/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jboss/trunk/Makefile =================================================================== --- csw/mgar/pkg/jboss/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jboss/trunk/Makefile 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1,41 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = jboss +VERSION = 7.1.1.Final +GARTYPE = v2 +CATEGORIES = java + +DESCRIPTION = JBoss Application Server +define BLURB + JBoss Application Server +endef + +JBOSS_MAJMIN = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}') + +MASTER_SITES = http://download.jboss.org/jbossas/$(JBOSS_MAJMIN)/jboss-as-$(VERSION)/ +DISTNAME = jboss-as-$(VERSION) + +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_SCRIPTS = none +BUILD_SCRIPTS = none +TEST_SCRIPTS = none +INSTALL_SCRIPTS = jboss +prefix = / + +configure-none: + @$(MAKECOOKIE) + +test-none: + @$(MAKECOOKIE) + +build-none: + @$(MAKECOOKIE) + +install-jboss: + @echo "Installing into $(DESTDIR)" + @$(MAKECOOKIE) + +include gar/category.mk + Property changes on: csw/mgar/pkg/jboss/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jboss/trunk/checksums =================================================================== --- csw/mgar/pkg/jboss/trunk/checksums (rev 0) +++ csw/mgar/pkg/jboss/trunk/checksums 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1 @@ +1e33096182ac7cac96089e39f7479b35 jboss-as-7.1.1.Final.tar.gz Added: csw/mgar/pkg/jboss/trunk/files/jboss4 =================================================================== --- csw/mgar/pkg/jboss/trunk/files/jboss4 (rev 0) +++ csw/mgar/pkg/jboss/trunk/files/jboss4 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1,58 @@ +# Environment variables documentation +# +# JAVA_HOME +# +# JAVA_HOME specify which version of Java should be used +# by JBOSS. You can supered the default value in the jboss4 +# configuration file. The value of this variable must be a path +# pointing to the root of a valid JRE or JDK (the root dir not +# the bin dir !). The default value is /usr/java. +# + +# JAVA_HOME=/usr/java + +# JBOSS_USER +# +# JBOSS_USER variable defines the Solaris user running the +# JBOSS server. You can supered the default valude in the +# jboss4 configuration file. The value of this variable must +# be a valid Solaris user (ie: root, nobody). The default value +# is jboss. +# +# WARNING : By default the directory permissions are set for +# the JBOSS user (no write access for 'nobody'). +# The logs are stored in /opt/csw/jboss4/server//log, and +# do belong to root user. If you change the JBOSS_USER, be sure +# that this user can write in the log directory. +# + +JBOSS_USER=jboss + +# RUN_CONF +# +# RUN_CONF variable defines the optionnal configuration file +# used by the JBOSS server. + +# RUN_CONF= /opt/csw/jboss4/bin/run.conf + +# JBOSS_RUN_ARGS +# +# JBOSS_RUN_ARGS variable defines the optionnal arguments +# passed to run.sh command line. According to JBoss documentation +# the followings switches are availables : +# +# -d, --bootdir= Set the boot patch directory; Must be absolute or url +# -p, --patchdir= Set the patch directory; Must be absolute or url +# -n, --netboot= Boot from net with the given url as base +# -c, --configuration= Set the server configuration name +# -B, --bootlib= Add an extra library to the front bootclasspath +# -L, --library= Add an extra library to the loaders classpath +# -C, --classpath= Add an extra url to the loaders classpath +# -P, --properties= Load system properties from the given url +# -b, --host= Bind address for all JBoss services. Further explanation below. +# -g, --partition= HA Partition name (default=DefaultDomain) +# -u, --udp= UDP multicast address + +# JBOSS_RUN_ARGS= + + Added: csw/mgar/pkg/jboss/trunk/files/jboss4.conf =================================================================== --- csw/mgar/pkg/jboss/trunk/files/jboss4.conf (rev 0) +++ csw/mgar/pkg/jboss/trunk/files/jboss4.conf 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1,58 @@ +# Environment variables documentation +# +# JAVA_HOME +# +# JAVA_HOME specify which version of Java should be used +# by JBOSS. You can supered the default value in the jboss4 +# configuration file. The value of this variable must be a path +# pointing to the root of a valid JRE or JDK (the root dir not +# the bin dir !). The default value is /usr/java. +# + +# JAVA_HOME=/usr/java + +# JBOSS_USER +# +# JBOSS_USER variable defines the Solaris user running the +# JBOSS server. You can supered the default valude in the +# jboss4 configuration file. The value of this variable must +# be a valid Solaris user (ie: root, nobody). The default value +# is jboss. +# +# WARNING : By default the directory permissions are set for +# the JBOSS user (no write access for 'nobody'). +# The logs are stored in /opt/csw/jboss4/server//log, and +# do belong to root user. If you change the JBOSS_USER, be sure +# that this user can write in the log directory. +# + +JBOSS_USER=jboss + +# RUN_CONF +# +# RUN_CONF variable defines the optionnal configuration file +# used by the JBOSS server. + +# RUN_CONF= /opt/csw/jboss4/bin/run.conf + +# JBOSS_RUN_ARGS +# +# JBOSS_RUN_ARGS variable defines the optionnal arguments +# passed to run.sh command line. According to JBoss documentation +# the followings switches are availables : +# +# -d, --bootdir= Set the boot patch directory; Must be absolute or url +# -p, --patchdir= Set the patch directory; Must be absolute or url +# -n, --netboot= Boot from net with the given url as base +# -c, --configuration= Set the server configuration name +# -B, --bootlib= Add an extra library to the front bootclasspath +# -L, --library= Add an extra library to the loaders classpath +# -C, --classpath= Add an extra url to the loaders classpath +# -P, --properties= Load system properties from the given url +# -b, --host= Bind address for all JBoss services. Further explanation below. +# -g, --partition= HA Partition name (default=DefaultDomain) +# -u, --udp= UDP multicast address + +# JBOSS_RUN_ARGS= + + Added: csw/mgar/pkg/jboss/trunk/files/jboss4.xml =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/jboss/trunk/files/jboss4.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: csw/mgar/pkg/jboss/trunk/files/svc-jboss4 =================================================================== --- csw/mgar/pkg/jboss/trunk/files/svc-jboss4 (rev 0) +++ csw/mgar/pkg/jboss/trunk/files/svc-jboss4 2012-04-15 15:18:28 UTC (rev 17699) @@ -0,0 +1,153 @@ +#!/sbin/sh + +################################################################## +# +# Configuration file documentation +# +# jboss4 +# +# This file let you change the values of a few variables used +# by the init script to control the environment of jboss4 +# The list of variables is described below. +# +# The configuration file can be stored in two different path : +# +# /etc/opt/csw +# This directory contain machine specific config files +# +# /opt/csw/etc +# This directory contain global config files +# +# If there exist a /etc/opt/csw/jboss4/jboss4.conf config file, then +# the environment variables defined in this file are used and the +# /opt/csw/etc/jboss4/conf/jboss4.conf file is ignored even if it +# exist. +# +# If there exist only a /opt/csw/etc/jboss4/conf/jboss4.conf config +# file, then the environnement variables defined in this file are +# used. +# +# If no configuration file exist, all the variables needed by +# jboss4 are let to their default values (see the values +# below). +# +# In all cases, the default values are defined, and supereded +# by the values stored in the configuration file. This is +# necessary to define an environment usuable by JBOSS. +# +# Environment variables documentation +# +# JAVA_HOME +# +# JAVA_HOME specify which version of Java should be used +# by JBOSS. You can supered the default value in the jboss4 +# configuration file. The value of this variable must be a path +# pointing to the root of a valid JRE or JDK (the root dir not +# the bin dir !). The default value is /usr/java. +# +# JBOSS_USER +# +# JBOSS_USER variable defines the Solaris user running the +# JBOSS server. You can supered the default valude in the +# jboss4 configuration file. The value of this variable must +# be a valid Solaris user (ie: root, nobody). The default value +# is root. +# +# WARNING : By default the directory permissions are set for +# the root user (no write access for 'nobody'). +# The logs are stored in /opt/csw/jboss4/logs, and do belong +# to root user. If you change the JBOSS_USER, be sure that this +# user can write in the log directory. +# +# The following permissions may also have to be changed : +# . give read access to the conf directory and all its subdirs +# . give write access to the conf dir to let JBOSS create new files +# . give write access to the work dir +# + +################################################################## +# Setting the default values +# +# DO NOT EDIT THE FOLLOWING VALUES. +# +# Use the configuration file to supered their value +# + +SPECIFIC_CONFIG_FILE=/etc/opt/csw/jboss4/jboss4.conf +GLOBAL_CONFIG_FILE=/opt/csw/etc/jboss4/conf/jboss4.conf + +JAVA_HOME=/usr/java +JBOSS_USER=JBOSS + +################################################################## +# Add some defines useful for SMF +# + +. /lib/svc/share/smf_include.sh + +################################################################## +# Search for a custom configuration file in the default CSW paths +# + +if [ -f $SPECIFIC_CONFIG_FILE ] +then + echo Using configuration file : $SPECIFIC_CONFIG_FILE + . $SPECIFIC_CONFIG_FILE +else + if [ -f $GLOBAL_CONFIG_FILE ] + then + echo Using configuration file : $GLOBAL_CONFIG_FILE + . $GLOBAL_CONFIG_FILE + fi +fi + +echo "Using Java from : $JAVA_HOME" +echo "Running as : $JBOSS_USER (please see documentation included in $0 to change user)" + +################################################################## +# Test if java is in the path defined by JAVA_HOME, if not try to +# guess path by testing standard directories +# + +if [ ! -f $JAVA_HOME/bin/java ] +then + echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin" + JAVA_HOME=/usr/java + if [ ! -f $JAVA_HOME/bin/java ] + then + echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin" + JAVA_HOME=/usr/j2se + if [ ! -f $JAVA_HOME/bin/java ] + then + echo "Java not found in $JAVA_HOME/bin" + echo "Java not found !" + exit 1 + fi + fi +fi + +JBOSS_HOME=/opt/csw/jboss4 +export JAVA_HOME +export RUN_CONF +export JBOSS_HOME +export JBOSS_RUN_ARGS + +case $1 in +'start') + $JBOSS_HOME/bin/run.sh $JBOSS_RUN_ARGS & + ;; +'stop') + $JBOSS_HOME/bin/shutdown.sh --shutdown + ;; + +'restart') + $JBOSS_HOME/bin/shutdown.sh --shutdown + $JBOSS_HOME/bin/run.sh $JBOSS_RUN_ARGS & + ;; +*) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac + +exit $SMF_EXIT_OK This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Apr 15 18:42:52 2012 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 15 Apr 2012 16:42:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17700] csw/mgar/gar/v2/lib/python/build_tier_list.py Message-ID: Revision: 17700 http://gar.svn.sourceforge.net/gar/?rev=17700&view=rev Author: wbonnet Date: 2012-04-15 16:42:52 +0000 (Sun, 15 Apr 2012) Log Message: ----------- Add min-age and max-age command line flags Modified Paths: -------------- csw/mgar/gar/v2/lib/python/build_tier_list.py Modified: csw/mgar/gar/v2/lib/python/build_tier_list.py =================================================================== --- csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-15 15:18:28 UTC (rev 17699) +++ csw/mgar/gar/v2/lib/python/build_tier_list.py 2012-04-15 16:42:52 UTC (rev 17700) @@ -22,6 +22,10 @@ self.parser = OptionParser() # Add the different command line options to the parser + self.parser.add_option("-m", "--min-age", help="Defines the minimum age of the package", + action="store", dest="minage", type="int") + self.parser.add_option("-M", "--max-age", help="Defines the maximum age of the package", + action="store", dest="maxage", type="int") self.parser.add_option("-c", "--catalog", help="Defines the catalog to parse. Default is ./catalog", action="store", dest="catalog", type="string") self.parser.add_option("-1", "--tier1-list", help="List of tier 1 packages", @@ -76,6 +80,10 @@ else: self.tier3 = "./tier3" + # This members can be undefined (None) if the option was not passed on the CLI + self.minage = args.minage + self.maxage = args.maxage + # ----------------------------------------------------------------------------------------------------------------- def getCatalog(self): @@ -102,6 +110,12 @@ def getVerbose(self): return self.verbose + def getMinAge(self): + return self.minage + + def getMaxAge(self): + return self.maxage + # --------------------------------------------------------------------------------------------------------------------- # # @@ -126,6 +140,7 @@ # Thus date is initialized to None. If it is possible to extract one from # revision string, then it will be set self.date = None + self.age = None # Retrieve the date from the revision string, if it exists re_revisionString = re.compile(',REV=(?P20\d\d\.\d\d\.\d\d)') @@ -138,17 +153,19 @@ self.date = date(year=int(d2[0]) , month=int(d2[1]), day=int(d2[2])) # Compute the time elapsed between today and the update date - delta = date.today() - self.date + self.age = date.today() - self.date # If the delta between date is more than 365 days, then it has not been updated for a year # it goes to tier 3 - if delta.days > 365: + if self.age.days > 365: self.tier = 3 # Otherwise there is a quite recent update, it moves to tier 2 else: self.tier = 2 - + # Store the inital tier + self.original = self.tier + def setTier(self, tier): # Access to the global variable storing the catalog global catalog @@ -215,8 +232,16 @@ for pkg in catalog: # If simulation mode is off the output to the file if configParser.getSimulate() == False: - outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) - + # Output the package to the file only if its age is betwwen min and max + if (configParser.getMinAge() == None) and (configParser.getMaxAge() == None): + outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) + else: + # The filter can apply only if the age has been set + if (catalog[pkg].age != None): + if (configParser.getMinAge() == None) or ( (configParser.getMinAge() != None) and (catalog[pkg].age.days > configParser.getMinAge()) ): + if (configParser.getMaxAge() == None) or ( (configParser.getMaxAge() != None) and (catalog[pkg].age.days < configParser.getMaxAge()) ): + outputFile[catalog[pkg].tier].write("%(age)d\t%(name)s\n" % { 'name' : catalog[pkg].name , 'age' : catalog[pkg].age.days }) + # Iterates the catalog to compute the tiering after rule propagation countPkg[2][catalog[pkg].tier-1] += 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 Sun Apr 15 18:49:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 16:49:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17701] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 17701 http://gar.svn.sourceforge.net/gar/?rev=17701&view=rev Author: dmichelsen Date: 2012-04-15 16:49:00 +0000 (Sun, 15 Apr 2012) Log Message: ----------- geolitedb/trunk: Update to 20120403 Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2012-04-15 16:42:52 UTC (rev 17700) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2012-04-15 16:49:00 UTC (rev 17701) @@ -1,14 +1,20 @@ NAME = geolitedb -VERSION = 110201 +VERSION = 20120403 CATEGORIES = net GARTYPE = v2 DESCRIPTION = Geolite country database -MASTER_SITES = http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/ -DISTFILES = GeoIP.dat.gz +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/ +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/ +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/ +DISTFILES += GeoIP.dat.gz +DISTFILES += GeoLiteCity.dat.xz +DISTFILES += GeoLiteCityv6.dat.gz DISTFILES += COPYING +VENDOR_URL = http://www.maxmind.com/app/geolitecountry + ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -18,12 +24,10 @@ include gar/category.mk -WORKSRC = $(WORKDIR) -SPKG_SOURCEURL = http://www.maxmind.com/app/geolitecountry - install-custom: @echo " ==> Installing $(NAME)" - @ginstall -d $(DESTDIR)/opt/csw/share/GeoIP - @ginstall -d $(DESTDIR)/opt/csw/share/doc/geolitedb - @cp -r $(WORKSRC)/GeoIP.dat $(DESTDIR)/opt/csw/share/GeoIP/ + ginstall -d $(DESTDIR)/opt/csw/share/GeoIP + ginstall $(WORKDIR)/GeoIP.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIP.dat + ginstall $(WORKDIR)/GeoLiteCity.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPCity.dat + ginstall $(WORKDIR)/GeoLiteCityv6.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPCityv6.dat @$(MAKECOOKIE) Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2012-04-15 16:42:52 UTC (rev 17700) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2012-04-15 16:49:00 UTC (rev 17701) @@ -1 +1,3 @@ -f14f4b37ed5db77409cd1051468c79fd GeoIP.dat.gz +98ba2a5c177cdfa8da6f9fab524e948d GeoIP.dat.gz +90b509c3f108c06f6d95adbd443f1429 GeoLiteCity.dat.xz +40a9d4ab91284e4dac157acbf4ba16a2 GeoLiteCityv6.dat.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 18:54:09 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 16:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17702] csw/mgar/pkg/lang-python Message-ID: Revision: 17702 http://gar.svn.sourceforge.net/gar/?rev=17702&view=rev Author: dmichelsen Date: 2012-04-15 16:54:09 +0000 (Sun, 15 Apr 2012) Log Message: ----------- lang-python/GeoIP-Python: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile csw/mgar/pkg/lang-python/GeoIP-Python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/GeoIP-Python/ Modified: csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pil/trunk/Makefile 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile 2012-04-15 16:54:09 UTC (rev 17702) @@ -1,41 +1,28 @@ # $Id$ -NAME = pil -VERSION = 1.1.7 +NAME = GeoIP-Python +VERSION = 1.2.7 CATEGORIES = python GARTYPE = v2 -DISTNAME = Imaging-$(VERSION) -define BLURB - The Python Imaging Library (PIL) adds image processing capabilities to your - Python interpreter. This library supports many file formats, and provides - powerful image processing and graphics capabilities. -endef - -MASTER_SITES = http://effbot.org/downloads/ +MASTER_SITES = http://www.maxmind.com/download/geoip/api/python/ DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = Imaging-(\d+(?:\.\d+)*).tar.gz -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +VENDOR_URL = http://www.maxmind.com/app/python -PACKAGES = CSWpy-pil -SPKG_DESC_CSWpy-pil = Python Imaging Library -RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWliblcms1 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpy-pil += CSWtcl -RUNTIME_DEP_PKGS_CSWpy-pil += CSWtk +LICENSE = LICENSE -CHECKPKG_OVERRIDES_CSWpy-pil += surplus-dependency|CSWtcl -CHECKPKG_OVERRIDES_CSWpy-pil += surplus-dependency|CSWtk +BUILD_DEP_PKGS += CSWgeoip-dev -OBSOLETED_BY_CSWpy-pil = CSWpil -CHECKPKG_OVERRIDES_CSWpil += surplus-dependency|CSWpython +PACKAGES = CSWpy-geoip +SPKG_DESC_CSWpy-geoip = Python GeoIP bindings +RUNTIME_DEP_PKGS_CSWpy-geoip += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWpy-geoip += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWpy-geoip += surplus-dependency|CSWpython +# The testsuite is complicated to run, skip for now TEST_SCRIPTS = -LICENSE = README +STRIP_DIRS += $(DESTDIR)$(libdir)/python/site-packages include gar/category.mk Modified: csw/mgar/pkg/lang-python/GeoIP-Python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pil/trunk/checksums 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/lang-python/GeoIP-Python/trunk/checksums 2012-04-15 16:54:09 UTC (rev 17702) @@ -1 +1 @@ -fc14a54e1ce02a0225be8854bfba478e Imaging-1.1.7.tar.gz +df71f5ae7a5c77bbdf726d512b7d67cf GeoIP-Python-1.2.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 15 19:07:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Apr 2012 17:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17703] csw/mgar/pkg/rbgems/libxslt-ruby/ Message-ID: Revision: 17703 http://gar.svn.sourceforge.net/gar/?rev=17703&view=rev Author: bdwalton Date: 2012-04-15 17:07:54 +0000 (Sun, 15 Apr 2012) Log Message: ----------- drop the unused/incomplete libxslt-ruby gem Removed Paths: ------------- csw/mgar/pkg/rbgems/libxslt-ruby/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 19:18:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 17:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17704] csw/mgar/pkg/GeoIP/trunk/files/ 0002-Do-not-use-unnamed-union.patch Message-ID: Revision: 17704 http://gar.svn.sourceforge.net/gar/?rev=17704&view=rev Author: dmichelsen Date: 2012-04-15 17:18:26 +0000 (Sun, 15 Apr 2012) Log Message: ----------- GeoIP/trunk: Rework patch for unnamed union Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch Modified: csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch =================================================================== --- csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch 2012-04-15 17:07:54 UTC (rev 17703) +++ csw/mgar/pkg/GeoIP/trunk/files/0002-Do-not-use-unnamed-union.patch 2012-04-15 17:18:26 UTC (rev 17704) @@ -1,99 +1,30 @@ -From 75432862a6a889ebfcfbb9305b12df021e209188 Mon Sep 17 00:00:00 2001 +From b0b1ebe1c567fe17c1f44d71b0dba956849bb31d Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Sat, 14 Apr 2012 19:17:40 +0200 -Subject: [PATCH 2/2] Do not use unnamed union +Date: Sun, 15 Apr 2012 18:58:16 +0200 +Subject: [PATCH] Do not use unnamed union --- - apps/geoiplookup.c | 6 +++--- - apps/geoiplookup6.c | 2 +- - libGeoIP/GeoIPCity.c | 2 +- - libGeoIP/GeoIPCity.h | 2 +- - test/test-geoip-city.c | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) + libGeoIP/GeoIPCity.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) -diff --git a/apps/geoiplookup.c b/apps/geoiplookup.c -index bd3c6fc..43915e6 100644 ---- a/apps/geoiplookup.c -+++ b/apps/geoiplookup.c -@@ -309,7 +309,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) - } - else { - printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), -- gir->latitude, gir->longitude, gir->metro_code, gir->area_code); -+ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code); - _say_range_by_ip(gi, ipnum); - GeoIPRecord_delete(gir); - } -@@ -327,7 +327,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) - _mk_conf_str(gir->postal_conf, postal_str, 5); - - printf("%s: %s, %s, %s, %s, %f, %f, %d, %d, %s, %s, %s, %s\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), -- gir->latitude, gir->longitude, gir->metro_code, gir->area_code, -+ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code, - country_str, region_str, city_str, postal_str - ); - _say_range_by_ip(gi, ipnum); -@@ -351,7 +351,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) - strcpy(accuracy_radius_str,"N/A");} - - printf("%s: %s, %s, %s, %s, %f, %f, %d, %d, %s, %s, %s, %s, %s\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), -- gir->latitude, gir->longitude, gir->metro_code, gir->area_code, -+ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code, - country_str, region_str, city_str, postal_str, accuracy_radius_str - ); - _say_range_by_ip(gi, ipnum); -diff --git a/apps/geoiplookup6.c b/apps/geoiplookup6.c -index dc0ff9b..00c9101 100644 ---- a/apps/geoiplookup6.c -+++ b/apps/geoiplookup6.c -@@ -175,7 +175,7 @@ geoiplookup(GeoIP * gi, char *hostname, int i) - } - else { - printf("%s: %s, %s, %s, %s, %f, %f, %d, %d\n", GeoIPDBDescription[i], gir->country_code, _mk_NA(gir->region), _mk_NA(gir->city), _mk_NA(gir->postal_code), -- gir->latitude, gir->longitude, gir->metro_code, gir->area_code); -+ gir->latitude, gir->longitude, gir->code.metro_code, gir->area_code); - } - } - -diff --git a/libGeoIP/GeoIPCity.c b/libGeoIP/GeoIPCity.c -index d308b45..d716e79 100644 ---- a/libGeoIP/GeoIPCity.c -+++ b/libGeoIP/GeoIPCity.c -@@ -228,7 +228,7 @@ _extract_record(GeoIP * gi, unsigned int seek_record, int *next_record_ptr) - record_buf += 3; - for (j = 0; j < 3; ++j) - metroarea_combo += (record_buf[j] << (j * 8)); -- record->metro_code = metroarea_combo / 1000; -+ record->code.metro_code = metroarea_combo / 1000; - record->area_code = metroarea_combo % 1000; - } - } diff --git a/libGeoIP/GeoIPCity.h b/libGeoIP/GeoIPCity.h -index f6f8fc8..0ed752f 100644 +index f6f8fc8..d9de181 100644 --- a/libGeoIP/GeoIPCity.h +++ b/libGeoIP/GeoIPCity.h -@@ -42,7 +42,7 @@ typedef struct GeoIPRecordTag { - union { - int metro_code; /* metro_code is a alias for dma_code */ - int dma_code; +@@ -39,10 +39,9 @@ typedef struct GeoIPRecordTag { + char *postal_code; + float latitude; + float longitude; +- union { +- int metro_code; /* metro_code is a alias for dma_code */ +- int dma_code; - }; -+ } code; ++ int dma_code; ++/* metro_code is a alias for dma_code */ ++#define metro_code dma_code int area_code; int charset; char *continent_code; -diff --git a/test/test-geoip-city.c b/test/test-geoip-city.c -index 4a48fde..c32291a 100644 ---- a/test/test-geoip-city.c -+++ b/test/test-geoip-city.c -@@ -68,7 +68,7 @@ main(int argc, char *argv[]) - _mk_NA(gir->postal_code), - gir->latitude, - gir->longitude, -- gir->metro_code, -+ gir->code.metro_code, - gir->area_code, - _mk_NA(time_zone), - ret[0], -- 1.7.10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 20:30:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 18:30:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17705] csw/mgar/pkg/lang-python Message-ID: Revision: 17705 http://gar.svn.sourceforge.net/gar/?rev=17705&view=rev Author: dmichelsen Date: 2012-04-15 18:30:16 +0000 (Sun, 15 Apr 2012) Log Message: ----------- lang-python/chardet: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/chardet/trunk/Makefile csw/mgar/pkg/lang-python/chardet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/chardet/ Modified: csw/mgar/pkg/lang-python/chardet/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/Paste/trunk/Makefile 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2012-04-15 18:30:16 UTC (rev 17705) @@ -2,24 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = Paste -VERSION = 1.7.5.1 +NAME = chardet +VERSION = 1.0.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Tools for using a Web Server Gateway Interface stack -define BLURB -endef +DESCRIPTION = Universal encoding detector MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz -VENDOR_URL = http://pythonpaste.org/ +VENDOR_URL = http://pypi.python.org/pypi/chardet -PACKAGES = CSWpy-paste -ARCHALL_CSWpy-paste = 1 +PACKAGES = CSWpy-chardet +ARCHALL_CSWpy-chardet = 1 -# Some tests fail which are probably harmless -SKIPTEST ?= 1 - include gar/category.mk Modified: csw/mgar/pkg/lang-python/chardet/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/Paste/trunk/checksums 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/lang-python/chardet/trunk/checksums 2012-04-15 18:30:16 UTC (rev 17705) @@ -1 +1 @@ -7ea5fabed7dca48eb46dc613c4b6c4ed Paste-1.7.5.1.tar.gz +7c28b02bca7847c13bebedaf4df6c5a3 chardet-1.0.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 Sun Apr 15 20:39:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Apr 2012 18:39:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17706] csw/mgar/pkg/boost/branches/boost-gcc/Makefile Message-ID: Revision: 17706 http://gar.svn.sourceforge.net/gar/?rev=17706&view=rev Author: wahwah Date: 2012-04-15 18:39:23 +0000 (Sun, 15 Apr 2012) Log Message: ----------- boost/branches/boost-gcc: Only disable Python for 64-bits Modified Paths: -------------- csw/mgar/pkg/boost/branches/boost-gcc/Makefile Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-04-15 18:30:16 UTC (rev 17705) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2012-04-15 18:39:23 UTC (rev 17706) @@ -76,7 +76,8 @@ BUILD_ARGS += --debug-building BUILD_ARGS += address-model=$(MEMORYMODEL) # We don't have 64-bit Python -BUILD_ARGS += --without-python +BUILD_ARGS_64 += --without-python +BUILD_ARGS += $(BUILD_ARGS_$(MEMORYMODEL)) BUILD_ARGS_sparcv8plus = instruction-set=v9 BUILD_ARGS_sparcv9 = instruction-set=v9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 20:41:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 18:41:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17707] csw/mgar/pkg/lang-python Message-ID: Revision: 17707 http://gar.svn.sourceforge.net/gar/?rev=17707&view=rev Author: dmichelsen Date: 2012-04-15 18:41:57 +0000 (Sun, 15 Apr 2012) Log Message: ----------- lang-python/setproctitle: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/setproctitle/trunk/Makefile csw/mgar/pkg/lang-python/setproctitle/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/setproctitle/ Modified: csw/mgar/pkg/lang-python/setproctitle/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2012-04-15 18:30:16 UTC (rev 17705) +++ csw/mgar/pkg/lang-python/setproctitle/trunk/Makefile 2012-04-15 18:41:57 UTC (rev 17707) @@ -2,19 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = chardet -VERSION = 1.0.1 +NAME = setproctitle +VERSION = 1.1.5 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Universal encoding detector +DESCRIPTION = A library to allow customization of the process title MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz -VENDOR_URL = http://pypi.python.org/pypi/chardet +VENDOR_URL = http://code.google.com/p/py-setproctitle/ -PACKAGES = CSWpy-chardet -ARCHALL_CSWpy-chardet = 1 +PACKAGES = CSWpy-setproctitle +RUNTIME_DEP_PKGS_CSWpy-setproctitle += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWpy-setproctitle += surplus-dependency|CSWpython +# There is no testsuite +TEST_SCRIPTS = + include gar/category.mk Modified: csw/mgar/pkg/lang-python/setproctitle/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/checksums 2012-04-15 18:30:16 UTC (rev 17705) +++ csw/mgar/pkg/lang-python/setproctitle/trunk/checksums 2012-04-15 18:41:57 UTC (rev 17707) @@ -1 +1 @@ -7c28b02bca7847c13bebedaf4df6c5a3 chardet-1.0.1.tar.gz +8dc236c23727a4aca031fcd29b7f8a73 setproctitle-1.1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 21:15:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 19:15:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17708] csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk / Message-ID: Revision: 17708 http://gar.svn.sourceforge.net/gar/?rev=17708&view=rev Author: dmichelsen Date: 2012-04-15 19:15:41 +0000 (Sun, 15 Apr 2012) Log Message: ----------- libsigcpp: Make branch libsigcpp-gcc Added Paths: ----------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 15 21:31:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Apr 2012 19:31:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17709] csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk /Makefile Message-ID: Revision: 17709 http://gar.svn.sourceforge.net/gar/?rev=17709&view=rev Author: dmichelsen Date: 2012-04-15 19:31:25 +0000 (Sun, 15 Apr 2012) Log Message: ----------- libsigcpp/branches/libsigcpp-gxx: Adjust for gxx Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/Makefile Modified: csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/Makefile 2012-04-15 19:15:41 UTC (rev 17708) +++ csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/Makefile 2012-04-15 19:31:25 UTC (rev 17709) @@ -12,28 +12,22 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES += $(DISTNAME).tar.xz -PACKAGES = CSWlibsigc2-0-0 -SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++, libsigc-2.0.so.0 -PKGFILES_CSWlibsigc2-0-0 += $(call pkgfiles_lib,libsigc-2.0.so.0) -OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++ -# CSWsigc++ is the previous package name -INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ +PACKAGES = CSWlibsigc2-0-0-gxx +SPKG_DESC_CSWlibsigc2-0-0-gxx = Typesafe signal and callback system for C++, libsigc-2.0.so.0 +PKGFILES_CSWlibsigc2-0-0-gxx += $(call pkgfiles_lib,libsigc-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibstdc++6 -PACKAGES += CSWlibsigc-dev -SPKG_DESC_CSWlibsigc-dev = Header files for libsigc-2.0.so.0 +PACKAGES += CSWlibsigc-gxx-dev +SPKG_DESC_CSWlibsigc-gxx-dev = Header files for libsigc-2.0.so.0 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibsigc-dev = CSWlibsigc2-0-0 -OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel -CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub +RUNTIME_DEP_PKGS_CSWlibsigc-gxx-dev += CSWlibsigc2-0-0-gxx +prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU + BUILD64_LIBS_ONLY = 1 -EXTRA_CXXFLAGS += -norunpath EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static -# Do not strip -norunpath during libtool invocation -REINPLACE_MATCH = (\|-xarch=) -REINPLACE_WITH = |-norunpath$$1 -REINPLACE_FILES = build/ltmain.sh - 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 Apr 16 08:17:53 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Apr 2012 06:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17710] csw/mgar/gar/v2/lib/python/find_missing_bins.py Message-ID: Revision: 17710 http://gar.svn.sourceforge.net/gar/?rev=17710&view=rev Author: cgrzemba Date: 2012-04-16 06:17:52 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Initial commit, work not finished Added Paths: ----------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Added: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py (rev 0) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-16 06:17:52 UTC (rev 17710) @@ -0,0 +1,123 @@ +#!/usr/bin/env python2.6 + +"""Helps to safely remove a package (by catalogname) from the catalog. + +Takes a catalog name and: + + - checks all the catalogs and gets the md5 sums for each catalog + - checks for reverse dependencies; if there are any, stops + - when there are no rev deps, prints a csw-upload-pkg --remove call +""" + +import optparse +import rest +import common_constants +import pprint +import gdbm +import logging +import sys +import os +import cjson +import subprocess + +catrel = 'unstable' + +class FindBins(object): + + def __init__(self): + self.cached_catalogs_bins = {} + self.cached_catalogs_needed_bins = {} + self.rest_client = rest.RestClient() + self.cp = rest.CachedPkgstats("pkgstats.db") + + def MakeRevIndex(self, catrel, arch, osrel): + key = (catrel, arch, osrel) + if key in self.cached_catalogs_bins: + return + fn_bins = "bins-%s-%s-%s.json" % key + if os.path.exists(fn_bins): + with open(fn_bins, "r") as fd: + self.cached_catalogs_bins[key] = cjson.decode(fd.read()) + fn_needed_bins = "needed-bins-%s-%s-%s.json" % key + if os.path.exists(fn_needed_bins): + with open(fn, "r") as fd: + self.cached_catalogs_needed_bins[key] = cjson.decode(fd.read()) + return + catalog = self.rest_client.GetCatalog(*key) + bins = {} + needed_bins = {} + for pkg_simple in catalog: + cb = [] + nb = [] + # pprint.pprint(pkg_simple) + md5 = pkg_simple["md5_sum"] + pkg = self.cp.GetPkgstats(md5) + if not pkg: + logging.warning("No package for %r", md5) + continue + try: + pkg_name = pkg["basic_stats"]["pkgname"] + for p in pkg['binaries_dump_info']: + for b in p['needed sonames']: + if b not in needed_bins: + nb.append(b) + for b in pkg['binaries']: + if b not in bins: + cb.append(b) + bins[pkg_name] = cb + needed_bins[pkg_name] = nb + sys.stdout.write(".") + sys.stdout.flush() + except KeyError: + logging.warning("MakeRevIndex: no pkg structure: ") + # logging.warning(pkg) + sys.stdout.write("\n") + self.cached_catalogs_bins[key] = bins + self.cached_catalogs_needed_bins[key] = needed_bins + with open(fn_bins, "w") as fd: + fd.write(cjson.encode(self.cached_catalogs_bins[key])) + with open(fn_needed_bins, "w") as fd: + fd.write(cjson.encode(self.cached_catalogs_needed_bins[key])) + + def getBins(self, catrel, arch, osrel): + self.MakeRevIndex(catrel, arch, osrel) + key = (catrel, arch, osrel) + return self.cached_catalogs_bins[key] + + def getNeededBins(self, catrel, arch, osrel): + self.MakeRevIndex(catrel, arch, osrel) + key = (catrel, arch, osrel) + return self.cached_catalogs_needed_bins[key] + +class PackageScanner(object): + + def scanPackage(self): + # Get md5 sums + rest_client = rest.RestClient() + rd = FindBins() + needed_bins = {} + for osrel in common_constants.OS_RELS: + if osrel in common_constants.OBSOLETE_OS_RELS: + continue + for arch in common_constants.PHYSICAL_ARCHITECTURES: + bins = rd.getBins(catrel, arch, osrel) + needed_bins = rd.getNeededBins(catrel, arch, osrel) + for pkg in bins: + print pkg, bins[pkg] + + + print "found:" + pprint.pprint(needed_bins) + +def main(): + parser = optparse.OptionParser() + parser.add_option("--debug", dest="debug", action="store_true") + options, args = parser.parse_args() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + pr = PackageScanner() + pr.scanPackage() + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/find_missing_bins.py ___________________________________________________________________ Added: svn:executable + * 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 Apr 16 17:57:24 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Apr 2012 15:57:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17711] csw/mgar/gar/v2/lib/python/find_missing_bins.py Message-ID: Revision: 17711 http://gar.svn.sourceforge.net/gar/?rev=17711&view=rev Author: cgrzemba Date: 2012-04-16 15:57:23 +0000 (Mon, 16 Apr 2012) Log Message: ----------- works, but reports also standar libs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-16 06:17:52 UTC (rev 17710) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-16 15:57:23 UTC (rev 17711) @@ -21,6 +21,8 @@ import subprocess catrel = 'unstable' +cache_file_bins = 'bins-%s-%s-%s.json' +cache_file_needed_bins = 'needed-bins-%s-%s-%s.json' class FindBins(object): @@ -34,13 +36,13 @@ key = (catrel, arch, osrel) if key in self.cached_catalogs_bins: return - fn_bins = "bins-%s-%s-%s.json" % key + fn_bins = cache_file_bins% key if os.path.exists(fn_bins): with open(fn_bins, "r") as fd: self.cached_catalogs_bins[key] = cjson.decode(fd.read()) - fn_needed_bins = "needed-bins-%s-%s-%s.json" % key + fn_needed_bins = cache_file_needed_bins % key if os.path.exists(fn_needed_bins): - with open(fn, "r") as fd: + with open(fn_needed_bins, "r") as fd: self.cached_catalogs_needed_bins[key] = cjson.decode(fd.read()) return catalog = self.rest_client.GetCatalog(*key) @@ -102,13 +104,16 @@ for arch in common_constants.PHYSICAL_ARCHITECTURES: bins = rd.getBins(catrel, arch, osrel) needed_bins = rd.getNeededBins(catrel, arch, osrel) - for pkg in bins: - print pkg, bins[pkg] - - - print "found:" - pprint.pprint(needed_bins) - + for pkg in needed_bins: + for nb in needed_bins[pkg]: + found = False + for npkg in bins: + if nb in bins[npkg]: + found = True + break + if found == False: + print "%s not found, needed in pkg %s" % (nb,pkg) + def main(): parser = optparse.OptionParser() parser.add_option("--debug", dest="debug", action="store_true") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 16 19:55:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Apr 2012 17:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17712] csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk / Message-ID: Revision: 17712 http://gar.svn.sourceforge.net/gar/?rev=17712&view=rev Author: dmichelsen Date: 2012-04-16 17:55:25 +0000 (Mon, 16 Apr 2012) Log Message: ----------- libsigcpp-gxx: Remove wrongly located trunk in branch Removed Paths: ------------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/trunk/ 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 Apr 16 20:04:03 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Apr 2012 18:04:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17713] csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/ Makefile Message-ID: Revision: 17713 http://gar.svn.sourceforge.net/gar/?rev=17713&view=rev Author: dmichelsen Date: 2012-04-16 18:04:03 +0000 (Mon, 16 Apr 2012) Log Message: ----------- libsigcpp-gxx: Update package name Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile Modified: csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile 2012-04-16 17:55:25 UTC (rev 17712) +++ csw/mgar/pkg/libsigcpp/branches/libsigcpp-gxx/Makefile 2012-04-16 18:04:03 UTC (rev 17713) @@ -13,17 +13,15 @@ DISTFILES += $(DISTNAME).tar.xz PACKAGES = CSWlibsigc2-0-0-gxx -SPKG_DESC_CSWlibsigc2-0-0-gxx = Typesafe signal and callback system for C++, libsigc-2.0.so.0-gxx +SPKG_DESC_CSWlibsigc2-0-0-gxx = Typesafe signal and callback system for C++, libsigc-2.0.so.0 compiled with g++ PKGFILES_CSWlibsigc2-0-0-gxx += $(call pkgfiles_lib,libsigc-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsigc2-0-0-gxx += CSWlibstdc++6 -PACKAGES += CSWlibsigc-dev-gxx -SPKG_DESC_CSWlibsigc-dev-gxx = Header files for libsigc-2.0.so.0-gxx +PACKAGES += CSWlibsigc-gxx-dev +SPKG_DESC_CSWlibsigc-gxx-dev = Header files for libsigc-2.0.so.0 compiled with g++ # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibsigc-dev-gxx = CSWlibsigc2-0-0-gxx -#OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel -#CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub +RUNTIME_DEP_PKGS_CSWlibsigc-gxx-dev = CSWlibsigc2-0-0-gxx PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = 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 Mon Apr 16 20:09:39 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Apr 2012 18:09:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17714] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 17714 http://gar.svn.sourceforge.net/gar/?rev=17714&view=rev Author: cgrzemba Date: 2012-04-16 18:09:39 +0000 (Mon, 16 Apr 2012) Log Message: ----------- cups/trunk: correct build dependency for libslp, Mantis: 0004936 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-04-16 18:04:03 UTC (rev 17713) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-04-16 18:09:39 UTC (rev 17714) @@ -65,6 +65,8 @@ LICENSE = LICENSE.txt +GARCOMPILER = SOS12U3 + BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWlibjpeg-dev BUILD_DEP_PKGS += CSWopenldap-dev @@ -76,7 +78,7 @@ BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += SUNWhea BUILD_DEP_PKGS += SUNWlibm -BUILD_DEP_PKGS += SUNWslpu +BUILD_DEP_PKGS += CSWlibslp-dev # The main metapackage PACKAGES += CSWcups @@ -304,7 +306,8 @@ # For some reason -norunpath is not used here, investigate later CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry -BUILD64_LIBS_ONLY = 1 +# commented out because libtasn1.so.3 needed by libgnutls is not availible for 64bit (at the moment) +# BUILD64_LIBS_ONLY = 1 EXTRA_LINKER_FLAGS += -liconv EXTRA_LINKER_FLAGS += -norunpath 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 Apr 16 20:23:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Apr 2012 18:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[17715] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 17715 http://gar.svn.sourceforge.net/gar/?rev=17715&view=rev Author: dmichelsen Date: 2012-04-16 18:23:13 +0000 (Mon, 16 Apr 2012) Log Message: ----------- krb5-lib/trunk: Enable thread support after bug report on crashing OpenLDAP with Kerberos support Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-04-16 18:09:39 UTC (rev 17714) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-04-16 18:23:13 UTC (rev 17715) @@ -135,7 +135,8 @@ # --enable-ipv6 is deprecated and autodetected #CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm -CONFIGURE_ARGS += --disable-thread-support +#CONFIGURE_ARGS += --disable-thread-support +CONFIGURE_ARGS += --enable-thread-support CONFIGURE_ARGS += --disable-static --disable-profiled CONFIGURE_ARGS += --without-ldap This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Apr 16 20:25:12 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 16 Apr 2012 19:25:12 +0100 Subject: [csw-devel] SF.net SVN: gar:[17675] csw/mgar/gar/v2/lib/python/build_tier_list.py In-Reply-To: References: Message-ID: Hi William, A quick style scan. Comments inline. Thanks for writing this! No dia 14 de Abril de 2012 17:35, escreveu: > Revision: 17675 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=17675&view=rev > Author: ? wbonnet > Date: ? ? 2012-04-14 16:35:28 +0000 (Sat, 14 Apr 2012) > Log Message: > ----------- > Initial commit > > Added Paths: > ----------- > ? ?csw/mgar/gar/v2/lib/python/build_tier_list.py > > Added: csw/mgar/gar/v2/lib/python/build_tier_list.py > =================================================================== > --- csw/mgar/gar/v2/lib/python/build_tier_list.py ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) > +++ csw/mgar/gar/v2/lib/python/build_tier_list.py ? ? ? 2012-04-14 16:35:28 UTC (rev 17675) > @@ -0,0 +1,158 @@ > +#!/opt/csw/bin/python > + > +import sys > +import os > +from optparse import OptionParser > + > +catalog = {}; > + > + > +# --------------------------------------------------------------------------------------------------------------------- > +# > +# > +class CommandLineParser(object): > + ? ?"""Command line parser. This class is a helper used to retrive options from command line > + ? ?""" > + > + ? ?def __init__(self): > + ? ? ? ?# Create the option parser > + ? ? ? ?self.parser = OptionParser() > + > + ? ? ? ?# Add the different command line options to the parser > + ? ? ? ?self.parser.add_option("-c", "--catalog", help="Defines the catalog to parse. Default is ./catalog", > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?action="store", dest="catalog", type="string") > + ? ? ? ?self.parser.add_option("-1", "--tier1-list", help="List of tier 1 packages", > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?action="store", dest="tier1", type="string") > + ? ? ? ?self.parser.add_option("-2", "--tier2-list", help="List of tier 2 packages", > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?action="store", dest="tier2", type="string") > + ? ? ? ?self.parser.add_option("-3", "--tier3-list", help="List of tier 3 packages", > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?action="store", dest="tier3", type="string") > + ? ? ? ?self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") > + > + ? ?def parse(self): > + ? ? ? ?(self.options, self.args) = self.parser.parse_args() > + ? ? ? ?return self.options, self.args > + > +# --------------------------------------------------------------------------------------------------------------------- > +# > +# > +class ConfigurationParser(object): > + ? ?"""This class is a helper providing getter and setter on the option from command line > + ? ?""" > + > + ? ?def __init__(self, args): > + > + ? ? ? ?if args.verbose != None: > + ? ? ? ? ? ?self.verbose = args.verbose > + ? ? ? ?else: > + ? ? ? ? ? ?self.verbose = False You can use "default=..." option when defining the flag, and avoid this boilerplate code. > + ? ? ? ?if args.catalog != None: > + ? ? ? ? ? ?self.catalog = args.catalog > + ? ? ? ?else: > + ? ? ? ? ? ?self.catalog = "./catalog" > + > + ? ? ? ?if args.tier1 != None: > + ? ? ? ? ? ?self.tier1 = args.tier1 > + ? ? ? ?else: > + ? ? ? ? ? ?self.tier1 = "./tier1" > + > + ? ? ? ?if args.tier2 != None: > + ? ? ? ? ? ?self.tier2 = args.tier2 > + ? ? ? ?else: > + ? ? ? ? ? ?self.tier2 = "./tier2" > + > + ? ? ? ?if args.tier3 != None: > + ? ? ? ? ? ?self.tier3 = args.tier3 > + ? ? ? ?else: > + ? ? ? ? ? ?self.tier3 = "./tier3" > + > + ? ?# ----------------------------------------------------------------------------------------------------------------- > + > + ? ?def getCatalog(self): > + ? ? ? ?return self.catalog > + > + ? ?def getTierInputFile(self, tier): > + ? ? ? if (tier == 1): > + ? ? ? ? ? ? ? return self.tier1 This could be replaced with a dictionary: tiers = { 1: self.tier1, ... } return tiers[tier] if tier in tiers else None (or maybe something less compressed, but still data driven) > + ? ? ? if (tier == 2): > + ? ? ? ? ? ? ? return self.tier2 > + > + ? ? ? if (tier == 3): > + ? ? ? ? ? ? ? return self.tier3 > + > + ? ? ? return None > + > + ? ?def getTierOutputFile(self, tier): > + ? ? ? return "%(filename)s.out" % { 'filename' : self.getTierInputFile(tier) } > + > + ? ?def getVerbose(self): > + ? ? ? ?return self.verbose Looks like a javaism. Just let clients use youobject.verbose. If at any stage you want to control it, you can use @property. This is the beauty of Python! > +# --------------------------------------------------------------------------------------------------------------------- > +# > +# > +class Package: > + ? ? ? """ Defines a package. A package has a name (CSWfoo), a list of dependencies (same syntax as > + ? ? ? ? ? catalog (CSWfoo|CSWbar) and a tier (1, 2, 3 or None if undefined) > + ? ? ? """ > + ? ? ? def __init__(self, name=None, depends=None, tier=None): > + ? ? ? ? ? ? ? self.name = name > + ? ? ? ? ? ? ? if (depends != "none"): > + ? ? ? ? ? ? ? ? ? ? ? self.depends = depends > + ? ? ? ? ? ? ? else: > + ? ? ? ? ? ? ? ? ? ? ? self.depends = None > + ? ? ? ? ? ? ? self.tier = 3 > + > + ? ? ? def setTier(self, tier): > + ? ? ? ? ? ? ? # Access to the global variable storing the catalog > + ? ? ? ? ? ? ? global catalog > + > + ? ? ? ? ? ? ? # Check if tier is lower or undefined, then we need to do something > + ? ? ? ? ? ? ? if self.tier > tier : > + ? ? ? ? ? ? ? ? ? ? ? # Set the new tier value > + ? ? ? ? ? ? ? ? ? ? ? self.tier = tier > + ? ? ? ? ? ? ? ? ? ? ? # And iterate the list of dependencies to recursivly call the setTier method > + ? ? ? ? ? ? ? ? ? ? ? if (self.depends != None): The idiom is: self.depends is not None > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for pkg in self.depends.split('|'): > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? catalog[pkg].setTier(tier) > + > +def main(): > + > + ? ? ? global catalog > + ? ? ? outputFile = {} > + > + ? ? ? # Parse command line > + ? ? ? cliParser = CommandLineParser() > + ? ? ? (opts, args) = cliParser.parse() > + ? ? ? ?configParser = ConfigurationParser(opts) > + > + ? ? ? # Read catalog content > + ? ? ? for line in open(configParser.getCatalog(), 'r'): For opening files, use the 'with' statement which takes care of closing the files afterwards: with open(..., 'r') as fd: for line in fd: ... > + ? ? ? ? ? ? ? pkgInfo = line.split(' ') > + ? ? ? ? ? ? ? name = pkgInfo[2] > + ? ? ? ? ? ? ? depends = pkgInfo[6] > + ? ? ? ? ? ? ? catalog[name] = Package(name,depends) > + > + ? ? ? for tier in (1 ,2 ,3): > + ? ? ? ? ? ? ? # Create the three files for outputing tier content > + ? ? ? ? ? ? ? outputFile[tier] = open(configParser.getTierOutputFile(tier), 'w') > + > + ? ? ? ? ? ? ? # Check if the specific tier file exist > + ? ? ? ? ? ? ? if os.path.isfile(configParser.getTierInputFile(tier)): > + ? ? ? ? ? ? ? ? ? ? ? for line in open(configParser.getTierInputFile(tier) , 'r'): same here > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? name = line.split('\n') > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? catalog[name[0]].setTier(tier) > + ? ? ? ? ? ? ? else: > + ? ? ? ? ? ? ? ? ? ? ? print "File %(filename)s does not exit. Skipping this file" % ?{ 'filename' : configParser.getTierInputFile(tier) } > + > + ? ? ? for pkg in catalog: > + ? ? ? ? ? ? ? outputFile[catalog[pkg].tier].write("%(name)s\n" % { 'name' : catalog[pkg].name }) > + > + ? ? ? for tier in (1 ,2 ,3): > + ? ? ? ? ? ? ? outputFile[tier].close() > + > +# On sort en rendant le code de retour de main > +if __name__ == '__main__': > + ? ?sys.exit(main()) > > > Property changes on: csw/mgar/gar/v2/lib/python/build_tier_list.py > ___________________________________________________________________ > Added: svn:executable > ? + * > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From maciej at opencsw.org Mon Apr 16 20:31:33 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 16 Apr 2012 19:31:33 +0100 Subject: [csw-devel] SF.net SVN: gar:[17678] csw/mgar/gar/v2/lib/python/build_tier_list.py In-Reply-To: References: Message-ID: No dia 14 de Abril de 2012 19:31, escreveu: > + ? ? ? ? ? ? ? ? ? ? ? print "tier %(tier)d\t%(1)d\t%(2)d\t%(3)d\t%(4)d" % { 'tier' : tier + 1 , '1' : countPkg[0][tier], '2' : countPkg[1][tier],'3' : countPkg[2][tier] , '4' : countPkg[2][tier] - countPkg[1][tier] } It's probably a better idea to build a data structure at this point. You can then either serialize this data structure to JSON, or use a templating language to render it (I suggest jinja2 if you're choosing a template. I started disliking Cheetah.). Maciej From wilbury at users.sourceforge.net Tue Apr 17 00:28:15 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 16 Apr 2012 22:28:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17716] csw/mgar/pkg/cpan Message-ID: Revision: 17716 http://gar.svn.sourceforge.net/gar/?rev=17716&view=rev Author: wilbury Date: 2012-04-16 22:28:15 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Add MIME::EncWords Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/MIME-EncWords/ Modified: csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2012-04-16 06:17:52 UTC (rev 17710) +++ csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile 2012-04-16 22:28:15 UTC (rev 17716) @@ -1,21 +1,20 @@ -NAME = MIME-Types -VERSION = 1.29 +NAME = MIME-EncWords +VERSION = 1.012 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = MARKOV +AUTHOR = NEZUMI -DESCRIPTION = Perl MIME::Types module +DESCRIPTION = Perl MIME::EncWords module define BLURB - This module maintains a set of MIME::Type objects, which each describe one - known mime type. There are many types defined by RFCs and vendors, so the - list is long but not complete. Please don't hestitate to ask to add - additional information. + MIME::EncWords is aimed to be another implimentation of MIME::Words so + that it will achive more exact conformance with RFC 2047 (former RFC + 1522) specifications. Additionally, it contains some improvements. endef DISTFILES = COPYING -PACKAGES = CSWpmmimetypes -CATALOGNAME = pm_mimetypes +PACKAGES = CSWpmmimeencwords +CATALOGNAME = pm_mimeencwords BUILD_DEP_PKGS = CSWpmtestpod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 17 00:37:16 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 16 Apr 2012 22:37:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17717] csw/mgar/pkg/cpan Message-ID: Revision: 17717 http://gar.svn.sourceforge.net/gar/?rev=17717&view=rev Author: wilbury Date: 2012-04-16 22:37:16 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Add MIME::Charset Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/MIME-Charset/ Modified: csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile 2012-04-16 22:28:15 UTC (rev 17716) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-16 22:37:16 UTC (rev 17717) @@ -1,20 +1,18 @@ -NAME = MIME-EncWords -VERSION = 1.012 +NAME = MIME-Charset +VERSION = 1.009.1 CATEGORIES = cpan GARTYPE = v2 AUTHOR = NEZUMI -DESCRIPTION = Perl MIME::EncWords module +DESCRIPTION = Perl MIME::Charset module define BLURB - MIME::EncWords is aimed to be another implimentation of MIME::Words so - that it will achive more exact conformance with RFC 2047 (former RFC - 1522) specifications. Additionally, it contains some improvements. + MIME::Charset - Charset Informations for MIME endef DISTFILES = COPYING -PACKAGES = CSWpmmimeencwords -CATALOGNAME = pm_mimeencwords +PACKAGES = CSWpmmimecharset +CATALOGNAME = pm_mimecharset BUILD_DEP_PKGS = CSWpmtestpod Modified: csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums 2012-04-16 22:28:15 UTC (rev 17716) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums 2012-04-16 22:37:16 UTC (rev 17717) @@ -1,2 +1 @@ -b80cd735a88df5731be29b11ecae5497 COPYING -4944fea4b6f2be96745fde90607c43f7 MIME-Types-1.29.tar.gz +ee982e66423738b1b13f45cdde4fe1cf MIME-Charset-1.009.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 17 00:48:22 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 16 Apr 2012 22:48:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17718] csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile Message-ID: Revision: 17718 http://gar.svn.sourceforge.net/gar/?rev=17718&view=rev Author: wilbury Date: 2012-04-16 22:48:22 +0000 (Mon, 16 Apr 2012) Log Message: ----------- cpan/MIME-Charset/trunk: Correct CATALOGNAME. Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile Modified: csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-16 22:37:16 UTC (rev 17717) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-16 22:48:22 UTC (rev 17718) @@ -11,11 +11,9 @@ DISTFILES = COPYING -PACKAGES = CSWpmmimecharset -CATALOGNAME = pm_mimecharset +PACKAGES += CSWpm-mimecharset +BUILD_DEP_PKGS_CSWpm-mimecharset = CSWpmtestpod -BUILD_DEP_PKGS = CSWpmtestpod - ARCHALL = 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 Tue Apr 17 09:09:47 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 17 Apr 2012 07:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17719] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17719 http://gar.svn.sourceforge.net/gar/?rev=17719&view=rev Author: cgrzemba Date: 2012-04-17 07:09:47 +0000 (Tue, 17 Apr 2012) Log Message: ----------- add check against stdlibs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/make-stdlib-db.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/ Property changes on: csw/mgar/gar/v2/lib/python ___________________________________________________________________ Added: svn:ignore + stdlib.json Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-16 22:48:22 UTC (rev 17718) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-17 07:09:47 UTC (rev 17719) @@ -23,6 +23,7 @@ catrel = 'unstable' cache_file_bins = 'bins-%s-%s-%s.json' cache_file_needed_bins = 'needed-bins-%s-%s-%s.json' +fn_stdlibs = 'stdlibs.json' class FindBins(object): @@ -98,6 +99,8 @@ rest_client = rest.RestClient() rd = FindBins() needed_bins = {} + with open(fn_stdlibs, "r") as fd: + stdlibs = cjson.decode(fd.read()) for osrel in common_constants.OS_RELS: if osrel in common_constants.OBSOLETE_OS_RELS: continue @@ -111,6 +114,9 @@ if nb in bins[npkg]: found = True break + if nb in stdlibs: + found = True + break if found == False: print "%s not found, needed in pkg %s" % (nb,pkg) @@ -120,6 +126,9 @@ options, args = parser.parse_args() if options.debug: logging.basicConfig(level=logging.DEBUG) + if not os.path.exists(fn_stdlibs): + print "needed file %s not found, exit" % fn_stdlibs + sys.exit() pr = PackageScanner() pr.scanPackage() Added: csw/mgar/gar/v2/lib/python/make-stdlib-db.py =================================================================== --- csw/mgar/gar/v2/lib/python/make-stdlib-db.py (rev 0) +++ csw/mgar/gar/v2/lib/python/make-stdlib-db.py 2012-04-17 07:09:47 UTC (rev 17719) @@ -0,0 +1,18 @@ +#!/bin/env python + +from os import listdir, chdir, getcwd +import re +import cjson + +fnLiblst = "stdlibs.json" + +liblst = [] +cwd = getcwd() +chdir('/usr/lib') +for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + liblst.append(lib) +chdir(cwd) +with open(fnLiblst,'w') as fd: + fd.write(cjson.encode(liblst)) +fd.close() Property changes on: csw/mgar/gar/v2/lib/python/make-stdlib-db.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 17 10:19:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Apr 2012 08:19:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17720] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 17720 http://gar.svn.sourceforge.net/gar/?rev=17720&view=rev Author: dmichelsen Date: 2012-04-17 08:19:48 +0000 (Tue, 17 Apr 2012) Log Message: ----------- krb5-lib/trunk: Do not generate empty packages for the krb server components Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-04-17 07:09:47 UTC (rev 17719) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-04-17 08:19:48 UTC (rev 17720) @@ -35,16 +35,17 @@ # PACKAGES = CSWdo-not-use # SPKG_DESC_CSWdo-not-use = Do not use this catch all package -PACKAGES += CSWkrb5doc +# These packages are not part of the krb5libs build, but only the main server +#PACKAGES += CSWkrb5doc PKGFILES_CSWkrb5doc = NOFILES SPKG_DESC_CSWkrb5doc = Unused package 1 -PACKAGES += CSWkrb5user +#PACKAGES += CSWkrb5user PKGFILES_CSWkrb5user = NOFILES SPKG_DESC_CSWkrb5user = Unused package 2 -PACKAGES += CSWkrb5kdc +#PACKAGES += CSWkrb5kdc PKGFILES_CSWkrb5kdc = NOFILES SPKG_DESC_CSWkrb5kdc = Unused package 3 -PACKAGES += CSWkrb5adminserver +#PACKAGES += CSWkrb5adminserver PKGFILES_CSWkrb5adminserver = NOFILES SPKG_DESC_CSWkrb5adminserver = Unused package 4 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 Apr 17 10:59:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Apr 2012 08:59:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17721] csw/mgar/pkg/grep/trunk Message-ID: Revision: 17721 http://gar.svn.sourceforge.net/gar/?rev=17721&view=rev Author: dmichelsen Date: 2012-04-17 08:59:59 +0000 (Tue, 17 Apr 2012) Log Message: ----------- grep/trunk: Update to 2.11 and bump pcre soname Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2012-04-17 08:19:48 UTC (rev 17720) +++ csw/mgar/pkg/grep/trunk/Makefile 2012-04-17 08:59:59 UTC (rev 17721) @@ -1,5 +1,5 @@ NAME = grep -VERSION = 2.10 +VERSION = 2.11 CATEGORIES = utils GARTYPE = v2 @@ -22,7 +22,7 @@ PACKAGES = CSWggrep CATALOGNAME = ggrep RUNTIME_DEP_PKGS_CSWggrep += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggrep += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWggrep += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWggrep += CSWlibiconv2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2012-04-17 08:19:48 UTC (rev 17720) +++ csw/mgar/pkg/grep/trunk/checksums 2012-04-17 08:59:59 UTC (rev 17721) @@ -1 +1 @@ -709915434d09f5db655e5ebd7fd6bb7f grep-2.10.tar.xz +ad9c6dbdeab93e50d2bc380f10ed3643 grep-2.11.tar.xz 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 Apr 17 14:24:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Apr 2012 12:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17722] csw/mgar/pkg Message-ID: Revision: 17722 http://gar.svn.sourceforge.net/gar/?rev=17722&view=rev Author: wahwah Date: 2012-04-17 12:24:04 +0000 (Tue, 17 Apr 2012) Log Message: ----------- dash/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/dash/ csw/mgar/pkg/dash/Makefile csw/mgar/pkg/dash/branches/ csw/mgar/pkg/dash/tags/ csw/mgar/pkg/dash/trunk/ csw/mgar/pkg/dash/trunk/Makefile csw/mgar/pkg/dash/trunk/checksums csw/mgar/pkg/dash/trunk/files/ Added: csw/mgar/pkg/dash/Makefile =================================================================== --- csw/mgar/pkg/dash/Makefile (rev 0) +++ csw/mgar/pkg/dash/Makefile 2012-04-17 12:24:04 UTC (rev 17722) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/dash/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dash/trunk/Makefile =================================================================== --- csw/mgar/pkg/dash/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dash/trunk/Makefile 2012-04-17 12:24:04 UTC (rev 17722) @@ -0,0 +1,27 @@ +# $Id$ +# +NAME = dash +VERSION = 0.5.7 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = POSIX-compliant implementation of /bin/sh that aims to be as small as possible +define BLURB +endef + +VENDOR_URL = http://gondor.apana.org.au/~herbert/dash/ +MASTER_SITES = http://gondor.apana.org.au/~herbert/dash/files/ +DISTFILES = $(DISTNAME).tar.gz + +# I'm too lazy to remove gcc-isms such as -Wall and -include. +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +CHECKPKG_OVERRIDES_CSWdash += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dash/license +CHECKPKG_OVERRIDES_CSWdash += file-with-bad-content|/usr/local|root/opt/csw/bin/dash + +include gar/category.mk + +# There are "sh foo" bits in the Makefile. Need to use a POSIX shell for that. +PATH := /usr/xpg4/bin:$(PATH) Property changes on: csw/mgar/pkg/dash/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dash/trunk/checksums =================================================================== --- csw/mgar/pkg/dash/trunk/checksums (rev 0) +++ csw/mgar/pkg/dash/trunk/checksums 2012-04-17 12:24:04 UTC (rev 17722) @@ -0,0 +1 @@ +f6cedb10ae7258adb5ab17a10ae80d51 dash-0.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 Tue Apr 17 16:33:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Apr 2012 14:33:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17723] csw/mgar/pkg Message-ID: Revision: 17723 http://gar.svn.sourceforge.net/gar/?rev=17723&view=rev Author: dmichelsen Date: 2012-04-17 14:33:45 +0000 (Tue, 17 Apr 2012) Log Message: ----------- cppunit/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cppunit/ csw/mgar/pkg/cppunit/Makefile csw/mgar/pkg/cppunit/branches/ csw/mgar/pkg/cppunit/tags/ csw/mgar/pkg/cppunit/trunk/ csw/mgar/pkg/cppunit/trunk/Makefile csw/mgar/pkg/cppunit/trunk/checksums csw/mgar/pkg/cppunit/trunk/files/ csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-fabs.patch csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-ieeefp.h.patch Added: csw/mgar/pkg/cppunit/Makefile =================================================================== --- csw/mgar/pkg/cppunit/Makefile (rev 0) +++ csw/mgar/pkg/cppunit/Makefile 2012-04-17 14:33:45 UTC (rev 17723) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cppunit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cppunit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cppunit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cppunit/trunk/Makefile 2012-04-17 14:33:45 UTC (rev 17723) @@ -0,0 +1,48 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = cppunit +VERSION = 1.12.1 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = C++ port of JUnit + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +# Use patch until this is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=3483396&group_id=11795&atid=111795 +PATCHFILES += cppunit-1.12.1-configure.in-ieeefp.h.patch + +# Use patch until this is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=3483400&group_id=11795&atid=111795 +PATCHFILES += cppunit-1.12.1-configure.in-fabs.patch + +PACKAGES += CSWlibcppunit1-12-1-gxx +SPKG_DESC_CSWlibcppunit1-12-1-gxx = C++ port of JUnit, libcppunit-1.12.so.1 +PKGFILES_CSWlibcppunit1-12-1-gxx += $(call pkgfiles_lib,libcppunit-1.12.so.1) +RUNTIME_DEP_PKGS_CSWlibcppunit1-12-1-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcppunit1-12-1-gxx += CSWlibstdc++6 + +PACKAGES += CSWcppunit-gxx-dev +SPKG_DESC_CSWcppunit-gxx-dev = Development files C++ port of JUnit +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWcppunit-gxx-dev += CSWlibcppunit1-12-1-gxx +RUNTIME_DEP_PKGS_CSWcppunit-gxx-dev += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcppunit-gxx-dev += CSWlibstdc++6 + +# This is just an example +CHECKPKG_OVERRIDES_CSWcppunit-gxx-dev += file-with-bad-content|/usr/local|root/opt/csw/gxx/share/doc/cppunit/money_example.html + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU + +BUILD64 = 1 + +include gar/category.mk + +post-patch-modulated: + -cd $(WORKSRC) && autoreconf -fi + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/cppunit/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cppunit/trunk/checksums =================================================================== --- csw/mgar/pkg/cppunit/trunk/checksums (rev 0) +++ csw/mgar/pkg/cppunit/trunk/checksums 2012-04-17 14:33:45 UTC (rev 17723) @@ -0,0 +1 @@ +bd30e9cf5523cdfc019b94f5e1d7fd19 cppunit-1.12.1.tar.gz Added: csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-fabs.patch =================================================================== --- csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-fabs.patch (rev 0) +++ csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-fabs.patch 2012-04-17 14:33:45 UTC (rev 17723) @@ -0,0 +1,10 @@ +--- cppunit-1.12.1.orig/configure.in 2008-02-19 23:59:25.000000000 -0600 ++++ cppunit-1.12.1/configure.in 2012-02-02 17:36:56.215835516 -0600 +@@ -88,6 +89,7 @@ + AC_CXX_HAVE_STRSTREAM + AX_CXX_HAVE_ISFINITE + AC_CHECK_FUNCS(finite) ++AC_CHECK_LIB([m],[fabs]) + + cppunit_val='CPPUNIT_HAVE_RTTI' + AC_ARG_ENABLE(typeinfo-name, Added: csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-ieeefp.h.patch =================================================================== --- csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-ieeefp.h.patch (rev 0) +++ csw/mgar/pkg/cppunit/trunk/files/cppunit-1.12.1-configure.in-ieeefp.h.patch 2012-04-17 14:33:45 UTC (rev 17723) @@ -0,0 +1,24 @@ +diff -ur cppunit-1.12.1.orig/configure.in cppunit-1.12.1/configure.in +--- cppunit-1.12.1.orig/configure.in 2008-02-19 23:59:25.000000000 -0600 ++++ cppunit-1.12.1/configure.in 2012-02-02 17:21:28.767587739 -0600 +@@ -73,6 +73,7 @@ + # ---------------------------------------------------------------------------- + + AC_CHECK_HEADERS(cmath,[],[],[/**/]) ++AC_CHECK_HEADERS(ieeefp.h,[],[],[/**/]) + + # Check for compiler characteristics + # ---------------------------------------------------------------------------- +--- cppunit-1.12.1.orig/include/cppunit/portability/FloatingPoint.h 2007-03-04 21:16:42.000000000 -0600 ++++ cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h 2012-02-02 17:32:43.339423624 -0600 +@@ -4,6 +4,10 @@ + #include + #include + ++#if defined(CPPUNIT_HAVE_IEEEFP_H) ++#include ++#endif ++ + CPPUNIT_NS_BEGIN + + /// \brief Tests if a floating-point is a NaN. 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 Apr 17 17:06:49 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Apr 2012 15:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17724] csw/mgar/pkg/cppunit/trunk/Makefile Message-ID: Revision: 17724 http://gar.svn.sourceforge.net/gar/?rev=17724&view=rev Author: dmichelsen Date: 2012-04-17 15:06:49 +0000 (Tue, 17 Apr 2012) Log Message: ----------- cppunit/trunk: Add cppunit.m4 in main aclocal/ Modified Paths: -------------- csw/mgar/pkg/cppunit/trunk/Makefile Modified: csw/mgar/pkg/cppunit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cppunit/trunk/Makefile 2012-04-17 14:33:45 UTC (rev 17723) +++ csw/mgar/pkg/cppunit/trunk/Makefile 2012-04-17 15:06:49 UTC (rev 17724) @@ -46,3 +46,8 @@ post-patch-modulated: -cd $(WORKSRC) && autoreconf -fi @$(MAKECOOKIE) + +post-install-modulated: + ginstall -d $(DESTDIR)$(BUILD_PREFIX)/share/aclocal + ln -s $(sharedstatedir)/aclocal/cppunit.m4 $(DESTDIR)$(BUILD_PREFIX)/share/aclocal/cppunit.m4 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 17 18:40:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Apr 2012 16:40:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17725] csw/mgar/pkg Message-ID: Revision: 17725 http://gar.svn.sourceforge.net/gar/?rev=17725&view=rev Author: wahwah Date: 2012-04-17 16:40:49 +0000 (Tue, 17 Apr 2012) Log Message: ----------- meld/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/meld/ csw/mgar/pkg/meld/Makefile csw/mgar/pkg/meld/branches/ csw/mgar/pkg/meld/tags/ csw/mgar/pkg/meld/trunk/ csw/mgar/pkg/meld/trunk/Makefile csw/mgar/pkg/meld/trunk/checksums csw/mgar/pkg/meld/trunk/files/ csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch Added: csw/mgar/pkg/meld/Makefile =================================================================== --- csw/mgar/pkg/meld/Makefile (rev 0) +++ csw/mgar/pkg/meld/Makefile 2012-04-17 16:40:49 UTC (rev 17725) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/meld/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/meld/trunk/Makefile =================================================================== --- csw/mgar/pkg/meld/trunk/Makefile (rev 0) +++ csw/mgar/pkg/meld/trunk/Makefile 2012-04-17 16:40:49 UTC (rev 17725) @@ -0,0 +1,59 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = meld +VERSION = 1.5.4 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Visual diff and merge tool +define BLURB + Long description +endef + +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/1.5/ +DISTFILES = $(DISTNAME).tar.xz + +# PATCHFILES += 0001-Allow-to-use-a-different-install-utility.patch +PATCHFILES += 0001-Use-conditionals-for-installation-places.patch + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = meld +TEST_SCRIPTS = + +EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co] + +ARCHALL_CSWmeld = 1 +RUNTIME_DEP_PKGS_CSWmeld += CSWpython + +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/bin/meld +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/meld/paths.py +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/lib/meld/meld/paths.py +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-fr.omf +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-C.omf +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-es.omf +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/scrollkeeper_docs +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWmeld += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWmeld += catalogname-does-not-start-with-py_ + +include gar/category.mk + +install-meld: + cd $(WORKSRC) && gmake \ + prefix=$(prefix) \ + localstatedir=$(localstatedir) \ + sysconfdir=$(sysconfdir) \ + DESTDIR=$(DESTDIR) \ + libdir_=$(libdir)/python/site-packages \ + install + @$(MAKECOOKIE) + +# msgfmt, install +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/meld/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/meld/trunk/checksums =================================================================== --- csw/mgar/pkg/meld/trunk/checksums (rev 0) +++ csw/mgar/pkg/meld/trunk/checksums 2012-04-17 16:40:49 UTC (rev 17725) @@ -0,0 +1 @@ +2f3929551d876ff45acf21b2c1e3e71a meld-1.5.4.tar.xz Added: csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch =================================================================== --- csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch (rev 0) +++ csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch 2012-04-17 16:40:49 UTC (rev 17725) @@ -0,0 +1,73 @@ +From b297bc4c5f1c87088840f18e0a128b6cb32825ad Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 17 Apr 2012 15:06:41 +0200 +Subject: [PATCH] Allow to use a different install utility + +--- + Makefile | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/Makefile b/Makefile +index 2dd6e7a..6ab615f 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,41 +45,41 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop + $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps \ + $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps \ + $(DESTDIR)$(helpdir_) +- install -m 755 bin/meld.install \ ++ $(INSTALL) -m 755 bin/meld.install \ + $(DESTDIR)$(bindir)/meld +- install -m 644 meld/*.py \ ++ $(INSTALL) -m 644 meld/*.py \ + $(DESTDIR)$(libdir_)/meld +- install -m 644 meld/ui/*.py \ ++ $(INSTALL) -m 644 meld/ui/*.py \ + $(DESTDIR)$(libdir_)/meld/ui +- install -m 644 meld/util/*.py \ ++ $(INSTALL) -m 644 meld/util/*.py \ + $(DESTDIR)$(libdir_)/meld/util +- install -m 644 meld/vc/*.py \ ++ $(INSTALL) -m 644 meld/vc/*.py \ + $(DESTDIR)$(libdir_)/meld/vc +- install -m 644 meld/paths.py.install \ ++ $(INSTALL) -m 644 meld/paths.py.install \ + $(DESTDIR)$(libdir_)/meld/paths.py +- install -m 644 data/meld.desktop \ ++ $(INSTALL) -m 644 data/meld.desktop \ + $(DESTDIR)$(sharedir)/applications + $(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' + $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' +- install -m 644 \ ++ $(INSTALL) -m 644 \ + data/ui/*.ui \ + $(DESTDIR)$(sharedir_)/ui +- install -m 644 \ ++ $(INSTALL) -m 644 \ + data/ui/*.xml \ + $(DESTDIR)$(sharedir_)/ui +- install -m 644 \ ++ $(INSTALL) -m 644 \ + data/icons/*.xpm \ + data/icons/*.png \ + $(DESTDIR)$(sharedir_)/icons +- install -m 644 data/icons/hicolor/16x16/apps/meld.png \ ++ $(INSTALL) -m 644 data/icons/hicolor/16x16/apps/meld.png \ + $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png +- install -m 644 data/icons/hicolor/22x22/apps/meld.png \ ++ $(INSTALL) -m 644 data/icons/hicolor/22x22/apps/meld.png \ + $(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png +- install -m 644 data/icons/hicolor/32x32/apps/meld.png \ ++ $(INSTALL) -m 644 data/icons/hicolor/32x32/apps/meld.png \ + $(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png +- install -m 644 data/icons/hicolor/48x48/apps/meld.png \ ++ $(INSTALL) -m 644 data/icons/hicolor/48x48/apps/meld.png \ + $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png +- install -m 644 data/icons/hicolor/scalable/apps/meld.svg \ ++ $(INSTALL) -m 644 data/icons/hicolor/scalable/apps/meld.svg \ + $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg + $(MAKE) -C po install + $(MAKE) -C help install +-- +1.7.10 + Added: csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch =================================================================== --- csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch (rev 0) +++ csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch 2012-04-17 16:40:49 UTC (rev 17725) @@ -0,0 +1,47 @@ +From 31e237b7e89875429013490c5750e86efdf7958e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 17 Apr 2012 17:56:42 +0200 +Subject: [PATCH] Use conditionals for installation places. + +--- + INSTALL | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 30f150a..fe65279 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -34,18 +34,18 @@ + ## If you need to, you can customise the install paths used here: + ## + PYTHON ?= python +-prefix := /usr/local +-bindir := $(prefix)/bin +-libdir := $(prefix)/lib +-docdir := $(prefix)/share/doc +-sharedir := $(prefix)/share +-helpdir := $(sharedir)/gnome/help +-localedir := $(prefix)/share/locale +-localstatedir := $(prefix)/var +-libdir_ := $(libdir)/meld +-docdir_ := $(docdir)/meld +-sharedir_ := $(sharedir)/meld +-helpdir_ := $(helpdir)/meld ++prefix ?= /usr/local ++bindir ?= $(prefix)/bin ++libdir ?= $(prefix)/lib ++docdir ?= $(prefix)/share/doc ++sharedir ?= $(prefix)/share ++helpdir ?= $(sharedir)/gnome/help ++localedir ?= $(prefix)/share/locale ++localstatedir ?= $(prefix)/var ++libdir_ ?= $(libdir)/meld ++docdir_ ?= $(docdir)/meld ++sharedir_ ?= $(sharedir)/meld ++helpdir_ ?= $(helpdir)/meld + ## + ## Python Version + ## ************** +-- +1.7.10 + 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 Apr 17 18:44:36 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 17 Apr 2012 16:44:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17726] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 17726 http://gar.svn.sourceforge.net/gar/?rev=17726&view=rev Author: cgrzemba Date: 2012-04-17 16:44:36 +0000 (Tue, 17 Apr 2012) Log Message: ----------- evince/trunk: correct RUNTIME_DEP for build without nautilus and dbus Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2012-04-17 16:40:49 UTC (rev 17725) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-04-17 16:44:36 UTC (rev 17726) @@ -104,13 +104,13 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib5 RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus1-3 +# RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWevince += CSWlibintl8 RUNTIME_DEP_PKGS_CSWevince += CSWlibz1 RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWevince += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus-glib1-2 +# RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWevince += CSWlibspectre1 RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler7 RUNTIME_DEP_PKGS_CSWevince += CSWlibgdk-x11-2-0-0 @@ -123,12 +123,12 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWevince += CSWfconfig -RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWevince += CSWnautilus +# RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 +# RUNTIME_DEP_PKGS_CSWevince += CSWnautilus RUNTIME_DEP_PKGS_CSWevince += CSWpango -RUNTIME_DEP_PKGS_CSWevince += CSWdbus +# RUNTIME_DEP_PKGS_CSWevince += CSWdbus # at least the machine-id file must exist, dbus-daemon creates this -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus +# CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus # Solaris10 paths: these are resuts of cmd: # $ scrollkeeper-config --pkglocalstatedir CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib 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 Apr 17 20:40:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Apr 2012 18:40:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17727] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 17727 http://gar.svn.sourceforge.net/gar/?rev=17727&view=rev Author: dmichelsen Date: 2012-04-17 18:40:51 +0000 (Tue, 17 Apr 2012) Log Message: ----------- sasl/trunk: Add patch to avoid coredump on kerberos binds and rework dependencies Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sasl/trunk/files/check-realloc.patch Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2012-04-17 16:44:36 UTC (rev 17726) +++ csw/mgar/pkg/sasl/trunk/Makefile 2012-04-17 18:40:51 UTC (rev 17727) @@ -37,19 +37,24 @@ # patch libtool discards -R options passed with LDFLAGS PATCHFILES += ltmain.diff +# Use patch until it is fixed upstream: +# http://www.spinics.net/lists/cyrus-sasl/msg02004.html +PATCHFILES += check-realloc.patch + VENDOR_URL = http://asg.web.cmu.edu/sasl/ PACKAGES += CSWsasl SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer -RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt +RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 PACKAGES += CSWsaslauthd SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl -RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt -RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3 Added: csw/mgar/pkg/sasl/trunk/files/check-realloc.patch =================================================================== --- csw/mgar/pkg/sasl/trunk/files/check-realloc.patch (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/check-realloc.patch 2012-04-17 18:40:51 UTC (rev 17727) @@ -0,0 +1,21 @@ +--- cyrus-sasl-2.1.25-orig/plugins/gssapi.c 2011-10-07 03:11:43.000000000 +0000 ++++ cyrus-sasl-2.1.25/plugins/gssapi.c 2011-10-07 03:12:12.000000000 +0000 +@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str + } + + if (output_token->value && output) { +- unsigned char * p = (unsigned char *) text->encode_buf; ++ unsigned char * p; + + ret = _plug_buf_alloc(text->utils, + &(text->encode_buf), +@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str + GSS_UNLOCK_MUTEX(text->utils); + return ret; + } ++ ++ p = (unsigned char *) text->encode_buf; + + p[0] = (output_token->length>>24) & 0xFF; + p[1] = (output_token->length>>16) & 0xFF; + 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 Apr 17 21:45:25 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 17 Apr 2012 19:45:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17728] csw/mgar/gar/v2/lib/python/find_missing_bins.py Message-ID: Revision: 17728 http://gar.svn.sourceforge.net/gar/?rev=17728&view=rev Author: cgrzemba Date: 2012-04-17 19:45:25 +0000 (Tue, 17 Apr 2012) Log Message: ----------- optimized, but reports to much? Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-17 18:40:51 UTC (rev 17727) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-17 19:45:25 UTC (rev 17728) @@ -1,12 +1,7 @@ -#!/usr/bin/env python2.6 +#!/usr/bin/env python2.6 -t -"""Helps to safely remove a package (by catalogname) from the catalog. +"""Helps to check if all needed libs are in the catalog. -Takes a catalog name and: - - - checks all the catalogs and gets the md5 sums for each catalog - - checks for reverse dependencies; if there are any, stops - - when there are no rev deps, prints a csw-upload-pkg --remove call """ import optparse @@ -24,6 +19,7 @@ cache_file_bins = 'bins-%s-%s-%s.json' cache_file_needed_bins = 'needed-bins-%s-%s-%s.json' fn_stdlibs = 'stdlibs.json' +fn_report = 'missing_libs.txt' class FindBins(object): @@ -99,26 +95,60 @@ rest_client = rest.RestClient() rd = FindBins() needed_bins = {} + osrel_list = [] with open(fn_stdlibs, "r") as fd: stdlibs = cjson.decode(fd.read()) + fl = open(fn_report, "w") + r = -1 for osrel in common_constants.OS_RELS: + r = r+1 if osrel in common_constants.OBSOLETE_OS_RELS: + logging.debug("scanPackage: %s is obsoleted" % osrel) continue for arch in common_constants.PHYSICAL_ARCHITECTURES: + # get the list of binaries of a package bins = rd.getBins(catrel, arch, osrel) + # get the list of libs which a package needs needed_bins = rd.getNeededBins(catrel, arch, osrel) + i = 0 + checked = [] for pkg in needed_bins: + i = i+1 for nb in needed_bins[pkg]: + if nb in checked: continue + checked.append(nb) found = False for npkg in bins: - if nb in bins[npkg]: - found = True - break + for b in bins[npkg]: + # if lib in the package + if nb in b: + found = True + # logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,b,npkg)) + break + if found: break if nb in stdlibs: found = True - break + # logging.debug ("\nfound %s" % nb) + break if found == False: - print "%s not found, needed in pkg %s" % (nb,pkg) + # if not found iterate over older OS releases + logging.debug ("\ncompare lower osrel %s [%s]: %s" % (osrel,pkg,nb)) + while r > 0: + r = r - 1 + bins = rd.getBins(catrel, arch, common_constants.OS_RELS[r]) + for npkg in bins: + for b in bins[npkg]: + if nb in b: + found = True + logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,b,npkg)) + break + if found: break + if found == False: + fl.write("%s:%s:%s:%s\n" % (nb,pkg,arch,osrel) ) + print "\nNOT FOUND: %s, needed in pkg %s %s %s" % (nb,pkg,arch,osrel) + sys.stdout.write("\r%d" % i) + sys.stdout.flush() + fl.close() def main(): parser = optparse.OptionParser() 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 Apr 17 22:55:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Apr 2012 20:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17729] csw/mgar/pkg Message-ID: Revision: 17729 http://gar.svn.sourceforge.net/gar/?rev=17729&view=rev Author: wahwah Date: 2012-04-17 20:55:20 +0000 (Tue, 17 Apr 2012) Log Message: ----------- aspell/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/aspell/ csw/mgar/pkg/aspell/Makefile csw/mgar/pkg/aspell/branches/ csw/mgar/pkg/aspell/tags/ csw/mgar/pkg/aspell/trunk/ csw/mgar/pkg/aspell/trunk/Makefile csw/mgar/pkg/aspell/trunk/checksums csw/mgar/pkg/aspell/trunk/files/ Added: csw/mgar/pkg/aspell/Makefile =================================================================== --- csw/mgar/pkg/aspell/Makefile (rev 0) +++ csw/mgar/pkg/aspell/Makefile 2012-04-17 20:55:20 UTC (rev 17729) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/aspell/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/aspell/trunk/Makefile =================================================================== --- csw/mgar/pkg/aspell/trunk/Makefile (rev 0) +++ csw/mgar/pkg/aspell/trunk/Makefile 2012-04-17 20:55:20 UTC (rev 17729) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = aspell +VERSION = 0.60.6.1 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Spell checker +define BLURB + Long description +endef + +MASTER_SITES = ftp://ftp.gnu.org/gnu/aspell/ +DISTFILES = $(DISTNAME).tar.gz + +EXTRA_LDFLAGS = -lm + +CONFIGURE_ARGS = $(DIRPATHS) + +RUNTIME_DEP_PKGS_CSWaspell += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWaspell += CSWlibncursesw5 + +CHECKPKG_OVERRIDES_CSWaspell += file-with-bad-content +CHECKPKG_OVERRIDES_CSWaspell += bad-rpath-entry + +include gar/category.mk Property changes on: csw/mgar/pkg/aspell/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/aspell/trunk/checksums =================================================================== --- csw/mgar/pkg/aspell/trunk/checksums (rev 0) +++ csw/mgar/pkg/aspell/trunk/checksums 2012-04-17 20:55:20 UTC (rev 17729) @@ -0,0 +1 @@ +e66a9c9af6a60dc46134fdacf6ce97d7 aspell-0.60.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 17 23:34:57 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 17 Apr 2012 21:34:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17730] csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums Message-ID: Revision: 17730 http://gar.svn.sourceforge.net/gar/?rev=17730&view=rev Author: wilbury Date: 2012-04-17 21:34:57 +0000 (Tue, 17 Apr 2012) Log Message: ----------- Add MIME::EncWords Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums Modified: csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums 2012-04-17 20:55:20 UTC (rev 17729) +++ csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums 2012-04-17 21:34:57 UTC (rev 17730) @@ -1,2 +1 @@ -b80cd735a88df5731be29b11ecae5497 COPYING -4944fea4b6f2be96745fde90607c43f7 MIME-Types-1.29.tar.gz +aa0651a8a970d0fb35aa24b080ca6ee6 MIME-EncWords-1.012.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Apr 17 23:41:11 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 17 Apr 2012 21:41:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17731] csw/mgar/pkg/cpan/MIME-Charset/ Message-ID: Revision: 17731 http://gar.svn.sourceforge.net/gar/?rev=17731&view=rev Author: wilbury Date: 2012-04-17 21:41:11 +0000 (Tue, 17 Apr 2012) Log Message: ----------- Remove MIME-Charset Removed Paths: ------------- csw/mgar/pkg/cpan/MIME-Charset/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Apr 18 00:25:49 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 17 Apr 2012 22:25:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17732] csw/mgar/pkg/cpan Message-ID: Revision: 17732 http://gar.svn.sourceforge.net/gar/?rev=17732&view=rev Author: wilbury Date: 2012-04-17 22:25:49 +0000 (Tue, 17 Apr 2012) Log Message: ----------- Re-add MIME::Charset Added Paths: ----------- csw/mgar/pkg/cpan/MIME-Charset/ csw/mgar/pkg/cpan/MIME-Charset/branches/ csw/mgar/pkg/cpan/MIME-Charset/tags/ csw/mgar/pkg/cpan/MIME-Charset/trunk/ csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums csw/mgar/pkg/cpan/MIME-Charset/trunk/files/ Property changes on: csw/mgar/pkg/cpan/MIME-Charset/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-17 22:25:49 UTC (rev 17732) @@ -0,0 +1,24 @@ +NAME = MIME-Charset +VERSION = 1.009.1 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = NEZUMI + +DESCRIPTION = Charset Informations for MIME +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = ARTISTIC + +BUILD_DEP_PKGS += CSWpm-test-simple + +PACKAGES += CSWpm-mime-charset +CATALOGNAME_CSWpm-mime-charset = pm_mime_charset +SPKG_DESC_CSWpm-mime-charset = Charset Informations for MIME +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-mime-charset = 1 +RUNTIME_DEP_PKGS_CSWpm-mime-charset += CSWpm-encode + +include gar/category.mk Added: csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/checksums 2012-04-17 22:25:49 UTC (rev 17732) @@ -0,0 +1 @@ +ee982e66423738b1b13f45cdde4fe1cf MIME-Charset-1.009.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 11:25:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 09:25:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17733] csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile Message-ID: Revision: 17733 http://gar.svn.sourceforge.net/gar/?rev=17733&view=rev Author: dmichelsen Date: 2012-04-18 09:25:21 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Carp-Clan: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile Modified: csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2012-04-17 22:25:49 UTC (rev 17732) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2012-04-18 09:25:21 UTC (rev 17733) @@ -4,14 +4,20 @@ GARTYPE = v2 AUTHOR = STBEY -DESCRIPTION = report errors from perspective of caller of a "clan" of modules +DESCRIPTION = Report errors from perspective of caller of a "clan" of modules define BLURB - This module is based on "Carp.pm" from Perl 5.005_03. It has been modified - to skip all package names matching the pattern given in the "use" statement - inside the "qw()" term (or argument list). endef -PACKAGES = CSWpmcarpclan -CATALOGNAME = pm_carpclan +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-carp-clan +CATALOGNAME_CSWpm-carp-clan = pm_carp_clan +SPKG_DESC_CSWpm-carp-clan = Report errors from perspective of caller of a "clan" of modules +ARCHALL_CSWpm-carp-clan = 1 +RUNTIME_DEP_PKGS_CSWpm-carp-clan += CSWpm-test-exception +OBSOLETED_BY_CSWpm-carp-clan += CSWpmcarpclan +CATALOGNAME_CSWpmcarpclan = pm_carpclan_stub + 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 Wed Apr 18 11:35:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 09:35:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17734] csw/mgar/pkg/cpan/Bit-Vector/trunk Message-ID: Revision: 17734 http://gar.svn.sourceforge.net/gar/?rev=17734&view=rev Author: dmichelsen Date: 2012-04-18 09:35:31 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Bit-Vector: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2012-04-18 09:25:21 UTC (rev 17733) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2012-04-18 09:35:31 UTC (rev 17734) @@ -1,17 +1,22 @@ NAME = Bit-Vector -VERSION = 7.1 +VERSION = 7.2 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = STBEY +AUTHOR = ANDK -DESCRIPTION = Efficient bit vector, set of integers and big int math library. +DESCRIPTION = Efficient bit vector, set of integers and big int math library define BLURB endef -PACKAGES = CSWpmbitvec -CATALOGNAME = pm_bitvec +CATALOG_RELEASE = unstable -RUNTIME_DEP_PKGS = CSWpmcarpclan -BUILD_DEP_PKGS = CSWpmcarpclan +LICENSE_TEXT = This module is licensed under the unknown license +PACKAGES += CSWpm-bit-vector +CATALOGNAME_CSWpm-bit-vector = pm_bit_vector +SPKG_DESC_CSWpm-bit-vector = Efficient bit vector, set of integers and big int math library +RUNTIME_DEP_PKGS_CSWpm-bit-vector += CSWpm-carp-clan +OBSOLETED_BY_CSWpm-bit-vector += CSWpmbitvec +CATALOGNAME_CSWpmbitvec = pm_bitvec_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums 2012-04-18 09:25:21 UTC (rev 17733) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums 2012-04-18 09:35:31 UTC (rev 17734) @@ -1 +1 @@ -164c8574b728f6171b2a6f564fcd2e50 Bit-Vector-7.1.tar.gz +bc6ae34738b8f889290bf50099ff8aed Bit-Vector-7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 13:06:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 11:06:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17735] csw/mgar/pkg/cpan/Compress-Bzip2/trunk Message-ID: Revision: 17735 http://gar.svn.sourceforge.net/gar/?rev=17735&view=rev Author: dmichelsen Date: 2012-04-18 11:06:35 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Compress-Bzip2: Initial commit Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Bzip2/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile 2012-04-18 09:35:31 UTC (rev 17734) +++ csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile 2012-04-18 11:06:35 UTC (rev 17735) @@ -4,13 +4,19 @@ GARTYPE = v2 AUTHOR = ARJAY -DESCRIPTION = Interface to Bzip2 compression library +DESCRIPTION = Interface to the Bzip2 compression library define BLURB endef -RUNTIME_DEP_PKGS = CSWbzip2 +CATALOG_RELEASE = unstable -PACKAGES = CSWpmcompressbzip2 -CATALOGNAME = pm_compressbzip2 +LICENSE = COPYING +PACKAGES += CSWpm-compress-bzip2 +CATALOGNAME_CSWpm-compress-bzip2 = pm_compress_bzip2 +SPKG_DESC_CSWpm-compress-bzip2 = Interface to the Bzip2 compression library +RUNTIME_DEP_PKGS_CSWpm-compress-bzip2 += CSWlibbz2-1-0 +OBSOLETED_BY_CSWpm-compress-bzip2 += CSWpmcompressbzip2 +CATALOGNAME_CSWpmcompressbzip2 = pm_compressbzip2_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/checksums 2012-04-18 09:35:31 UTC (rev 17734) +++ csw/mgar/pkg/cpan/Compress-Bzip2/trunk/checksums 2012-04-18 11:06:35 UTC (rev 17735) @@ -1 +1 @@ -1699fde3e86f2a036f135ae606d456bf download/Compress-Bzip2-2.09.tar.gz +1699fde3e86f2a036f135ae606d456bf Compress-Bzip2-2.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 13:12:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 11:12:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17736] csw/mgar/pkg/cpan Message-ID: Revision: 17736 http://gar.svn.sourceforge.net/gar/?rev=17736&view=rev Author: dmichelsen Date: 2012-04-18 11:12:51 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Encode-EUCJPASCII: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Encode-EUCJPASCII/ csw/mgar/pkg/cpan/Encode-EUCJPASCII/branches/ csw/mgar/pkg/cpan/Encode-EUCJPASCII/tags/ csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/ csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/Makefile csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/checksums csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/Makefile 2012-04-18 11:12:51 UTC (rev 17736) @@ -0,0 +1,19 @@ +NAME = Encode-EUCJPASCII +VERSION = 0.03 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = NEZUMI + +DESCRIPTION = EucJP-ascii - An eucJP-open mapping +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-encode-eucjpascii +CATALOGNAME_CSWpm-encode-eucjpascii = pm_encode_eucjpascii +SPKG_DESC_CSWpm-encode-eucjpascii = EucJP-ascii - An eucJP-open mapping + +include gar/category.mk Added: csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Encode-EUCJPASCII/trunk/checksums 2012-04-18 11:12:51 UTC (rev 17736) @@ -0,0 +1 @@ +5daa65f55b7c2050bb0713d9e95f239d Encode-EUCJPASCII-0.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 14:19:32 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 12:19:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17737] csw/mgar/pkg/cpan Message-ID: Revision: 17737 http://gar.svn.sourceforge.net/gar/?rev=17737&view=rev Author: dmichelsen Date: 2012-04-18 12:19:31 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Encode-JIS2K/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Encode-JIS2K/ csw/mgar/pkg/cpan/Encode-JIS2K/branches/ csw/mgar/pkg/cpan/Encode-JIS2K/tags/ csw/mgar/pkg/cpan/Encode-JIS2K/trunk/ csw/mgar/pkg/cpan/Encode-JIS2K/trunk/Makefile csw/mgar/pkg/cpan/Encode-JIS2K/trunk/checksums csw/mgar/pkg/cpan/Encode-JIS2K/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Encode-JIS2K/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Encode-JIS2K/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Encode-JIS2K/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Encode-JIS2K/trunk/Makefile 2012-04-18 12:19:31 UTC (rev 17737) @@ -0,0 +1,17 @@ +NAME = Encode-JIS2K +VERSION = 0.02 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DANKOGAI + +DESCRIPTION = JIS X 0212 (aka JIS 2000) Encodings + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-encode-jis2k +CATALOGNAME_CSWpm-encode-jis2k = pm_encode_jis2k +SPKG_DESC_CSWpm-encode-jis2k = JIS X 0212 (aka JIS 2000) Encodings + +include gar/category.mk Added: csw/mgar/pkg/cpan/Encode-JIS2K/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Encode-JIS2K/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Encode-JIS2K/trunk/checksums 2012-04-18 12:19:31 UTC (rev 17737) @@ -0,0 +1 @@ +00e73ee943fb2f882b00b7b61e4c9db1 Encode-JIS2K-0.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 14:36:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 12:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17738] csw/mgar/pkg/cpan Message-ID: Revision: 17738 http://gar.svn.sourceforge.net/gar/?rev=17738&view=rev Author: dmichelsen Date: 2012-04-18 12:36:48 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Encode-HanExtra/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Encode-HanExtra/ csw/mgar/pkg/cpan/Encode-HanExtra/branches/ csw/mgar/pkg/cpan/Encode-HanExtra/tags/ csw/mgar/pkg/cpan/Encode-HanExtra/trunk/ csw/mgar/pkg/cpan/Encode-HanExtra/trunk/Makefile csw/mgar/pkg/cpan/Encode-HanExtra/trunk/checksums csw/mgar/pkg/cpan/Encode-HanExtra/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Encode-HanExtra/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Encode-HanExtra/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Encode-HanExtra/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Encode-HanExtra/trunk/Makefile 2012-04-18 12:36:48 UTC (rev 17738) @@ -0,0 +1,19 @@ +NAME = Encode-HanExtra +VERSION = 0.23 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = AUDREYT + +DESCRIPTION = Extra sets of Chinese encodings +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the mit license + +PACKAGES += CSWpm-encode-hanextra +CATALOGNAME_CSWpm-encode-hanextra = pm_encode_hanextra +SPKG_DESC_CSWpm-encode-hanextra = Extra sets of Chinese encodings + +include gar/category.mk Added: csw/mgar/pkg/cpan/Encode-HanExtra/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Encode-HanExtra/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Encode-HanExtra/trunk/checksums 2012-04-18 12:36:48 UTC (rev 17738) @@ -0,0 +1 @@ +e1d3bc32c1c8ee304235a06fbcd5d5a4 Encode-HanExtra-0.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 14:48:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 12:48:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17739] csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile Message-ID: Revision: 17739 http://gar.svn.sourceforge.net/gar/?rev=17739&view=rev Author: dmichelsen Date: 2012-04-18 12:48:18 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/MIME-Charset/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile Modified: csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-18 12:36:48 UTC (rev 17738) +++ csw/mgar/pkg/cpan/MIME-Charset/trunk/Makefile 2012-04-18 12:48:18 UTC (rev 17739) @@ -12,13 +12,10 @@ LICENSE = ARTISTIC -BUILD_DEP_PKGS += CSWpm-test-simple - PACKAGES += CSWpm-mime-charset CATALOGNAME_CSWpm-mime-charset = pm_mime_charset SPKG_DESC_CSWpm-mime-charset = Charset Informations for MIME # There was no information if this is pure Perl or not. Please remove if necessary. ARCHALL_CSWpm-mime-charset = 1 -RUNTIME_DEP_PKGS_CSWpm-mime-charset += CSWpm-encode 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 Wed Apr 18 14:54:33 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 12:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17740] csw/mgar/pkg/cpan/MIME-EncWords/trunk Message-ID: Revision: 17740 http://gar.svn.sourceforge.net/gar/?rev=17740&view=rev Author: dmichelsen Date: 2012-04-18 12:54:33 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/MIME-EncWords/trunk: Update to 1.012.4 and makemake Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums Modified: csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile 2012-04-18 12:48:18 UTC (rev 17739) +++ csw/mgar/pkg/cpan/MIME-EncWords/trunk/Makefile 2012-04-18 12:54:33 UTC (rev 17740) @@ -1,23 +1,22 @@ NAME = MIME-EncWords -VERSION = 1.012 +VERSION = 1.012.4 CATEGORIES = cpan GARTYPE = v2 AUTHOR = NEZUMI -DESCRIPTION = Perl MIME::EncWords module +DESCRIPTION = Deal with RFC 2047 encoded words (improved) define BLURB - MIME::EncWords is aimed to be another implimentation of MIME::Words so - that it will achive more exact conformance with RFC 2047 (former RFC - 1522) specifications. Additionally, it contains some improvements. endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpmmimeencwords -CATALOGNAME = pm_mimeencwords +LICENSE = ARTISTIC -BUILD_DEP_PKGS = CSWpmtestpod +PACKAGES += CSWpm-mime-encwords +CATALOGNAME_CSWpm-mime-encwords = pm_mime_encwords +SPKG_DESC_CSWpm-mime-encwords = Deal with RFC 2047 encoded words (improved) +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-mime-encwords = 1 +RUNTIME_DEP_PKGS_CSWpm-mime-encwords += CSWpm-mime-charset -ARCHALL = 1 - include gar/category.mk Modified: csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums 2012-04-18 12:48:18 UTC (rev 17739) +++ csw/mgar/pkg/cpan/MIME-EncWords/trunk/checksums 2012-04-18 12:54:33 UTC (rev 17740) @@ -1 +1 @@ -aa0651a8a970d0fb35aa24b080ca6ee6 MIME-EncWords-1.012.tar.gz +d5df9098b315d92d43c025dd7aef939e MIME-EncWords-1.012.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 15:16:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:16:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17741] csw/mgar/pkg/cpan/Email-Valid/trunk Message-ID: Revision: 17741 http://gar.svn.sourceforge.net/gar/?rev=17741&view=rev Author: dmichelsen Date: 2012-04-18 13:16:57 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Email-Valid/trunk: Update to 0.190, sanitize package name, update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Valid/trunk/Makefile csw/mgar/pkg/cpan/Email-Valid/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.depend csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.gspec csw/mgar/pkg/cpan/Email-Valid/trunk/files/gar-base.diff csw/mgar/pkg/cpan/Email-Valid/trunk/files/mxcheck.diff Modified: csw/mgar/pkg/cpan/Email-Valid/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/Makefile 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/Makefile 2012-04-18 13:16:57 UTC (rev 17741) @@ -1,22 +1,21 @@ NAME = Email-Valid -VERSION = 0.15 +VERSION = 0.190 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = MAURICE +AUTHOR = RJBS -DESCRIPTION = check validity of Internet email addresses -define BLURB - This module determines whether an email address is well-formed, and - optionally, whether a mail host exists for the domain. Please note that - there is no way to determine whether an address is deliverable without - attempting delivery (for details, see perlfaq 9). -endef +DESCRIPTION = Check validity of Internet email addresses -DISTFILES += CSWpmemailvalid.gspec CSWpmemailvalid.depend +CATALOG_RELEASE = unstable -# Disable MX check test -PATCHFILES = mxcheck.diff +LICENSE = LICENSE -DEPENDS += cpan/MailTools +PACKAGES += CSWpm-email-valid +CATALOGNAME_CSWpm-email-valid = pm_email_valid +SPKG_DESC_CSWpm-email-valid = Check validity of Internet email addresses +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-email-valid = 1 +RUNTIME_DEP_PKGS_CSWpm-email-valid += CSWpmmailtools +RUNTIME_DEP_PKGS_CSWpm-email-valid += CSWpm-net-dns include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Valid/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/checksums 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/checksums 2012-04-18 13:16:57 UTC (rev 17741) @@ -1,4 +1 @@ -a44b28303fabe36e9bf11a578f32d6fd download/CSWpmemailvalid.gspec -075960b751d96b8f70279761092f53e8 download/CSWpmemailvalid.depend -371b1552b81b93ffbf89cf2b1c1376c5 download/Email-Valid-0.15.tar.gz -282d59a32c1283f8a33f96713ecc164b download/mxcheck.diff +79d62c686e651247ab6688aa7307a5b2 Email-Valid-0.190.tar.gz Deleted: csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.depend =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.depend 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.depend 2012-04-18 13:16:57 UTC (rev 17741) @@ -1 +0,0 @@ -P CSWpmmailtools pm_mailtools - various mail manipulation modules Deleted: csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.gspec =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.gspec 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/files/CSWpmemailvalid.gspec 2012-04-18 13:16:57 UTC (rev 17741) @@ -1,10 +0,0 @@ -%var bitname pm_emailvalid -%var pkgname CSWpmemailvalid -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1998-2003, Maurice Aubrey Emaurice at hevanet.comE. -All rights reserved. - -This module is free software; you may redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Email-Valid/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/files/gar-base.diff 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/files/gar-base.diff 2012-04-18 13:16:57 UTC (rev 17741) @@ -1,15 +0,0 @@ -diff --speed-large-files --minimal -Nru Email-Valid-0.14.orig/t/valid.t Email-Valid-0.14/t/valid.t ---- Email-Valid-0.14.orig/t/valid.t 2002-07-03 03:57:11.000000000 -0700 -+++ Email-Valid-0.14/t/valid.t 2003-08-17 16:35:30.767700000 -0700 -@@ -43,8 +43,10 @@ - $a = $v->address("fred&barney\@stonehenge(yup, the rock place).(that's dot)com"); - $a eq 'fred&barney at stonehenge.com' ? ok : not_ok; - --$v->address( -address => 'blort at aol.com', -- -mxcheck => 1) ? ok : not_ok; -+#$v->address( -address => 'blort at aol.com', -+# -mxcheck => 1) ? ok : not_ok; -+print "ok\n"; -+ - $v->address( -address => 'blort at notarealdomainfoo.com', - -mxcheck => 1) ? not_ok : ok; Deleted: csw/mgar/pkg/cpan/Email-Valid/trunk/files/mxcheck.diff =================================================================== --- csw/mgar/pkg/cpan/Email-Valid/trunk/files/mxcheck.diff 2012-04-18 12:54:33 UTC (rev 17740) +++ csw/mgar/pkg/cpan/Email-Valid/trunk/files/mxcheck.diff 2012-04-18 13:16:57 UTC (rev 17741) @@ -1,15 +0,0 @@ -diff --speed-large-files --minimal -Nru Email-Valid-0.14.orig/t/valid.t Email-Valid-0.14/t/valid.t ---- Email-Valid-0.14.orig/t/valid.t 2002-07-03 03:57:11.000000000 -0700 -+++ Email-Valid-0.14/t/valid.t 2003-08-17 16:35:30.767700000 -0700 -@@ -43,8 +43,10 @@ - $a = $v->address("fred&barney\@stonehenge(yup, the rock place).(that's dot)com"); - $a eq 'fred&barney at stonehenge.com' ? ok : not_ok; - --$v->address( -address => 'blort at aol.com', -- -mxcheck => 1) ? ok : not_ok; -+#$v->address( -address => 'blort at aol.com', -+# -mxcheck => 1) ? ok : not_ok; -+print "ok\n"; -+ - $v->address( -address => 'blort at notarealdomainfoo.com', - -mxcheck => 1) ? not_ok : ok; 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 Apr 18 15:26:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:26:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17742] csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile Message-ID: Revision: 17742 http://gar.svn.sourceforge.net/gar/?rev=17742&view=rev Author: dmichelsen Date: 2012-04-18 13:26:41 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Sub-Exporter/trunk: Sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile Modified: csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile 2012-04-18 13:16:57 UTC (rev 17741) +++ csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile 2012-04-18 13:26:41 UTC (rev 17742) @@ -8,13 +8,19 @@ define BLURB endef -PACKAGES = CSWpmsubexporter -CATALOGNAME = pm_subexporter +CATALOG_RELEASE = unstable -DEP_PKGS = CSWpmdataoptlist CSWpmsubinstall - LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-sub-exporter +CATALOGNAME_CSWpm-sub-exporter = pm_sub_exporter +SPKG_DESC_CSWpm-sub-exporter = A sophisticated exporter for custom-built routines +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-sub-exporter = 1 +RUNTIME_DEP_PKGS_CSWpm-sub-exporter += CSWpm-data-optlist +RUNTIME_DEP_PKGS_CSWpm-sub-exporter += CSWpm-params-util +RUNTIME_DEP_PKGS_CSWpm-sub-exporter += CSWpm-sub-install +OBSOLETED_BY_CSWpm-sub-exporter += CSWpmsubexporter +CATALOGNAME_CSWpmsubexporter = pm_subexporter_stub 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 Wed Apr 18 15:27:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17743] csw/mgar/pkg/cpan Message-ID: Revision: 17743 http://gar.svn.sourceforge.net/gar/?rev=17743&view=rev Author: dmichelsen Date: 2012-04-18 13:27:24 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Package-Stash-XS/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Package-Stash-XS/ csw/mgar/pkg/cpan/Package-Stash-XS/branches/ csw/mgar/pkg/cpan/Package-Stash-XS/tags/ csw/mgar/pkg/cpan/Package-Stash-XS/trunk/ csw/mgar/pkg/cpan/Package-Stash-XS/trunk/Makefile csw/mgar/pkg/cpan/Package-Stash-XS/trunk/checksums csw/mgar/pkg/cpan/Package-Stash-XS/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Package-Stash-XS/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Package-Stash-XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Package-Stash-XS/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Package-Stash-XS/trunk/Makefile 2012-04-18 13:27:24 UTC (rev 17743) @@ -0,0 +1,21 @@ +NAME = Package-Stash-XS +VERSION = 0.25 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DOY + +DESCRIPTION = Faster and more correct implementation of the Package::Stash API +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal + +PACKAGES += CSWpm-package-stash-xs +CATALOGNAME_CSWpm-package-stash-xs = pm_package_stash_xs +SPKG_DESC_CSWpm-package-stash-xs = Faster and more correct implementation of the Package::Stash API + +include gar/category.mk Added: csw/mgar/pkg/cpan/Package-Stash-XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Package-Stash-XS/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Package-Stash-XS/trunk/checksums 2012-04-18 13:27:24 UTC (rev 17743) @@ -0,0 +1 @@ +52ece18842c46da8fb7a4a14dea910ab Package-Stash-XS-0.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 15:28:01 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:28:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[17744] csw/mgar/pkg/cpan Message-ID: Revision: 17744 http://gar.svn.sourceforge.net/gar/?rev=17744&view=rev Author: dmichelsen Date: 2012-04-18 13:28:00 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Package-DeprecationManager/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Package-DeprecationManager/ csw/mgar/pkg/cpan/Package-DeprecationManager/branches/ csw/mgar/pkg/cpan/Package-DeprecationManager/tags/ csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/ csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/Makefile csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/checksums csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Package-DeprecationManager/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/Makefile 2012-04-18 13:28:00 UTC (rev 17744) @@ -0,0 +1,27 @@ +NAME = Package-DeprecationManager +VERSION = 0.13 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DROLSKY + +DESCRIPTION = Manage deprecation warnings for your distribution +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-package-deprecationmanager +CATALOGNAME_CSWpm-package-deprecationmanager = pm_package_deprecationmanager +SPKG_DESC_CSWpm-package-deprecationmanager = Manage deprecation warnings for your distribution +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-package-deprecationmanager = 1 +RUNTIME_DEP_PKGS_CSWpm-package-deprecationmanager += CSWpm-params-util +RUNTIME_DEP_PKGS_CSWpm-package-deprecationmanager += CSWpm-list-moreutils +RUNTIME_DEP_PKGS_CSWpm-package-deprecationmanager += CSWpm-sub-install + +include gar/category.mk Added: csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Package-DeprecationManager/trunk/checksums 2012-04-18 13:28:00 UTC (rev 17744) @@ -0,0 +1 @@ +f81ae3c0f9bcac048eb4bff348b79f67 Package-DeprecationManager-0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 15:30:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:30:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[17745] csw/mgar/pkg/cpan/Sub-Name/trunk Message-ID: Revision: 17745 http://gar.svn.sourceforge.net/gar/?rev=17745&view=rev Author: dmichelsen Date: 2012-04-18 13:30:02 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Sub-Name/trunk: Update to 0.05, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Sub-Name/trunk/Makefile csw/mgar/pkg/cpan/Sub-Name/trunk/checksums Modified: csw/mgar/pkg/cpan/Sub-Name/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Name/trunk/Makefile 2012-04-18 13:28:00 UTC (rev 17744) +++ csw/mgar/pkg/cpan/Sub-Name/trunk/Makefile 2012-04-18 13:30:02 UTC (rev 17745) @@ -1,17 +1,21 @@ NAME = Sub-Name -VERSION = 0.04 +VERSION = 0.05 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = XMATH +AUTHOR = FLORA DESCRIPTION = (re)name a sub define BLURB - Assigns a new name to referenced sub. If package specification is - omitted in the name, then the current package is used. The return value - is the sub. endef -PACKAGES = CSWpmsubname -CATALOGNAME = pm_subname +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the unknown license + +PACKAGES += CSWpm-sub-name +CATALOGNAME_CSWpm-sub-name = pm_sub_name +SPKG_DESC_CSWpm-sub-name = (re)name a sub +OBSOLETED_BY_CSWpm-sub-name += CSWpmsubname +CATALOGNAME_CSWpmsubname = pm_subname_stub + include gar/category.mk Modified: csw/mgar/pkg/cpan/Sub-Name/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Name/trunk/checksums 2012-04-18 13:28:00 UTC (rev 17744) +++ csw/mgar/pkg/cpan/Sub-Name/trunk/checksums 2012-04-18 13:30:02 UTC (rev 17745) @@ -1 +1 @@ -bde2bacba0c701f249135ada3c6cf699 download/Sub-Name-0.04.tar.gz +26077202597620e4a6068c8087f3e09f Sub-Name-0.05.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 15:32:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:32:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17746] csw/mgar/pkg/cpan/Module-Version/trunk/Makefile Message-ID: Revision: 17746 http://gar.svn.sourceforge.net/gar/?rev=17746&view=rev Author: dmichelsen Date: 2012-04-18 13:32:36 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Module-Version/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Version/trunk/Makefile Modified: csw/mgar/pkg/cpan/Module-Version/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Version/trunk/Makefile 2012-04-18 13:30:02 UTC (rev 17745) +++ csw/mgar/pkg/cpan/Module-Version/trunk/Makefile 2012-04-18 13:32:36 UTC (rev 17746) @@ -8,11 +8,14 @@ define BLURB endef -PACKAGES = CSWpm-module-version -CATALOGNAME = pm_module_version +CATALOG_RELEASE = unstable LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-module-version +CATALOGNAME_CSWpm-module-version = pm_module_version +SPKG_DESC_CSWpm-module-version = Get module versions +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-module-version = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 15:48:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 13:48:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17747] csw/mgar/pkg/cpan Message-ID: Revision: 17747 http://gar.svn.sourceforge.net/gar/?rev=17747&view=rev Author: dmichelsen Date: 2012-04-18 13:48:28 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Devel-GlobalDestruction/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Devel-GlobalDestruction/ csw/mgar/pkg/cpan/Devel-GlobalDestruction/branches/ csw/mgar/pkg/cpan/Devel-GlobalDestruction/tags/ csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/ csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/Makefile csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/checksums csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/Makefile 2012-04-18 13:48:28 UTC (rev 17747) @@ -0,0 +1,18 @@ +NAME = Devel-GlobalDestruction +VERSION = 0.04 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = FLORA + +DESCRIPTION = Expose the flag which marks global destruction + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the unknown license + +PACKAGES += CSWpm-devel-globaldestruction +CATALOGNAME_CSWpm-devel-globaldestruction = pm_devel_globaldestruction +SPKG_DESC_CSWpm-devel-globaldestruction = Expose the flag which marks global destruction +RUNTIME_DEP_PKGS_CSWpm-devel-globaldestruction += CSWpm-sub-exporter + +include gar/category.mk Added: csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Devel-GlobalDestruction/trunk/checksums 2012-04-18 13:48:28 UTC (rev 17747) @@ -0,0 +1 @@ +823ee705f0c1c59cbf73cbab5bdf08f7 Devel-GlobalDestruction-0.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:18:15 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:18:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17748] csw/mgar/pkg/cpan Message-ID: Revision: 17748 http://gar.svn.sourceforge.net/gar/?rev=17748&view=rev Author: dmichelsen Date: 2012-04-18 14:18:15 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Dist-CheckConflicts/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Dist-CheckConflicts/ csw/mgar/pkg/cpan/Dist-CheckConflicts/branches/ csw/mgar/pkg/cpan/Dist-CheckConflicts/tags/ csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/ csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/Makefile csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/checksums csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/Makefile 2012-04-18 14:18:15 UTC (rev 17748) @@ -0,0 +1,25 @@ +NAME = Dist-CheckConflicts +VERSION = 0.02 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DOY + +DESCRIPTION = Declare version conflicts for your dist +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal + +PACKAGES += CSWpm-dist-checkconflicts +CATALOGNAME_CSWpm-dist-checkconflicts = pm_dist_checkconflicts +SPKG_DESC_CSWpm-dist-checkconflicts = Declare version conflicts for your dist +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-dist-checkconflicts = 1 +RUNTIME_DEP_PKGS_CSWpm-dist-checkconflicts += CSWpm-sub-exporter +RUNTIME_DEP_PKGS_CSWpm-dist-checkconflicts += CSWpm-list-moreutils + +include gar/category.mk Added: csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Dist-CheckConflicts/trunk/checksums 2012-04-18 14:18:15 UTC (rev 17748) @@ -0,0 +1 @@ +64b8d342ba11336b2969c274a60bbc5f Dist-CheckConflicts-0.02.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:32:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17749] csw/mgar/pkg/cpan Message-ID: Revision: 17749 http://gar.svn.sourceforge.net/gar/?rev=17749&view=rev Author: dmichelsen Date: 2012-04-18 14:32:37 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Algorithm-C3/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Algorithm-C3/ csw/mgar/pkg/cpan/Algorithm-C3/branches/ csw/mgar/pkg/cpan/Algorithm-C3/tags/ csw/mgar/pkg/cpan/Algorithm-C3/trunk/ csw/mgar/pkg/cpan/Algorithm-C3/trunk/Makefile csw/mgar/pkg/cpan/Algorithm-C3/trunk/checksums csw/mgar/pkg/cpan/Algorithm-C3/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Algorithm-C3/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Algorithm-C3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Algorithm-C3/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Algorithm-C3/trunk/Makefile 2012-04-18 14:32:37 UTC (rev 17749) @@ -0,0 +1,26 @@ +NAME = Algorithm-C3 +VERSION = 0.08 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = FLORA + +DESCRIPTION = A module for merging hierarchies using the C3 algorithm +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-algorithm-c3 +CATALOGNAME_CSWpm-algorithm-c3 = pm_algorithm_c3 +SPKG_DESC_CSWpm-algorithm-c3 = A module for merging hierarchies using the C3 algorithm +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-algorithm-c3 = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Algorithm-C3/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Algorithm-C3/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Algorithm-C3/trunk/checksums 2012-04-18 14:32:37 UTC (rev 17749) @@ -0,0 +1 @@ +07afb08682125c875b80c315d99f6f95 Algorithm-C3-0.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:36:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17750] csw/mgar/pkg/cpan Message-ID: Revision: 17750 http://gar.svn.sourceforge.net/gar/?rev=17750&view=rev Author: dmichelsen Date: 2012-04-18 14:36:16 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Class-C3/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-C3/ csw/mgar/pkg/cpan/Class-C3/branches/ csw/mgar/pkg/cpan/Class-C3/tags/ csw/mgar/pkg/cpan/Class-C3/trunk/ csw/mgar/pkg/cpan/Class-C3/trunk/Makefile csw/mgar/pkg/cpan/Class-C3/trunk/checksums csw/mgar/pkg/cpan/Class-C3/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-C3/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Class-C3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-C3/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-C3/trunk/Makefile 2012-04-18 14:36:16 UTC (rev 17750) @@ -0,0 +1,22 @@ +NAME = Class-C3 +VERSION = 0.23 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = FLORA + +DESCRIPTION = A pragma to use the C3 method resolution order algortihm +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-class-c3 +CATALOGNAME_CSWpm-class-c3 = pm_class_c3 +SPKG_DESC_CSWpm-class-c3 = A pragma to use the C3 method resolution order algortihm +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-c3 = 1 +RUNTIME_DEP_PKGS_CSWpm-class-c3 += CSWpm-algorithm-c3 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-C3/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-C3/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-C3/trunk/checksums 2012-04-18 14:36:16 UTC (rev 17750) @@ -0,0 +1 @@ +5b997841af85a5f8ed8add7120d56611 Class-C3-0.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:41:38 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17751] csw/mgar/pkg/cpan Message-ID: Revision: 17751 http://gar.svn.sourceforge.net/gar/?rev=17751&view=rev Author: dmichelsen Date: 2012-04-18 14:41:37 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/MRO-Compat/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/MRO-Compat/ csw/mgar/pkg/cpan/MRO-Compat/branches/ csw/mgar/pkg/cpan/MRO-Compat/tags/ csw/mgar/pkg/cpan/MRO-Compat/trunk/ csw/mgar/pkg/cpan/MRO-Compat/trunk/Makefile csw/mgar/pkg/cpan/MRO-Compat/trunk/checksums csw/mgar/pkg/cpan/MRO-Compat/trunk/files/ Property changes on: csw/mgar/pkg/cpan/MRO-Compat/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/MRO-Compat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MRO-Compat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/MRO-Compat/trunk/Makefile 2012-04-18 14:41:37 UTC (rev 17751) @@ -0,0 +1,22 @@ +NAME = MRO-Compat +VERSION = 0.11 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = FLORA + +DESCRIPTION = Mro::* interface compatibility for Perls < 5.9.5 +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-mro-compat +CATALOGNAME_CSWpm-mro-compat = pm_mro_compat +SPKG_DESC_CSWpm-mro-compat = Mro::* interface compatibility for Perls < 5.9.5 +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-mro-compat = 1 +RUNTIME_DEP_PKGS_CSWpm-mro-compat += CSWpm-class-c3 + +include gar/category.mk Added: csw/mgar/pkg/cpan/MRO-Compat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MRO-Compat/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/MRO-Compat/trunk/checksums 2012-04-18 14:41:37 UTC (rev 17751) @@ -0,0 +1 @@ +462b68631d5bef8c807190f1c5c17306 MRO-Compat-0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:46:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17752] csw/mgar/pkg/cpan Message-ID: Revision: 17752 http://gar.svn.sourceforge.net/gar/?rev=17752&view=rev Author: dmichelsen Date: 2012-04-18 14:46:07 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Eval-Closure/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Eval-Closure/ csw/mgar/pkg/cpan/Eval-Closure/branches/ csw/mgar/pkg/cpan/Eval-Closure/tags/ csw/mgar/pkg/cpan/Eval-Closure/trunk/ csw/mgar/pkg/cpan/Eval-Closure/trunk/Makefile csw/mgar/pkg/cpan/Eval-Closure/trunk/checksums csw/mgar/pkg/cpan/Eval-Closure/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Eval-Closure/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Eval-Closure/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Eval-Closure/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Eval-Closure/trunk/Makefile 2012-04-18 14:46:07 UTC (rev 17752) @@ -0,0 +1,26 @@ +NAME = Eval-Closure +VERSION = 0.08 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DOY + +DESCRIPTION = Safely and cleanly create closures via string eval +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-eval-closure +CATALOGNAME_CSWpm-eval-closure = pm_eval_closure +SPKG_DESC_CSWpm-eval-closure = Safely and cleanly create closures via string eval +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-eval-closure = 1 +RUNTIME_DEP_PKGS_CSWpm-eval-closure += CSWpm-sub-exporter +RUNTIME_DEP_PKGS_CSWpm-eval-closure += CSWpm-try-tiny + +include gar/category.mk Added: csw/mgar/pkg/cpan/Eval-Closure/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Eval-Closure/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Eval-Closure/trunk/checksums 2012-04-18 14:46:07 UTC (rev 17752) @@ -0,0 +1 @@ +c2af8abc363fc9a039731be9ecf2985c Eval-Closure-0.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:46:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:46:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17753] csw/mgar/pkg/cpan Message-ID: Revision: 17753 http://gar.svn.sourceforge.net/gar/?rev=17753&view=rev Author: dmichelsen Date: 2012-04-18 14:46:56 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Module-Runtime/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Module-Runtime/ csw/mgar/pkg/cpan/Module-Runtime/branches/ csw/mgar/pkg/cpan/Module-Runtime/tags/ csw/mgar/pkg/cpan/Module-Runtime/trunk/ csw/mgar/pkg/cpan/Module-Runtime/trunk/Makefile csw/mgar/pkg/cpan/Module-Runtime/trunk/checksums csw/mgar/pkg/cpan/Module-Runtime/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Module-Runtime/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Module-Runtime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Runtime/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Module-Runtime/trunk/Makefile 2012-04-18 14:46:56 UTC (rev 17753) @@ -0,0 +1,26 @@ +NAME = Module-Runtime +VERSION = 0.013 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = ZEFRAM + +DESCRIPTION = Runtime module handling +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/ + +PACKAGES += CSWpm-module-runtime +CATALOGNAME_CSWpm-module-runtime = pm_module_runtime +SPKG_DESC_CSWpm-module-runtime = Runtime module handling +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-module-runtime = 1 + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Module-Runtime/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Runtime/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Module-Runtime/trunk/checksums 2012-04-18 14:46:56 UTC (rev 17753) @@ -0,0 +1 @@ +62b88b1f5f0e975a5d7c80cd46167b97 Module-Runtime-0.013.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:50:33 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:50:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[17754] csw/mgar/pkg/cpan Message-ID: Revision: 17754 http://gar.svn.sourceforge.net/gar/?rev=17754&view=rev Author: dmichelsen Date: 2012-04-18 14:50:33 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Package-Stash/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Package-Stash/ csw/mgar/pkg/cpan/Package-Stash/branches/ csw/mgar/pkg/cpan/Package-Stash/tags/ csw/mgar/pkg/cpan/Package-Stash/trunk/ csw/mgar/pkg/cpan/Package-Stash/trunk/Makefile csw/mgar/pkg/cpan/Package-Stash/trunk/checksums csw/mgar/pkg/cpan/Package-Stash/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Package-Stash/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Package-Stash/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Package-Stash/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Package-Stash/trunk/Makefile 2012-04-18 14:50:33 UTC (rev 17754) @@ -0,0 +1,26 @@ +NAME = Package-Stash +VERSION = 0.33 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DOY + +DESCRIPTION = Routines for manipulating stashes +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-package-stash +CATALOGNAME_CSWpm-package-stash = pm_package_stash +SPKG_DESC_CSWpm-package-stash = Routines for manipulating stashes +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-package-stash = 1 +RUNTIME_DEP_PKGS_CSWpm-package-stash += CSWpm-dist-checkconflicts +RUNTIME_DEP_PKGS_CSWpm-package-stash += CSWpm-package-deprecationmanager + +include gar/category.mk Added: csw/mgar/pkg/cpan/Package-Stash/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Package-Stash/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Package-Stash/trunk/checksums 2012-04-18 14:50:33 UTC (rev 17754) @@ -0,0 +1 @@ +fe1f6efa0dbd46f8520903b436f185f1 Package-Stash-0.33.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 16:51:07 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 14:51:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17755] csw/mgar/pkg/cpan Message-ID: Revision: 17755 http://gar.svn.sourceforge.net/gar/?rev=17755&view=rev Author: dmichelsen Date: 2012-04-18 14:51:07 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Module-Implementation/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Module-Implementation/ csw/mgar/pkg/cpan/Module-Implementation/branches/ csw/mgar/pkg/cpan/Module-Implementation/tags/ csw/mgar/pkg/cpan/Module-Implementation/trunk/ csw/mgar/pkg/cpan/Module-Implementation/trunk/Makefile csw/mgar/pkg/cpan/Module-Implementation/trunk/checksums csw/mgar/pkg/cpan/Module-Implementation/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Module-Implementation/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Module-Implementation/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Implementation/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Module-Implementation/trunk/Makefile 2012-04-18 14:51:07 UTC (rev 17755) @@ -0,0 +1,26 @@ +NAME = Module-Implementation +VERSION = 0.06 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DROLSKY + +DESCRIPTION = Loads one of several alternate underlying implementations for a module +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-module-implementation +CATALOGNAME_CSWpm-module-implementation = pm_module_implementation +SPKG_DESC_CSWpm-module-implementation = Loads one of several alternate underlying implementations for a module +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-module-implementation = 1 +RUNTIME_DEP_PKGS_CSWpm-module-implementation += CSWpm-try-tiny +RUNTIME_DEP_PKGS_CSWpm-module-implementation += CSWpm-module-runtime + +include gar/category.mk Added: csw/mgar/pkg/cpan/Module-Implementation/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Implementation/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Module-Implementation/trunk/checksums 2012-04-18 14:51:07 UTC (rev 17755) @@ -0,0 +1 @@ +748f3540162fc52222d761fab3efb266 Module-Implementation-0.06.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 17:01:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 15:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17756] csw/mgar/pkg/cpan Message-ID: Revision: 17756 http://gar.svn.sourceforge.net/gar/?rev=17756&view=rev Author: dmichelsen Date: 2012-04-18 15:01:42 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Class-Load/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-Load/ csw/mgar/pkg/cpan/Class-Load/branches/ csw/mgar/pkg/cpan/Class-Load/tags/ csw/mgar/pkg/cpan/Class-Load/trunk/ csw/mgar/pkg/cpan/Class-Load/trunk/Makefile csw/mgar/pkg/cpan/Class-Load/trunk/checksums csw/mgar/pkg/cpan/Class-Load/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Load/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Class-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Load/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Load/trunk/Makefile 2012-04-18 15:01:42 UTC (rev 17756) @@ -0,0 +1,29 @@ +NAME = Class-Load +VERSION = 0.19 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DOY + +DESCRIPTION = A working (require "Class::Name") and more +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-class-load +CATALOGNAME_CSWpm-class-load = pm_class_load +SPKG_DESC_CSWpm-class-load = A working (require "Class::Name") and more +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-class-load = 1 +RUNTIME_DEP_PKGS_CSWpm-class-load += CSWpm-module-implementation +RUNTIME_DEP_PKGS_CSWpm-class-load += CSWpm-try-tiny +RUNTIME_DEP_PKGS_CSWpm-class-load += CSWpm-data-optlist +RUNTIME_DEP_PKGS_CSWpm-class-load += CSWpm-package-stash +RUNTIME_DEP_PKGS_CSWpm-class-load += CSWpm-module-runtime + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Load/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Load/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Load/trunk/checksums 2012-04-18 15:01:42 UTC (rev 17756) @@ -0,0 +1 @@ +1a81421fda749d36952e7ada7876bcc7 Class-Load-0.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 17:49:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 15:49:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17757] csw/mgar/pkg/cpan Message-ID: Revision: 17757 http://gar.svn.sourceforge.net/gar/?rev=17757&view=rev Author: dmichelsen Date: 2012-04-18 15:49:00 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/CPAN-Meta-YAML/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/CPAN-Meta-YAML/ csw/mgar/pkg/cpan/CPAN-Meta-YAML/branches/ csw/mgar/pkg/cpan/CPAN-Meta-YAML/tags/ csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/ csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/Makefile csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/checksums csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/files/ Property changes on: csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/Makefile 2012-04-18 15:49:00 UTC (rev 17757) @@ -0,0 +1,21 @@ +NAME = CPAN-Meta-YAML +VERSION = 0.008 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DAGOLDEN + +DESCRIPTION = Read and write a subset of YAML for CPAN Meta files +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-cpan-meta-yaml +CATALOGNAME_CSWpm-cpan-meta-yaml = pm_cpan_meta_yaml +SPKG_DESC_CSWpm-cpan-meta-yaml = Read and write a subset of YAML for CPAN Meta files +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-cpan-meta-yaml = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta-YAML/trunk/checksums 2012-04-18 15:49:00 UTC (rev 17757) @@ -0,0 +1 @@ +06211d8492f23c68aadb83670451284d CPAN-Meta-YAML-0.008.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 17:50:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 15:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[17758] csw/mgar/pkg/cpan Message-ID: Revision: 17758 http://gar.svn.sourceforge.net/gar/?rev=17758&view=rev Author: dmichelsen Date: 2012-04-18 15:50:49 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Module-Metadata/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Module-Metadata/ csw/mgar/pkg/cpan/Module-Metadata/branches/ csw/mgar/pkg/cpan/Module-Metadata/tags/ csw/mgar/pkg/cpan/Module-Metadata/trunk/ csw/mgar/pkg/cpan/Module-Metadata/trunk/Makefile csw/mgar/pkg/cpan/Module-Metadata/trunk/checksums csw/mgar/pkg/cpan/Module-Metadata/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Module-Metadata/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Module-Metadata/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Metadata/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Module-Metadata/trunk/Makefile 2012-04-18 15:50:49 UTC (rev 17758) @@ -0,0 +1,21 @@ +NAME = Module-Metadata +VERSION = 1.000009 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DAGOLDEN + +DESCRIPTION = Gather package and POD information from perl module files +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-module-metadata +CATALOGNAME_CSWpm-module-metadata = pm_module_metadata +SPKG_DESC_CSWpm-module-metadata = Gather package and POD information from perl module files +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-module-metadata = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Module-Metadata/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Metadata/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Module-Metadata/trunk/checksums 2012-04-18 15:50:49 UTC (rev 17758) @@ -0,0 +1 @@ +9669dd618585de6832368043bc8c59b5 Module-Metadata-1.000009.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 17:53:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 15:53:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17759] csw/mgar/pkg/cpan Message-ID: Revision: 17759 http://gar.svn.sourceforge.net/gar/?rev=17759&view=rev Author: dmichelsen Date: 2012-04-18 15:53:26 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/JSON-PP/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/JSON-PP/ csw/mgar/pkg/cpan/JSON-PP/branches/ csw/mgar/pkg/cpan/JSON-PP/tags/ csw/mgar/pkg/cpan/JSON-PP/trunk/ csw/mgar/pkg/cpan/JSON-PP/trunk/Makefile csw/mgar/pkg/cpan/JSON-PP/trunk/checksums csw/mgar/pkg/cpan/JSON-PP/trunk/files/ Property changes on: csw/mgar/pkg/cpan/JSON-PP/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/JSON-PP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON-PP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/JSON-PP/trunk/Makefile 2012-04-18 15:53:26 UTC (rev 17759) @@ -0,0 +1,21 @@ +NAME = JSON-PP +VERSION = 2.27200 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = MAKAMAKA + +DESCRIPTION = JSON::XS compatible pure-Perl module +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-json-pp +CATALOGNAME_CSWpm-json-pp = pm_json_pp +SPKG_DESC_CSWpm-json-pp = JSON::XS compatible pure-Perl module +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-json-pp = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/JSON-PP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON-PP/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/JSON-PP/trunk/checksums 2012-04-18 15:53:26 UTC (rev 17759) @@ -0,0 +1 @@ +1894d25f577ebbdb5af4b0c4f53a9cba JSON-PP-2.27200.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 17:54:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 15:54:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17760] csw/mgar/pkg/cpan Message-ID: Revision: 17760 http://gar.svn.sourceforge.net/gar/?rev=17760&view=rev Author: dmichelsen Date: 2012-04-18 15:54:37 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/CPAN-Meta-Requirements/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/CPAN-Meta-Requirements/ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/branches/ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/tags/ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/Makefile csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/checksums csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/files/ Property changes on: csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/Makefile 2012-04-18 15:54:37 UTC (rev 17760) @@ -0,0 +1,21 @@ +NAME = CPAN-Meta-Requirements +VERSION = 2.121 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DAGOLDEN + +DESCRIPTION = A set of version requirements for a CPAN dist +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-cpan-meta-requirements +CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_requirements +SPKG_DESC_CSWpm-cpan-meta-requirements = A set of version requirements for a CPAN dist +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-cpan-meta-requirements = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta-Requirements/trunk/checksums 2012-04-18 15:54:37 UTC (rev 17760) @@ -0,0 +1 @@ +fc94d5b112e9e18aa0348ee9e659dbf2 CPAN-Meta-Requirements-2.121.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 18:07:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 16:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17761] csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk Message-ID: Revision: 17761 http://gar.svn.sourceforge.net/gar/?rev=17761&view=rev Author: dmichelsen Date: 2012-04-18 16:07:05 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Parse-CPAN-Meta/trunk: Update to 1.4404, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/Makefile csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/Makefile 2012-04-18 15:54:37 UTC (rev 17760) +++ csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/Makefile 2012-04-18 16:07:05 UTC (rev 17761) @@ -1,22 +1,26 @@ NAME = Parse-CPAN-Meta -VERSION = 1.40 +VERSION = 1.4404 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = SMUELLER +AUTHOR = DAGOLDEN -DESCRIPTION = Parse META.yml and other similar CPAN metadata files +DESCRIPTION = Parse META.yml and META.json CPAN metadata files define BLURB - Long description endef -PACKAGES = CSWpmparsecpanmeta -CATALOGNAME = pm_parsecpanmeta -ARCHALL = 1 +CATALOG_RELEASE = unstable +LICENSE_TEXT = This module is licensed under the perl license + +PACKAGES += CSWpm-parse-cpan-meta +CATALOGNAME_CSWpm-parse-cpan-meta = pm_parse_cpan_meta +SPKG_DESC_CSWpm-parse-cpan-meta = Parse META.yml and META.json CPAN metadata files +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-parse-cpan-meta = 1 +RUNTIME_DEP_PKGS_CSWpm-parse-cpan-meta += CSWpm-cpan-meta-yaml +RUNTIME_DEP_PKGS_CSWpm-parse-cpan-meta += CSWpm-json-pp + +# This is ok, we are overwriting the default Perl module +CHECKPKG_OVERRIDES_CSWpm-parse-cpan-meta += file-collision|/opt/csw/share/man/man3/Parse::CPAN::Meta.3perl|CSWperldoc|CSWpm-parse-cpan-meta + include gar/category.mk - -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/checksums 2012-04-18 15:54:37 UTC (rev 17760) +++ csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/checksums 2012-04-18 16:07:05 UTC (rev 17761) @@ -1 +1 @@ -13038b57d3f253f8851323ba9db0b1a1 download/Parse-CPAN-Meta-1.40.tar.gz +5fd0e1b3dac224ad647953f97f2c568f Parse-CPAN-Meta-1.4404.tar.gz Deleted: csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/files/changelog.CSW 2012-04-18 15:54:37 UTC (rev 17760) +++ csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/files/changelog.CSW 2012-04-18 16:07:05 UTC (rev 17761) @@ -1,5 +0,0 @@ -pm_parsecpanmeta (1.40,REV=2009.08.08) - - * Initial release. - - -- Sebastian Kayser Sat, 8 Aug 2009 03:27:15 +0200 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 Apr 18 18:13:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 16:13:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[17762] csw/mgar/pkg/cpan Message-ID: Revision: 17762 http://gar.svn.sourceforge.net/gar/?rev=17762&view=rev Author: dmichelsen Date: 2012-04-18 16:13:28 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/CPAN-Meta/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/CPAN-Meta/ csw/mgar/pkg/cpan/CPAN-Meta/branches/ csw/mgar/pkg/cpan/CPAN-Meta/tags/ csw/mgar/pkg/cpan/CPAN-Meta/trunk/ csw/mgar/pkg/cpan/CPAN-Meta/trunk/Makefile csw/mgar/pkg/cpan/CPAN-Meta/trunk/checksums csw/mgar/pkg/cpan/CPAN-Meta/trunk/files/ Property changes on: csw/mgar/pkg/cpan/CPAN-Meta/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/CPAN-Meta/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta/trunk/Makefile 2012-04-18 16:13:28 UTC (rev 17762) @@ -0,0 +1,24 @@ +NAME = CPAN-Meta +VERSION = 2.120921 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DAGOLDEN + +DESCRIPTION = The distribution metadata for a CPAN dist +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-cpan-meta +CATALOGNAME_CSWpm-cpan-meta = pm_cpan_meta +SPKG_DESC_CSWpm-cpan-meta = The distribution metadata for a CPAN dist +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-cpan-meta = 1 +RUNTIME_DEP_PKGS_CSWpm-cpan-meta += CSWpm-cpan-meta-yaml +RUNTIME_DEP_PKGS_CSWpm-cpan-meta += CSWpm-json-pp +RUNTIME_DEP_PKGS_CSWpm-cpan-meta += CSWpm-cpan-meta-requirements + +include gar/category.mk Added: csw/mgar/pkg/cpan/CPAN-Meta/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CPAN-Meta/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/CPAN-Meta/trunk/checksums 2012-04-18 16:13:28 UTC (rev 17762) @@ -0,0 +1 @@ +83d00ee341ca2a6d8d5e5f9d4bd9d41e CPAN-Meta-2.120921.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 18:35:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 16:35:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17763] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 17763 http://gar.svn.sourceforge.net/gar/?rev=17763&view=rev Author: dmichelsen Date: 2012-04-18 16:35:54 +0000 (Wed, 18 Apr 2012) Log Message: ----------- mGAR v2: Prefer files in diverging prefixes when used, add support for Solaris 11 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-04-18 16:13:28 UTC (rev 17762) +++ csw/mgar/gar/v2/gar.conf.mk 2012-04-18 16:35:54 UTC (rev 17763) @@ -160,6 +160,8 @@ sbinpath ?= $(abspath $(sbinpath_install)/$(MM_BINDIR)) libpath_install ?= $(BUILD_PREFIX)/lib libpath ?= $(abspath $(libpath_install)/$(MM_LIBDIR)) +includepath_install ?= $(BUILD_PREFIX)/include +includepath ?= $(BUILD_PREFIX)/include # DESTDIR is used at INSTALL TIME ONLY to determine what the # filesystem root should be. @@ -457,12 +459,16 @@ # Raise these in your .garrc if needed ISA_DEFAULT_sparc-5.9 ?= sparcv8 ISA_DEFAULT_sparc-5.10 ?= sparcv8plus +ISA_DEFAULT_sparc-5.11 ?= sparcv8plus ISA_DEFAULT_i386-5.9 ?= i386 ISA_DEFAULT_i386-5.10 ?= pentium_pro +ISA_DEFAULT_i386-5.11 ?= pentium_pro ISA_DEFAULT64_sparc-5.9 ?= sparcv9 ISA_DEFAULT64_sparc-5.10 ?= sparcv9 +ISA_DEFAULT64_sparc-5.11 ?= sparcv9 ISA_DEFAULT64_i386-5.9 ?= amd64 ISA_DEFAULT64_i386-5.10 ?= amd64 +ISA_DEFAULT64_i386-5.11 ?= amd64 ISA_DEFAULT_sparc ?= $(ISA_DEFAULT_sparc-$(GAROSREL)) ISA_DEFAULT_i386 ?= $(ISA_DEFAULT_i386-$(GAROSREL)) @@ -586,7 +592,9 @@ SOS12U2_AS_FLAGS ?= $(EXTRA_SOS12U2_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12U3_AS_FLAGS ?= $(EXTRA_SOS12U3_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) - GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) + GCC3_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath,$(abspath $(GCC3_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) + GCC4_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath),$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) @@ -647,7 +655,7 @@ # ifeq ($(origin INCLUDE_FLAGS), undefined) -INCLUDE_FLAGS = $(foreach EINC,$(EXTRA_INC) $(abspath $(includedir)),-I$(EINC)) +INCLUDE_FLAGS = $(foreach EINC,$(EXTRA_INC) $(filter-out $(includepath),$(includedir)) $(includepath),-I$(EINC)) # DESTDIR is an old concept, disable for now #INCLUDE_FLAGS += $(if $(IGNORE_DESTDIR),,-I$(abspath $(DESTDIR)$(includedir))) endif @@ -699,8 +707,8 @@ FFLAGS ?= $(strip $($(GARCOMPILER)_FFLAGS) $(_CATEGORY_FFLAGS) $(EXTRA_FFLAGS)) FCFLAGS ?= $(strip $($(GARCOMPILER)_FCFLAGS) $(_CATEGORY_FCFLAGS) $(EXTRA_FCFLAGS)) -GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) -GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +GCC3_LD_OPTIONS = $(foreach D,$(filter-out $(libpath),$(abspath $(GCC3_CC_HOME)/lib/$(MM_LIBDIR))),-R$D) $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +GCC4_LD_OPTIONS = $(foreach D,$(filter-out $(libpath),$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR))),-R$D) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) @@ -716,7 +724,7 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin # This is for foo-config chaos -PKG_CONFIG_DIRS ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_DIRS ?= $(EXTRA_PKG_CONFIG_DIRS) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) ifneq (,$(findstring $(origin PKG_CONFIG_PATH),undefined environment)) PKG_CONFIG_PATH = $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH) $(EXTRA_PKG_CONFIG_PATH)) endif @@ -903,4 +911,6 @@ echo " LDFLAGS = $(LDFLAGS)"; \ echo " LD_OPTIONS = $(LD_OPTIONS)"; \ echo " ASFLAGS = $(ASFLAGS)"; \ - echo " OPTFLAGS = $(OPTFLAGS)" + echo " OPTFLAGS = $(OPTFLAGS)"; \ + echo " Merge Scripts: $(MERGE_SCRIPTS)"; \ + echo " Merge Targets: $(MERGE_TARGETS)" 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 Apr 18 18:38:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 16:38:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17764] csw/mgar/pkg/cpan/Module-Build/trunk Message-ID: Revision: 17764 http://gar.svn.sourceforge.net/gar/?rev=17764&view=rev Author: dmichelsen Date: 2012-04-18 16:38:46 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Module-Build/trunk: Update to 0.40 and move to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile csw/mgar/pkg/cpan/Module-Build/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Build/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2012-04-18 16:35:54 UTC (rev 17763) +++ csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2012-04-18 16:38:46 UTC (rev 17764) @@ -1,28 +1,33 @@ NAME = Module-Build -VERSION = stub +VERSION = 0.40 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = EWILHELM +AUTHOR = LEONT -DESCRIPTION = Stub to the Perl build-in module Module::Build +DESCRIPTION = Build and install Perl modules define BLURB endef -MODDIST = +CATALOG_RELEASE = unstable -PACKAGES = CSWpmmodulebuild -CATALOGNAME = pm_modulebuild +LICENSE = LICENSE -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = -INSTALL_SCRIPTS = +BUILD_DEP_PKGS += CSWpm-cpan-meta-yaml -ARCHALL = 1 +PACKAGES += CSWpm-module-build +CATALOGNAME_CSWpm-module-build = pm_module_build +SPKG_DESC_CSWpm-module-build = Build and install Perl modules +ARCHALL_CSWpm-module-build = 1 +RUNTIME_DEP_PKGS_CSWpm-module-build += CSWpm-perl-ostype +RUNTIME_DEP_PKGS_CSWpm-module-build += CSWpm-cpan-meta +RUNTIME_DEP_PKGS_CSWpm-module-build += CSWpm-module-metadata -# This package is completely empty, so it hasn't got any files -# and no license either. -CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none -CHECKPKG_OVERRIDES += license-missing +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build +# We have a ton of collisions with CSWperl, this is intended. +CHECKPKG_OVERRIDES_CSWpm-module-build += file-collision + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Build/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Build/trunk/checksums 2012-04-18 16:35:54 UTC (rev 17763) +++ csw/mgar/pkg/cpan/Module-Build/trunk/checksums 2012-04-18 16:38:46 UTC (rev 17764) @@ -0,0 +1 @@ +7ef4a7d968cbcd2ab7286b834f885142 Module-Build-0.40.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 18:43:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 16:43:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17765] csw/mgar/pkg/cpan Message-ID: Revision: 17765 http://gar.svn.sourceforge.net/gar/?rev=17765&view=rev Author: dmichelsen Date: 2012-04-18 16:43:55 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Class-Load-XS/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-Load-XS/ csw/mgar/pkg/cpan/Class-Load-XS/branches/ csw/mgar/pkg/cpan/Class-Load-XS/tags/ csw/mgar/pkg/cpan/Class-Load-XS/trunk/ csw/mgar/pkg/cpan/Class-Load-XS/trunk/Makefile csw/mgar/pkg/cpan/Class-Load-XS/trunk/checksums csw/mgar/pkg/cpan/Class-Load-XS/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Load-XS/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Class-Load-XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Load-XS/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Load-XS/trunk/Makefile 2012-04-18 16:43:55 UTC (rev 17765) @@ -0,0 +1,33 @@ +NAME = Class-Load-XS +VERSION = 0.04 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DROLSKY + +DESCRIPTION = XS implementation of parts of Class::Load +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +# This is also in CSWperl, but we need a newer version +BUILD_DEP_PKGS += CSWpm-module-build + +BUILD_DEP_PKGS += CSWpm-module-implementation +BUILD_DEP_PKGS += CSWpm-test-fatal +BUILD_DEP_PKGS += CSWpm-class-load +BUILD_DEP_PKGS += CSWpm-test-requires + +PACKAGES += CSWpm-class-load-xs +CATALOGNAME_CSWpm-class-load-xs = pm_class_load_xs +SPKG_DESC_CSWpm-class-load-xs = XS implementation of parts of Class::Load +RUNTIME_DEP_PKGS_CSWpm-class-load-xs += CSWpm-class-load + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Load-XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Load-XS/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Load-XS/trunk/checksums 2012-04-18 16:43:55 UTC (rev 17765) @@ -0,0 +1 @@ +f805304cb330591651c443397c23e60a Class-Load-XS-0.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 18 20:57:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 18:57:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17766] csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile Message-ID: Revision: 17766 http://gar.svn.sourceforge.net/gar/?rev=17766&view=rev Author: dmichelsen Date: 2012-04-18 18:57:17 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Mail-Sender/trunk: Update to makemake and sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile 2012-04-18 16:43:55 UTC (rev 17765) +++ csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile 2012-04-18 18:57:17 UTC (rev 17766) @@ -4,19 +4,19 @@ GARTYPE = v2 AUTHOR = JENDA -DESCRIPTION = Module for sending mails with attachments through an SMTP server +DESCRIPTION = Send mails with attachments through a SMTP server, socket()s based define BLURB endef -DISTFILES = COPYING -PATCHFILES = 0001-Don-t-ask-questions.patch +CATALOG_RELEASE = unstable -PACKAGES = CSWpmmailsender -CATALOGNAME = pm_mailsender +LICENSE_TEXT = This module is licensed under the Perl license -DEP_PKGS = CSWpmfileremove CSWpmiostringy CSWpmtimedate CSWpmdigesthmac CSWpmmailtools CSWpmuri CSWpmmimetypes +PACKAGES += CSWpm-mail-sender +CATALOGNAME_CSWpm-mail-sender = pm_mail_sender +SPKG_DESC_CSWpm-mail-sender = Send mails with attachments through a SMTP server, socket()s based +ARCHALL_CSWpm-mail-sender = 1 +OBSOLETED_BY_CSWpm-mail-sender += CSWpmmailsender +CATALOGNAME_CSWpmmailsender = pm_mailsender_stub -ARCHALL = 1 - 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 Wed Apr 18 22:21:03 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Apr 2012 20:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17767] csw/mgar/pkg/cpan/Log-Log4perl/trunk Message-ID: Revision: 17767 http://gar.svn.sourceforge.net/gar/?rev=17767&view=rev Author: dmichelsen Date: 2012-04-18 20:21:03 +0000 (Wed, 18 Apr 2012) Log Message: ----------- cpan/Log-Log4perl/trunk: Update t 1.36, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2012-04-18 18:57:17 UTC (rev 17766) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile 2012-04-18 20:21:03 UTC (rev 17767) @@ -1,22 +1,22 @@ NAME = Log-Log4perl -VERSION = 1.32 +VERSION = 1.36 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MSCHILLI DESCRIPTION = Log4j implementation for Perl define BLURB - Log::Log4perl lets you remote-control and fine-tune the logging behaviour of - your system from the outside. It implements the widely popular (Java-based) - Log4j logging package in pure Perl. endef +CATALOG_RELEASE = unstable + LICENSE = LICENSE PACKAGES += CSWpm-log-log4perl -CATALOGNAME = pm_log_log4perl +CATALOGNAME_CSWpm-log-log4perl = pm_log_log4perl SPKG_DESC_CSWpm-log-log4perl = Log4j implementation for Perl ARCHALL_CSWpm-log-log4perl = 1 -OBSOLETED_BY_CSWpm-log-log4perl = CSWpmlog4perl +OBSOLETED_BY_CSWpm-log-log4perl += CSWpmlog4perl +CATALOGNAME_CSWpmlog4perl = pm_log4perl_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2012-04-18 18:57:17 UTC (rev 17766) +++ csw/mgar/pkg/cpan/Log-Log4perl/trunk/checksums 2012-04-18 20:21:03 UTC (rev 17767) @@ -1 +1 @@ -a92ef7387e46923c14dc2020a00125ad Log-Log4perl-1.32.tar.gz +ae6a51735b0b0e6661d2e66d30d91fa5 Log-Log4perl-1.36.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Apr 19 12:10:22 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 19 Apr 2012 10:10:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17768] csw/mgar/pkg Message-ID: Revision: 17768 http://gar.svn.sourceforge.net/gar/?rev=17768&view=rev Author: d_pocock Date: 2012-04-19 10:10:22 +0000 (Thu, 19 Apr 2012) Log Message: ----------- resiprocate: add initial Makefile Added Paths: ----------- csw/mgar/pkg/resiprocate/ csw/mgar/pkg/resiprocate/branches/ csw/mgar/pkg/resiprocate/tags/ csw/mgar/pkg/resiprocate/trunk/ csw/mgar/pkg/resiprocate/trunk/Makefile Added: csw/mgar/pkg/resiprocate/trunk/Makefile =================================================================== --- csw/mgar/pkg/resiprocate/trunk/Makefile (rev 0) +++ csw/mgar/pkg/resiprocate/trunk/Makefile 2012-04-19 10:10:22 UTC (rev 17768) @@ -0,0 +1,26 @@ +NAME = resiprocate +VERSION = 1.8.0 +CATEGORIES = utils + +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +DESCRIPTION = full-featured reference implementation of SIP in C++ +define BLURB + reSIProcate is a library that aims to fully implement the SIP protocol + in first class C++. It is intended for use in other applications, + such as the repro SIP proxy. +endef + +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --disable-nls +CONFIGURE_ARGS += --with-ssl +CONFIGURE_ARGS += --enable-ipv6 + +# There are multiple test suites, regular `make check' and tfm +TEST_SCRIPTS = check + +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 Thu Apr 19 13:12:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[17769] csw/mgar/pkg/cpan/makemake Message-ID: Revision: 17769 http://gar.svn.sourceforge.net/gar/?rev=17769&view=rev Author: dmichelsen Date: 2012-04-19 11:12:16 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cpan/makemake: Autodetect Build.PL, better package name heuristic, added diag output Modified Paths: -------------- csw/mgar/pkg/cpan/makemake Modified: csw/mgar/pkg/cpan/makemake =================================================================== --- csw/mgar/pkg/cpan/makemake 2012-04-19 10:10:22 UTC (rev 17768) +++ csw/mgar/pkg/cpan/makemake 2012-04-19 11:12:16 UTC (rev 17769) @@ -10,6 +10,7 @@ use warnings; use feature ':5.10'; use Cwd; # was use File::chdir; +use Carp; use CPAN; use YAML qw(LoadFile); use File::Path; @@ -41,6 +42,7 @@ ### Main ### +say STDERR "Expanding CPAN module name"; logoutput(); # Start logging my $mod = ( CPAN::Shell->expand( "Module", $modname ) )[0] or die "can not locate CPAN module $modname"; @@ -53,6 +55,7 @@ #endlog(); # print "Make done\n"; +say STDERR "Analyzing filename"; my $filename = $mod->cpan_file; my $author = ( split( /\//, $filename ) )[2]; my $author1 = substr( $author, 0, 1 ); @@ -64,8 +67,10 @@ # That is the version of the module which may be different than the one from the file # my $version = $mod->cpan_version; -my ( $name, $fileversion ) = ( $fileonly =~ /^(\D+)-(\d+(?:\.\d+)*)/ ); +my ( $name, $fileversion ) = ( $fileonly =~ /^(.*)-(\d+(?:\.\d+)*)/ ); +croak( "The package name is not defined on file $fileonly" ) if( !$name ); + #print "filename: $filename\n"; #print "notstandard: $notstandard\n"; #print "fileonly: $fileonly\n"; @@ -83,6 +88,7 @@ # print "DSLIP: ", Dumper( $mod->dslip_status() ); +say STDERR "Getting DSLIP"; my $dslip = $mod->dslip_status; my $archall = ( !defined $dslip->{L} ? 2 @@ -90,6 +96,7 @@ : 0 ); +say STDERR "Getting distribution file"; logoutput(); $mod->distribution->get; endlog(); @@ -102,6 +109,7 @@ my $license; my $license_resource; my $description; +say STDERR "Processing META.yml"; if ( -f "$distdir/META.yml" ) { my $meta = LoadFile("$distdir/META.yml"); @@ -113,8 +121,10 @@ # my $recommends = $meta->{recommends}; my $build_requires = $meta->{build_requires}; + say STDERR "- build dependencies"; @build_dep_pkgs = dep_pkgs($build_requires); # @recommended_pkgs = dep_pkgs($recommends); + say STDERR "- runtime dependencies"; @runtime_dep_pkgs = dep_pkgs($req); } @@ -134,6 +144,8 @@ system("pwd; gmake newpkg-$name"); } +say STDERR "Writing GAR Makefile"; + open( my $mf_fh, '>', "$name/trunk/Makefile" ) or die "Couldn't write to $name/trunk/Makefile"; say {$mf_fh} "NAME = $name"; @@ -208,6 +220,12 @@ say STDERR "A previous version of this package $cswpkg has been released"; next; } + + if( $oldpkg eq 'CSWperl' ) { + say STDERR "This functionality is also in CSWperl, this is probably an update"; + next; + } + say STDERR "A previous version of this package $cswpkg was released, but was named $oldpkg then"; say {$mf_fh} "OBSOLETED_BY_$cswpkg += $oldpkg"; @@ -220,6 +238,14 @@ } +if ( -f "$distdir/Build.PL" ) { + say {$mf_fh} ''; + say {$mf_fh} 'CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL'; + say {$mf_fh} 'BUILD_SCRIPTS = $(WORKSRC)/Build'; + say {$mf_fh} 'TEST_SCRIPTS = $(WORKSRC)/Build'; + say {$mf_fh} 'INSTALL_SCRIPTS = $(WORKSRC)/Build'; +} + say {$mf_fh} ""; say {$mf_fh} "include gar/category.mk"; @@ -344,7 +370,7 @@ return; } my $filename = $mod->distribution->base_id; - my ( $name, $fileversion ) = ( $filename =~ /^(\D+)-(\d+(?:\.\d+)*)/ ); + my ( $name, $fileversion ) = ( $filename =~ /^(\D+\d*)-(\d+(?:\.\d+)*)/ ); my $dirname = $name; my $pkgname = lc($name); $pkgname = "CSWpm-" . $pkgname; 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 Apr 19 13:13:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17770] csw/mgar/pkg/cpan/Params-Validate/trunk Message-ID: Revision: 17770 http://gar.svn.sourceforge.net/gar/?rev=17770&view=rev Author: dmichelsen Date: 2012-04-19 11:13:22 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cpan/Params-Validate/trunk: Update to 1.06, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile csw/mgar/pkg/cpan/Params-Validate/trunk/checksums Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2012-04-19 11:12:16 UTC (rev 17769) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2012-04-19 11:13:22 UTC (rev 17770) @@ -1,36 +1,30 @@ NAME = Params-Validate -VERSION = 0.95 +VERSION = 1.06 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DROLSKY DESCRIPTION = Validate method/function parameters define BLURB - The Params::Validate module allows you to validate method or function call - parameters to an arbitrary level of specificity. At the simplest level, it - is capable of validating the required parameters were given and that no - unspecified additional parameters were passed in. endef -# CSWpmprmsvldt is the old package. It is empty and depends on the new one. -PACKAGES = CSWpmparamsvalidate CSWpmprmsvldt +CATALOG_RELEASE = unstable -CATALOGNAME_CSWpmparamsvalidate = pm_paramsvalidate -CATALOGNAME_CSWpmprmsvldt = pm_prmsvldt +LICENSE = LICENSE -SPKG_DESC_CSWpmparamsvalidate = $(DESCRIPTION) -SPKG_DESC_CSWpmprmsvldt = Empty stub depending on new package CSWpmparamsvalidate +BUILD_DEP_PKGS += CSWpm-module-implementation +BUILD_DEP_PKGS += CSWpm-test-fatal -RUNTIME_DEP_PKGS_CSWpmprmsvldt = CSWpmparamsvalidate +PACKAGES += CSWpm-params-validate +CATALOGNAME_CSWpm-params-validate = pm_params_validate +SPKG_DESC_CSWpm-params-validate = Validate method/function parameters +RUNTIME_DEP_PKGS_CSWpm-params-validate += CSWpm-module-implementation +OBSOLETED_BY_CSWpm-params-validate += CSWpmparamsvalidate +CATALOGNAME_CSWpmparamsvalidate = pm_paramsvalidate_stub -LICENSE = LICENSE - CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL BUILD_SCRIPTS = $(WORKSRC)/Build TEST_SCRIPTS = $(WORKSRC)/Build INSTALL_SCRIPTS = $(WORKSRC)/Build -PKGFILES_CSWpmprmsvldt = NOFILES -ARCHALL_CSWpmprmsvldt = 1 - include gar/category.mk Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/checksums 2012-04-19 11:12:16 UTC (rev 17769) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/checksums 2012-04-19 11:13:22 UTC (rev 17770) @@ -1 +1 @@ -f544f12357ae4ba44044cd8cb2b83a9f Params-Validate-0.95.tar.gz +4f7a281269cd30d7c3994ba5acb50857 Params-Validate-1.06.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 Apr 19 13:19:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:19:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17771] csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile Message-ID: Revision: 17771 http://gar.svn.sourceforge.net/gar/?rev=17771&view=rev Author: dmichelsen Date: 2012-04-19 11:19:58 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cpan/Params-Validate/trunk: Add dependency to newer version of Module::Build Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2012-04-19 11:13:22 UTC (rev 17770) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2012-04-19 11:19:58 UTC (rev 17771) @@ -15,6 +15,9 @@ BUILD_DEP_PKGS += CSWpm-module-implementation BUILD_DEP_PKGS += CSWpm-test-fatal +# The Module::Build from CSWperl is too old +BUILD_DEP_PKGS += CSWpm-module-build + PACKAGES += CSWpm-params-validate CATALOGNAME_CSWpm-params-validate = pm_params_validate SPKG_DESC_CSWpm-params-validate = Validate method/function parameters 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 Apr 19 13:28:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:28:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[17772] csw/mgar/pkg/cpan/Log-Dispatch/trunk Message-ID: Revision: 17772 http://gar.svn.sourceforge.net/gar/?rev=17772&view=rev Author: dmichelsen Date: 2012-04-19 11:28:20 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cpan/Log-Dispatch/trunk: Update to 2.29, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2012-04-19 11:19:58 UTC (rev 17771) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2012-04-19 11:28:20 UTC (rev 17772) @@ -1,22 +1,24 @@ NAME = Log-Dispatch -VERSION = 2.26 +VERSION = 2.29 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DROLSKY -DESCRIPTION = Dispatch messages to noe or more outputs +DESCRIPTION = Dispatches messages to one or more outputs define BLURB - This module manages a set of Log::Dispatch::* objects, allowing you to add - and remove output objects as desired. endef -RUNTIME_DEP_PKGS = CSWpmparamsvalidate CSWpmunivrequire +CATALOG_RELEASE = unstable -PACKAGES = CSWpmlogdispatch -CATALOGNAME = pm_logdispatch - LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-log-dispatch-syslog +CATALOGNAME_CSWpm-log-dispatch-syslog = pm_log_dispatch_syslog +SPKG_DESC_CSWpm-log-dispatch-syslog = Dispatches messages to one or more outputs +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-log-dispatch-syslog = 1 +RUNTIME_DEP_PKGS_CSWpm-log-dispatch-syslog += CSWpm-params-validate +OBSOLETED_BY_CSWpm-log-dispatch-syslog += CSWpmlogdispatch +CATALOGNAME_CSWpmlogdispatch = pm_logdispatch_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2012-04-19 11:19:58 UTC (rev 17771) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/checksums 2012-04-19 11:28:20 UTC (rev 17772) @@ -1 +1 @@ -d15559297f7c73a311ede78f97174d2a Log-Dispatch-2.26.tar.gz +781a4b5a9db2b617d2487dadecf65081 Log-Dispatch-2.29.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 Apr 19 13:33:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:33:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17773] csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile Message-ID: Revision: 17773 http://gar.svn.sourceforge.net/gar/?rev=17773&view=rev Author: dmichelsen Date: 2012-04-19 11:33:41 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cpan/Log-Dispatch/trunk: Fix package name Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile Modified: csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2012-04-19 11:28:20 UTC (rev 17772) +++ csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile 2012-04-19 11:33:41 UTC (rev 17773) @@ -12,13 +12,12 @@ LICENSE = LICENSE -PACKAGES += CSWpm-log-dispatch-syslog -CATALOGNAME_CSWpm-log-dispatch-syslog = pm_log_dispatch_syslog -SPKG_DESC_CSWpm-log-dispatch-syslog = Dispatches messages to one or more outputs -# There was no information if this is pure Perl or not. Please remove if necessary. -ARCHALL_CSWpm-log-dispatch-syslog = 1 -RUNTIME_DEP_PKGS_CSWpm-log-dispatch-syslog += CSWpm-params-validate -OBSOLETED_BY_CSWpm-log-dispatch-syslog += CSWpmlogdispatch +PACKAGES += CSWpm-log-dispatch +CATALOGNAME_CSWpm-log-dispatch = pm_log_dispatch +SPKG_DESC_CSWpm-log-dispatch = Dispatches messages to one or more outputs +ARCHALL_CSWpm-log-dispatch = 1 +RUNTIME_DEP_PKGS_CSWpm-log-dispatch += CSWpm-params-validate +OBSOLETED_BY_CSWpm-log-dispatch += CSWpmlogdispatch CATALOGNAME_CSWpmlogdispatch = pm_logdispatch_stub 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 Thu Apr 19 13:51:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17774] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17774 http://gar.svn.sourceforge.net/gar/?rev=17774&view=rev Author: cgrzemba Date: 2012-04-19 11:51:13 +0000 (Thu, 19 Apr 2012) Log Message: ----------- first working version Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/makeStdLibDb.py Removed Paths: ------------- csw/mgar/gar/v2/lib/python/make-stdlib-db.py Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-19 11:33:41 UTC (rev 17773) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-19 11:51:13 UTC (rev 17774) @@ -1,7 +1,7 @@ #!/usr/bin/env python2.6 -t """Helps to check if all needed libs are in the catalog. - +writes all missings libs in a file missing_libs.txt in the format: libname:pkg:arch:osrel """ import optparse @@ -14,9 +14,11 @@ import os import cjson import subprocess +import makeStdLibDb catrel = 'unstable' cache_file_bins = 'bins-%s-%s-%s.json' +cache_file_links = 'links-%s-%s-%s.json' cache_file_needed_bins = 'needed-bins-%s-%s-%s.json' fn_stdlibs = 'stdlibs.json' fn_report = 'missing_libs.txt' @@ -25,6 +27,7 @@ def __init__(self): self.cached_catalogs_bins = {} + self.cached_catalogs_links = {} self.cached_catalogs_needed_bins = {} self.rest_client = rest.RestClient() self.cp = rest.CachedPkgstats("pkgstats.db") @@ -34,55 +37,79 @@ if key in self.cached_catalogs_bins: return fn_bins = cache_file_bins% key - if os.path.exists(fn_bins): + fn_links = cache_file_links% key + fn_needed_bins = cache_file_needed_bins % key + if os.path.exists(fn_bins) and os.path.exists(fn_needed_bins) and os.path.exists(fn_links): with open(fn_bins, "r") as fd: self.cached_catalogs_bins[key] = cjson.decode(fd.read()) - fn_needed_bins = cache_file_needed_bins % key - if os.path.exists(fn_needed_bins): + with open(fn_links, "r") as fd: + self.cached_catalogs_links[key] = cjson.decode(fd.read()) with open(fn_needed_bins, "r") as fd: self.cached_catalogs_needed_bins[key] = cjson.decode(fd.read()) return catalog = self.rest_client.GetCatalog(*key) bins = {} + links = {} needed_bins = {} + i = 0 for pkg_simple in catalog: + i = i+1 cb = [] + cl = [] nb = [] # pprint.pprint(pkg_simple) md5 = pkg_simple["md5_sum"] pkg = self.cp.GetPkgstats(md5) if not pkg: - logging.warning("No package for %r", md5) + logging.warning("MakeRevIndex: No package for %r", md5) continue try: pkg_name = pkg["basic_stats"]["pkgname"] for p in pkg['binaries_dump_info']: for b in p['needed sonames']: - if b not in needed_bins: + if b not in nb: nb.append(b) for b in pkg['binaries']: - if b not in bins: + if b not in cb: cb.append(b) - bins[pkg_name] = cb - needed_bins[pkg_name] = nb - sys.stdout.write(".") - sys.stdout.flush() + else: + logging.debug("MakeRevIndex: %s already in cache") + for pm in pkg['pkgmap']: + if pm['type'] == 's': # symbolic link + cl.append(pm['line'].split(' ')[3].split('=')[0]) # take the linkname + except KeyError: logging.warning("MakeRevIndex: no pkg structure: ") # logging.warning(pkg) + bins[pkg_name] = cb + needed_bins[pkg_name] = nb + links[pkg_name] = cl + sys.stdout.write("\rMakeRevIndex:%4d %s" % (i,pkg_name)) + sys.stdout.flush() sys.stdout.write("\n") self.cached_catalogs_bins[key] = bins + self.cached_catalogs_links[key] = links self.cached_catalogs_needed_bins[key] = needed_bins with open(fn_bins, "w") as fd: fd.write(cjson.encode(self.cached_catalogs_bins[key])) + fd.close() + with open(fn_links, "w") as fd: + fd.write(cjson.encode(self.cached_catalogs_links[key])) + fd.close() with open(fn_needed_bins, "w") as fd: fd.write(cjson.encode(self.cached_catalogs_needed_bins[key])) + fd.close() def getBins(self, catrel, arch, osrel): self.MakeRevIndex(catrel, arch, osrel) key = (catrel, arch, osrel) return self.cached_catalogs_bins[key] + def getLinks(self, catrel, arch, osrel): + self.MakeRevIndex(catrel, arch, osrel) + key = (catrel, arch, osrel) + return self.cached_catalogs_links[key] + def getNeededBins(self, catrel, arch, osrel): self.MakeRevIndex(catrel, arch, osrel) key = (catrel, arch, osrel) @@ -99,9 +126,9 @@ with open(fn_stdlibs, "r") as fd: stdlibs = cjson.decode(fd.read()) fl = open(fn_report, "w") - r = -1 + rIdx = -1 for osrel in common_constants.OS_RELS: - r = r+1 + rIdx = rIdx+1 if osrel in common_constants.OBSOLETE_OS_RELS: logging.debug("scanPackage: %s is obsoleted" % osrel) continue @@ -110,6 +137,8 @@ bins = rd.getBins(catrel, arch, osrel) # get the list of libs which a package needs needed_bins = rd.getNeededBins(catrel, arch, osrel) + # get the list of links in a package + links = rd.getLinks(catrel, arch, osrel) i = 0 checked = [] for pkg in needed_bins: @@ -118,6 +147,7 @@ if nb in checked: continue checked.append(nb) found = False + # at first search the lib in any other package for npkg in bins: for b in bins[npkg]: # if lib in the package @@ -126,27 +156,40 @@ # logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,b,npkg)) break if found: break - if nb in stdlibs: - found = True - # logging.debug ("\nfound %s" % nb) - break - if found == False: + if not found: + # second search is there a link with this name + for lpkg in links: + for l in links[lpkg]: + # if lib in the package + if nb in l: + found = True + # logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,b,npkg)) + break + if found: break + if not found: + # third is the need lib a std solaris lib + if nb in stdlibs: + found = True + # logging.debug ("\nfound %s" % nb) + # at last search the lib in earlier os releases + if not found: # if not found iterate over older OS releases - logging.debug ("\ncompare lower osrel %s [%s]: %s" % (osrel,pkg,nb)) + r = rIdx while r > 0: r = r - 1 - bins = rd.getBins(catrel, arch, common_constants.OS_RELS[r]) - for npkg in bins: - for b in bins[npkg]: - if nb in b: + logging.debug ("\nscanPackage: compare lower osrel %s [%s]: %s %d %d" % (common_constants.OS_RELS[r],pkg,nb,rIdx,r)) + lbins = rd.getBins(catrel, arch, common_constants.OS_RELS[r]) + for lnpkg in lbins: + for lb in lbins[lnpkg]: + if nb in lb: found = True - logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,b,npkg)) + logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,lb,lnpkg)) break if found: break - if found == False: + if not found: fl.write("%s:%s:%s:%s\n" % (nb,pkg,arch,osrel) ) print "\nNOT FOUND: %s, needed in pkg %s %s %s" % (nb,pkg,arch,osrel) - sys.stdout.write("\r%d" % i) + sys.stdout.write("\rscanPackage %4d %s" % (i,pkg)) sys.stdout.flush() fl.close() @@ -157,8 +200,8 @@ if options.debug: logging.basicConfig(level=logging.DEBUG) if not os.path.exists(fn_stdlibs): - print "needed file %s not found, exit" % fn_stdlibs - sys.exit() + print "needed file %s not found, will create this" % fn_stdlibs + makeStdLibDb.buildStdlibList() pr = PackageScanner() pr.scanPackage() Deleted: csw/mgar/gar/v2/lib/python/make-stdlib-db.py =================================================================== --- csw/mgar/gar/v2/lib/python/make-stdlib-db.py 2012-04-19 11:33:41 UTC (rev 17773) +++ csw/mgar/gar/v2/lib/python/make-stdlib-db.py 2012-04-19 11:51:13 UTC (rev 17774) @@ -1,18 +0,0 @@ -#!/bin/env python - -from os import listdir, chdir, getcwd -import re -import cjson - -fnLiblst = "stdlibs.json" - -liblst = [] -cwd = getcwd() -chdir('/usr/lib') -for lib in listdir('.'): - if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): - liblst.append(lib) -chdir(cwd) -with open(fnLiblst,'w') as fd: - fd.write(cjson.encode(liblst)) -fd.close() Added: csw/mgar/gar/v2/lib/python/makeStdLibDb.py =================================================================== --- csw/mgar/gar/v2/lib/python/makeStdLibDb.py (rev 0) +++ csw/mgar/gar/v2/lib/python/makeStdLibDb.py 2012-04-19 11:51:13 UTC (rev 17774) @@ -0,0 +1,44 @@ +#!/bin/env python + +"""Builds a list of standard libs and stores this in stdlib.json + this list/file is needed by find_missing_bins.py + +""" + +from os import listdir, chdir, getcwd +import re +import cjson + +fnLiblst = "stdlibs.json" + +def buildStdlibList(): + liblst = ['libjawt.so'] + cwd = getcwd() + chdir('/usr/lib') + for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + liblst.append(lib) + chdir('/usr/dt/lib') + for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + if not lib in liblst: + liblst.append(lib) + chdir('/usr/openwin/lib') + for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + if not lib in liblst: + liblst.append(lib) + chdir('/usr/X11/lib') + for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + if not lib in liblst: + liblst.append(lib) + chdir('/usr/ucblib') + for lib in listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + if not lib in liblst: + liblst.append(lib) + chdir(cwd) + with open(fnLiblst,'w') as fd: + fd.write(cjson.encode(liblst)) + fd.close() Property changes on: csw/mgar/gar/v2/lib/python/makeStdLibDb.py ___________________________________________________________________ Added: svn:executable + * 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 Apr 19 13:58:22 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Apr 2012 11:58:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[17775] csw/mgar/gar/v2/lib/python/find_missing_bins.py Message-ID: Revision: 17775 http://gar.svn.sourceforge.net/gar/?rev=17775&view=rev Author: cgrzemba Date: 2012-04-19 11:58:22 +0000 (Thu, 19 Apr 2012) Log Message: ----------- remove search in older catalogs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_missing_bins.py Modified: csw/mgar/gar/v2/lib/python/find_missing_bins.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-19 11:51:13 UTC (rev 17774) +++ csw/mgar/gar/v2/lib/python/find_missing_bins.py 2012-04-19 11:58:22 UTC (rev 17775) @@ -126,9 +126,7 @@ with open(fn_stdlibs, "r") as fd: stdlibs = cjson.decode(fd.read()) fl = open(fn_report, "w") - rIdx = -1 for osrel in common_constants.OS_RELS: - rIdx = rIdx+1 if osrel in common_constants.OBSOLETE_OS_RELS: logging.debug("scanPackage: %s is obsoleted" % osrel) continue @@ -173,20 +171,6 @@ # logging.debug ("\nfound %s" % nb) # at last search the lib in earlier os releases if not found: - # if not found iterate over older OS releases - r = rIdx - while r > 0: - r = r - 1 - logging.debug ("\nscanPackage: compare lower osrel %s [%s]: %s %d %d" % (common_constants.OS_RELS[r],pkg,nb,rIdx,r)) - lbins = rd.getBins(catrel, arch, common_constants.OS_RELS[r]) - for lnpkg in lbins: - for lb in lbins[lnpkg]: - if nb in lb: - found = True - logging.debug ("\nfound %s [%s]: %s in %s (%s)" % (osrel,pkg,nb,lb,lnpkg)) - break - if found: break - if not found: fl.write("%s:%s:%s:%s\n" % (nb,pkg,arch,osrel) ) print "\nNOT FOUND: %s, needed in pkg %s %s %s" % (nb,pkg,arch,osrel) sys.stdout.write("\rscanPackage %4d %s" % (i,pkg)) @@ -204,6 +188,7 @@ makeStdLibDb.buildStdlibList() pr = PackageScanner() pr.scanPackage() + print "" if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Apr 19 14:09:48 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Apr 2012 12:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17776] csw/mgar/pkg/opencsw-manual/trunk Message-ID: Revision: 17776 http://gar.svn.sourceforge.net/gar/?rev=17776&view=rev Author: wahwah Date: 2012-04-19 12:09:48 +0000 (Thu, 19 Apr 2012) Log Message: ----------- opencsw-manual/trunk: Add a section about building a catalog Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2012-04-19 11:58:22 UTC (rev 17775) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2012-04-19 12:09:48 UTC (rev 17776) @@ -21,11 +21,12 @@ MASTER_SITES = http://www.gnu.org/licenses/ DISTFILES = fdl-1.3.txt CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = policy -INSTALL_SCRIPTS = policy +BUILD_SCRIPTS = manual +INSTALL_SCRIPTS = manual TEST_SCRIPTS = ARCHALL_CSWopencsw-manual = 1 -CATALOGNAME_CSWopencsw-manual = opencsw_policy +# This line is necessary for copy-to-web to work. +CATALOGNAME_CSWopencsw-manual = opencsw_manual LICENSE = fdl-1.3.txt BUILD_DEP_PKGS += CSWpy-sphinx @@ -38,10 +39,11 @@ rsync -r $(FILEDIR)/ $(WORKSRC) @$(MAKECOOKIE) -build-policy: +build-manual: (cd $(WORKSRC); gmake html) + @$(MAKECOOKIE) -install-policy: +install-manual: ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) rsync -rv $(WORKSRC)/_build/html/ $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual) @$(MAKECOOKIE) Added: 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 (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2012-04-19 12:09:48 UTC (rev 17776) @@ -0,0 +1,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. + +Make sure you've installed the ``pkgutilplus`` package. It contains the +``bldcat`` utility. You can use it to create a local catalog with your +package:: + + catalog_root=${HOME}/opencsw-catalog + catalog_path=${catalog_root}/$(uname -p)/$(uname -r) + cp /path/to/your_package.pkg ${catalog_path} + bldcat ${catalog_path} + +Once this is done, you can instruct pkgutil to install packages from it. You +can either serve the root catalog directory over HTTP, or you can refer to +a local filesystem path:: + + sudo pkgutil -t file://${catalog_path} -y -i your_package + +If you create a persistent local catalog, you can add the path or URL to +``/opt/csw/etc/pkgutil.conf``. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-04-19 11:58:22 UTC (rev 17775) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2012-04-19 12:09:48 UTC (rev 17776) @@ -9,4 +9,5 @@ :maxdepth: 2 filesystem-layout + building-a-catalog shared-libraries 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 Apr 19 15:06:58 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Apr 2012 13:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[17777] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 17777 http://gar.svn.sourceforge.net/gar/?rev=17777&view=rev Author: cgrzemba Date: 2012-04-19 13:06:58 +0000 (Thu, 19 Apr 2012) Log Message: ----------- cups/trunk: GARCOMPILER can override Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-04-19 12:09:48 UTC (rev 17776) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-04-19 13:06:58 UTC (rev 17777) @@ -65,7 +65,7 @@ LICENSE = LICENSE.txt -GARCOMPILER = SOS12U3 +GARCOMPILER ?= SOS12U3 BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWlibjpeg-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 19 15:44:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Apr 2012 13:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17778] csw/mgar/pkg/libtorrent/trunk Message-ID: Revision: 17778 http://gar.svn.sourceforge.net/gar/?rev=17778&view=rev Author: dmichelsen Date: 2012-04-19 13:44:55 +0000 (Thu, 19 Apr 2012) Log Message: ----------- libtorrent/trunk: Update to 0.16.0 with g++ and gxx Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile csw/mgar/pkg/libtorrent/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-19 13:06:58 UTC (rev 17777) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-19 13:44:55 UTC (rev 17778) @@ -1,9 +1,9 @@ NAME = libtorrent -VERSION = 0.12.6 +VERSION = 0.16.0 CATEGORIES = lib GARTYPE = v2 -DESCRIPTION = BitTorrent library written in C++ for *nix. +DESCRIPTION = BitTorrent library written in C++ for *nix define BLURB BitTorrent library written in C++ for *nix, with a focus on high performance and good code. The library differentiates itself from other implementations by transfering directly from @@ -11,52 +11,71 @@ the speed of the official client. endef -MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ +MASTER_SITES += $(GOOGLE_MIRROR) +DISTNAME = libtorrent-rasterbar-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - # Patches from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/ -PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff -PATCHFILES += rlibtorrent-05-tracker-usable.diff +#PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff +#PATCHFILES += rlibtorrent-05-tracker-usable.diff -PATCHFILES += 0001-Ignore-__UNUSED.patch +#PATCHFILES += 0001-Ignore-__UNUSED.patch -BUILD_DEP_pkgs = CSWossldevel CSWlibsigc++devel +#PATCHFILES += 0001-Use-correct-m4-quoting-for-code-in-autoconf.patch -PACKAGES = CSWlibtorrent CSWlibtorrentdevel +#PATCHFILES += 0002-Use-posix_memalign-only-when-available.patch -CATALOGNAME_CSWlibtorrent = libtorrent -CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel +#PATCHFILES += 0003-Fix-the-signature-instead-of-using-sig_t.patch -SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix -SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent +# As we have patches autoconf we need to autotools bootstrap and that requires +# cppunit (although it is optional for afterwards building we need it now for the +# AC macros). +BUILD_DEP_PKGS += CSWcppunit-gxx-dev +PACKAGES += CSWlibtorrent +CATALOGNAME_CSWlibtorrent = libtorrent +SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ + +PACKAGES += CSWlibtorrentdevel +CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel +SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent - -BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug - PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibtorrentdevel += $(docdir)/.* PKGFILES_CSWlibtorrentdevel += .*\.h PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.* -CHECKPKG_OVERRIDES_CSWlibtorrentdevel += surplus-dependency|CSWlibtorrent +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +prefix = $(BUILD_PREFIX)/gxx +GARCOMPILER = GNU +BUILD64_LIBS_ONLY = 1 +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --disable-libtool-lock +CONFIGURE_ARGS += --disable-debug + +# The testsuite has a linker error with mangled C++ symbols, skip for now +SKIPTEST ?= 1 + include gar/category.mk -pre-configure-modulated: -# cd $(WORKSRC) && aclocal-1.10 -I./scripts -I. && autoheader \ -# && libtoolize --automake --copy --force && automake-1.10 && autoconf - cd $(WORKSRC) && aclocal-1.10 -I scripts && \ - automake-1.10 --gnu && autoconf +post-patch-modulated: + -cd $(WORKSRC) && ./autogen.sh + @$(MAKECOOKIE) - $(MAKECOOKIE) +#pre-configure-modulated: +## cd $(WORKSRC) && aclocal-1.10 -I./scripts -I. && autoheader \ +## && libtoolize --automake --copy --force && automake-1.10 && autoconf +# cd $(WORKSRC) && aclocal-1.10 -I scripts && \ +# automake-1.10 --gnu && autoconf +# +# $(MAKECOOKIE) -post-configure-modulated: - perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool - @$(MAKECOOKIE) +#post-configure-modulated: +# perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/libtorrent/trunk/checksums =================================================================== --- csw/mgar/pkg/libtorrent/trunk/checksums 2012-04-19 13:06:58 UTC (rev 17777) +++ csw/mgar/pkg/libtorrent/trunk/checksums 2012-04-19 13:44:55 UTC (rev 17778) @@ -1,6 +1 @@ -a60c38bec6f1f18c6055894b15e3cb82 0001-Ignore-__UNUSED.patch -037499ed708aaf72988cee60e5a8d96b libtorrent-0.12.6.tar.gz -eb30844ace9f064a8fca5212f5a99fef rlibtorrent-01-madvise.diff -f2f3738edcbc8d7ccfa14e784f3af9c6 rlibtorrent-03-dh-generate.diff -c13befd35c91a36f78151accdc70c62c rlibtorrent-04-sunpro.diff -0d1545bbc1e7c9f5d4de059c855b0f81 rlibtorrent-05-tracker-usable.diff +0448407e23f53a182311236a96b9a83b libtorrent-rasterbar-0.16.0.tar.gz Added: csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch 2012-04-19 13:44:55 UTC (rev 17778) @@ -0,0 +1,133 @@ +From 5a847a7488e2ea452503765cd74ebcddda2388af Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 17 Apr 2012 15:26:39 +0200 +Subject: [PATCH] Use correct m4 quoting for code in autoconf + +This is documented in the autoconf manual in the section + AC_LANG_SOURCE +--- + scripts/common.m4 | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/scripts/common.m4 b/scripts/common.m4 +index 3d7e864..e0730bb 100644 +--- a/scripts/common.m4 ++++ b/scripts/common.m4 +@@ -99,11 +99,11 @@ AC_DEFUN([TORRENT_OTFD], [ + AC_LANG_PUSH(C++) + AC_MSG_CHECKING(for proper overloaded template function disambiguation) + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + template void f(T&) {} + template void f(T*) {} + int main() { int *i = 0; f(*i); f(i); } +- ])], ++ ]])], + [ + AC_MSG_RESULT(yes) + ], [ +@@ -119,24 +119,24 @@ AC_DEFUN([TORRENT_MINCORE_SIGNEDNESS], [ + AC_LANG_PUSH(C++) + AC_MSG_CHECKING(signedness of mincore parameter) + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include + void f() { mincore((char*)0, 0, (unsigned char*)0); } +- ])], ++ ]])], + [ + AC_DEFINE(USE_MINCORE, 1, Use mincore) + AC_DEFINE(USE_MINCORE_UNSIGNED, 1, use unsigned char* in mincore) + AC_MSG_RESULT(unsigned) + ], + [ +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include + void f() { mincore((char*)0, 0, (char*)0); } +- ])], ++ ]])], + [ + AC_DEFINE(USE_MINCORE, 1, Use mincore) + AC_DEFINE(USE_MINCORE_UNSIGNED, 0, use char* in mincore) +@@ -168,11 +168,11 @@ AC_DEFUN([TORRENT_MINCORE], [ + AC_DEFUN([TORRENT_CHECK_MADVISE], [ + AC_MSG_CHECKING(for madvise) + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include + void f() { static char test[1024]; madvise((void *)test, sizeof(test), MADV_NORMAL); } +- ])], ++ ]])], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(USE_MADVISE, 1, Use madvise) +@@ -184,9 +184,9 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ + AC_DEFUN([TORRENT_CHECK_POPCOUNT], [ + AC_MSG_CHECKING(for __builtin_popcount) + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + int f() { return __builtin_popcount(0); } +- ])], ++ ]])], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(USE_BUILTIN_POPCOUNT, 1, Use __builtin_popcount.) +@@ -198,12 +198,12 @@ AC_DEFUN([TORRENT_CHECK_POPCOUNT], [ + AC_DEFUN([TORRENT_CHECK_CACHELINE], [ + AC_MSG_CHECKING(for cacheline) + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include + void* vptr __cacheline_aligned; + void f() { posix_memalign(&vptr, SMP_CACHE_BYTES, 42); } +- ])], ++ ]])], + [ + AC_MSG_RESULT(found builtin) + dnl AC_DEFINE(LT_SMP_CACHE_BYTES, SMP_CACHE_BYTES, Largest L1 cache size we know of, should work on all archs.) +@@ -223,10 +223,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. + AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + AC_MSG_CHECKING(for execinfo.h) + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} +- ])], ++ ]])], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) +@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + AC_DEFUN([TORRENT_CHECK_ALIGNED], [ + AC_MSG_CHECKING(the byte alignment) + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main() { + char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; +@@ -247,7 +247,7 @@ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ + if (*(uint32_t*)(buf + i) == 0) return -1; + return 0; + } +- ])], ++ ]])], + [ + AC_MSG_RESULT(none needed) + ], [ +-- +1.7.10 + Added: csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch 2012-04-19 13:44:55 UTC (rev 17778) @@ -0,0 +1,26 @@ +From ba65af2026be2372d6d3d1c7a85f518892479221 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 17 Apr 2012 17:09:07 +0200 +Subject: [PATCH] Use posix_memalign only when available + +--- + rak/allocators.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/rak/allocators.h b/rak/allocators.h +index 0a1b711..cfbd090 100644 +--- a/rak/allocators.h ++++ b/rak/allocators.h +@@ -77,7 +77,9 @@ public: + + static pointer alloc_size(size_type size) { + pointer ptr = NULL; ++#ifdef HAVE_POSIX_MEMALIGN + int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); ++#endif + + return ptr; + } +-- +1.7.10 + Added: csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch 2012-04-19 13:44:55 UTC (rev 17778) @@ -0,0 +1,54 @@ +From 3f3dd168d995127193a1043e8fd15f1258458f69 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 17 Apr 2012 18:52:22 +0200 +Subject: [PATCH] Fix the signature instead of using sig_t + +--- + test/data/hash_check_queue_test.cc | 4 ++-- + test/data/hash_queue_test.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/data/hash_check_queue_test.cc b/test/data/hash_check_queue_test.cc +index 59b8522..87daf06 100644 +--- a/test/data/hash_check_queue_test.cc ++++ b/test/data/hash_check_queue_test.cc +@@ -67,13 +67,13 @@ verify_hash(const done_chunks_type* done_chunks, int index, const torrent::HashS + + static torrent::Poll* create_select_poll() { return torrent::PollSelect::create(256); } + +-static void do_nothing() {} ++static void do_nothing(int s) {} + + void + HashCheckQueueTest::setUp() { + torrent::Poll::slot_create_poll() = tr1::bind(&create_select_poll); + +- signal(SIGUSR1, (sig_t)&do_nothing); ++ signal(SIGUSR1, &do_nothing); + } + + void +diff --git a/test/data/hash_queue_test.cc b/test/data/hash_queue_test.cc +index f31b5f3..f5fc88c 100644 +--- a/test/data/hash_queue_test.cc ++++ b/test/data/hash_queue_test.cc +@@ -38,14 +38,14 @@ check_for_chunk_done(torrent::HashQueue* hash_queue, done_chunks_type* done_chun + + static torrent::Poll* create_select_poll() { return torrent::PollSelect::create(256); } + +-static void do_nothing() {} ++static void do_nothing(int s) {} + + void + HashQueueTest::setUp() { + CPPUNIT_ASSERT(torrent::taskScheduler.empty()); + + torrent::Poll::slot_create_poll() = tr1::bind(&create_select_poll); +- signal(SIGUSR1, (sig_t)&do_nothing); ++ signal(SIGUSR1, &do_nothing); + } + + void +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Apr 19 17:26:04 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 19 Apr 2012 15:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17779] csw/mgar/pkg/resiprocate/trunk/Makefile Message-ID: Revision: 17779 http://gar.svn.sourceforge.net/gar/?rev=17779&view=rev Author: d_pocock Date: 2012-04-19 15:26:04 +0000 (Thu, 19 Apr 2012) Log Message: ----------- Use libcares. Add bdb v4.8 to include/lib paths. Modified Paths: -------------- csw/mgar/pkg/resiprocate/trunk/Makefile Modified: csw/mgar/pkg/resiprocate/trunk/Makefile =================================================================== --- csw/mgar/pkg/resiprocate/trunk/Makefile 2012-04-19 13:44:55 UTC (rev 17778) +++ csw/mgar/pkg/resiprocate/trunk/Makefile 2012-04-19 15:26:04 UTC (rev 17779) @@ -18,8 +18,13 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-nls CONFIGURE_ARGS += --with-ssl -CONFIGURE_ARGS += --enable-ipv6 +#CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --with-c-ares +BDB_HOME = $(prefix)/bdb48 +EXTRA_LIB = $(BDB_HOME)/lib +EXTRA_INC = $(BDB_HOME)/include + # There are multiple test suites, regular `make check' and tfm TEST_SCRIPTS = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Apr 19 17:26:46 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 19 Apr 2012 15:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17780] csw/mgar/pkg/resiprocate/trunk/checksums Message-ID: Revision: 17780 http://gar.svn.sourceforge.net/gar/?rev=17780&view=rev Author: d_pocock Date: 2012-04-19 15:26:45 +0000 (Thu, 19 Apr 2012) Log Message: ----------- Add checksum of trial 1.8.0 tarball Added Paths: ----------- csw/mgar/pkg/resiprocate/trunk/checksums Added: csw/mgar/pkg/resiprocate/trunk/checksums =================================================================== --- csw/mgar/pkg/resiprocate/trunk/checksums (rev 0) +++ csw/mgar/pkg/resiprocate/trunk/checksums 2012-04-19 15:26:45 UTC (rev 17780) @@ -0,0 +1 @@ +839d70c0340297499cec4acdb524e704 resiprocate-1.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Fri Apr 20 01:11:24 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 19 Apr 2012 23:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17781] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 17781 http://gar.svn.sourceforge.net/gar/?rev=17781&view=rev Author: d_pocock Date: 2012-04-19 23:11:24 +0000 (Thu, 19 Apr 2012) Log Message: ----------- ganglia: update for 3.3.7 Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-04-19 15:26:45 UTC (rev 17780) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-04-19 23:11:24 UTC (rev 17781) @@ -1,5 +1,5 @@ NAME = ganglia -VERSION = 3.3.5 +VERSION = 3.3.7 VERSION_U = $(subst .,-,$(VERSION)) # Unit tests don't seem to run on Solaris, so it is disabled # As soon as Ganglia test cases are fixed to run on Solaris, Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2012-04-19 15:26:45 UTC (rev 17780) +++ csw/mgar/pkg/ganglia/trunk/checksums 2012-04-19 23:11:24 UTC (rev 17781) @@ -1 +1 @@ -a5b1c98b7e460cc43be0c527f40fea1b ganglia-3.3.5.tar.gz +2e355b72af2487bb0669bfc7a38ed929 ganglia-3.3.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 20 02:03:53 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 20 Apr 2012 00:03:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17782] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 17782 http://gar.svn.sourceforge.net/gar/?rev=17782&view=rev Author: wilbury Date: 2012-04-20 00:03:53 +0000 (Fri, 20 Apr 2012) Log Message: ----------- squid/branches/squid3: Upgrade to 3.1.19, work in progress. Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-04-19 23:11:24 UTC (rev 17781) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-04-20 00:03:53 UTC (rev 17782) @@ -4,7 +4,7 @@ NAME = squid VERSION = 3.1 CATEGORIES = server -RELEASE = 18 +RELEASE = 19 DISTVERSION = $(VERSION).$(RELEASE) DISTNAME = squid-$(DISTVERSION) RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') @@ -41,12 +41,12 @@ MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/ DISTFILES = squid-$(DISTVERSION).tar.bz2 -PATCHFILES = 0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch -PATCHFILES += 0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch -PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch -PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch -PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch -PATCHFILES += 0006-Use-default-cache_dir.patch +#PATCHFILES = 0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch +#PATCHFILES += 0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch +#PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch +#PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch +#PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch +#PATCHFILES += 0006-Use-default-cache_dir.patch sysconfdir = /etc/opt/csw/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Apr 20 02:07:04 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 20 Apr 2012 00:07:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17783] csw/mgar/pkg/squid/branches/squid3/checksums Message-ID: Revision: 17783 http://gar.svn.sourceforge.net/gar/?rev=17783&view=rev Author: wilbury Date: 2012-04-20 00:07:04 +0000 (Fri, 20 Apr 2012) Log Message: ----------- squid/branches/squid3: Upgrade to 3.1.19, work in progress. Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/checksums Modified: csw/mgar/pkg/squid/branches/squid3/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid3/checksums 2012-04-20 00:03:53 UTC (rev 17782) +++ csw/mgar/pkg/squid/branches/squid3/checksums 2012-04-20 00:07:04 UTC (rev 17783) @@ -1 +1 @@ -b53f8fb6e22551c2a7376292df5b6ec7 squid-3.1.18.tar.bz2 +9b6ffaf96bee8f05f0085bc6361d7c94 squid-3.1.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 20 03:25:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Apr 2012 01:25:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[17784] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 17784 http://gar.svn.sourceforge.net/gar/?rev=17784&view=rev Author: bdwalton Date: 2012-04-20 01:25:43 +0000 (Fri, 20 Apr 2012) Log Message: ----------- gdal/trunk: overhaul of library deps and a few other tweaks Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 00:07:04 UTC (rev 17783) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 01:25:43 UTC (rev 17784) @@ -9,6 +9,8 @@ GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for data translation and processing. endef +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-the-use-of-CSWbash.patch @@ -17,44 +19,42 @@ CATALOGNAME_CSWgdal = gdal SPKG_DESC_CSWgdal = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 -RUNTIME_DEP_PKGS_CSWgdal += CSWcurlrt -RUNTIME_DEP_PKGS_CSWgdal += CSWexpat -RUNTIME_DEP_PKGS_CSWgdal += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWgdal += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWgdal += CSWgiflibrt -RUNTIME_DEP_PKGS_CSWgdal += CSWhdf5rt +RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibhdf5-7 RUNTIME_DEP_PKGS_CSWgdal += CSWjasper -RUNTIME_DEP_PKGS_CSWgdal += CSWjpeg -RUNTIME_DEP_PKGS_CSWgdal += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdal += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibnetcdf6 RUNTIME_DEP_PKGS_CSWgdal += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWgdal += CSWoldaprt -RUNTIME_DEP_PKGS_CSWgdal += CSWosslrt -RUNTIME_DEP_PKGS_CSWgdal += CSWpng -RUNTIME_DEP_PKGS_CSWgdal += CSWtiff -RUNTIME_DEP_PKGS_CSWgdal += CSWzlib +RUNTIME_DEP_PKGS_CSWgdal += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibnetcdf7 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient15 PACKAGES += CSWlibgdal1 CATALOGNAME_CSWlibgdal1 = libgdal1 SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWcurlrt -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWexpat -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgiflibrt -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWhdf5rt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf6 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWoldaprt -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWpng -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWtiff -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) @@ -72,8 +72,7 @@ CONFIGURE_ARGS += --with-libtiff=$(prefix) CONFIGURE_ARGS += --with-jpeg=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5/bin/mysql_config - +CONFIGURE_ARGS += --with-mysql=/opt/csw/bin/mysql_config CONFIGURE_ARGS += --with-sqlite3=$(prefix) # doesn't have tests? @@ -81,6 +80,8 @@ LICENSE = LICENSE.TXT +EXTRA_LIB += /opt/csw/postgresql/lib + include gar/category.mk ifeq ($(GARCH),sparc) @@ -88,3 +89,6 @@ else CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config endif + +# to avoid the __sync_fetch_and_add4 issue (must be after including category) +ARCHFLAGS_GCC4_sparcvv8 = -m32 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 Apr 20 09:54:46 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 20 Apr 2012 07:54:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17785] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 17785 http://gar.svn.sourceforge.net/gar/?rev=17785&view=rev Author: cgrzemba Date: 2012-04-20 07:54:46 +0000 (Fri, 20 Apr 2012) Log Message: ----------- cups/trunk: use openslp from OpenCSW, Mantis 4936 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-04-20 01:25:43 UTC (rev 17784) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-04-20 07:54:46 UTC (rev 17785) @@ -65,7 +65,7 @@ LICENSE = LICENSE.txt -GARCOMPILER ?= SOS12U3 +GARCOMPILER ?= SOS12 # SOS12U3 BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWlibjpeg-dev @@ -318,6 +318,8 @@ CONFIGURE_ARGS += --localedir=$(datadir)/locale CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS += --with-openslp-includes=/opt/csw/include +CONFIGURE_ARGS += --with-openslp-lib=/opt/csw/lib # This breaks non-global sparse zone support. The class action script is # executed in the global zone, but not in the non-global zones, if /opt is 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 Apr 20 12:34:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Apr 2012 10:34:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[17786] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 17786 http://gar.svn.sourceforge.net/gar/?rev=17786&view=rev Author: dmichelsen Date: 2012-04-20 10:34:05 +0000 (Fri, 20 Apr 2012) Log Message: ----------- mGAR v2: Export Sun Studio fortran compiler definitions for F77 and FC Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-04-20 07:54:46 UTC (rev 17785) +++ csw/mgar/gar/v2/gar.conf.mk 2012-04-20 10:34:05 UTC (rev 17786) @@ -799,7 +799,7 @@ ifeq ($(origin COMPILER_EXPORTS), undefined) COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS -COMPILER_EXPORTS += FFLAGS FCFLAGS +COMPILER_EXPORTS += FFLAGS FCFLAGS F77 FC COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION endif 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 Apr 20 12:47:52 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Apr 2012 10:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17787] csw/mgar/pkg/libtool/trunk/files/ 0002-Forward-port-GCC-tags-patch.patch Message-ID: Revision: 17787 http://gar.svn.sourceforge.net/gar/?rev=17787&view=rev Author: dmichelsen Date: 2012-04-20 10:47:52 +0000 (Fri, 20 Apr 2012) Log Message: ----------- libtool/trunk: Adjust to new gcc 4.6 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch Modified: csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch =================================================================== --- csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch 2012-04-20 10:34:05 UTC (rev 17786) +++ csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch 2012-04-20 10:47:52 UTC (rev 17787) @@ -60,7 +60,7 @@ + . /opt/csw/share/libtool/gcc3.conf + tagspath=/opt/csw/share/libtool/gcc3.tags + ;; -+ /opt/csw/gcc4/bin/*) ++ /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/gcc-4.6) + . /opt/csw/share/libtool/gcc4.conf + tagspath=/opt/csw/share/libtool/gcc4.tags + ;; 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 Apr 20 15:04:53 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 20 Apr 2012 13:04:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17788] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17788 http://gar.svn.sourceforge.net/gar/?rev=17788&view=rev Author: cgrzemba Date: 2012-04-20 13:04:52 +0000 (Fri, 20 Apr 2012) Log Message: ----------- netsnmp/trunk: correct Makefile.PL patch for version 5.6.1.1 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-20 10:47:52 UTC (rev 17787) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-20 13:04:52 UTC (rev 17788) @@ -102,6 +102,12 @@ include gar/category.mk +pre-configure-modulated: + cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force + cd $(WORKSRC) && autoreconf + @$(MAKECOOKIE) + + #post-install-isa-sparcv8: # ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) # ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-20 10:47:52 UTC (rev 17787) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-20 13:04:52 UTC (rev 17788) @@ -1,84 +1,66 @@ -diff -ru ../build-global/net-snmp-5.4.2.1/perl/ASN/Makefile.PL net-snmp-5.4.2.1/perl/ASN/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/ASN/Makefile.PL 2007-05-31 00:53:09.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/ASN/Makefile.PL 2009-03-25 07:57:32.952968532 +0100 -@@ -83,6 +83,7 @@ - $lib_version = `$opts->{'nsconfig'} --version`; - - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - } -diff -ru ../build-global/net-snmp-5.4.2.1/perl/OID/Makefile.PL net-snmp-5.4.2.1/perl/OID/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/OID/Makefile.PL 2007-05-31 00:53:09.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/OID/Makefile.PL 2009-03-25 07:56:23.529120339 +0100 -@@ -81,6 +81,7 @@ - $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; - $lib_version = `$opts->{'nsconfig'} --version`; - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - # } else { -diff -ru ../build-global/net-snmp-5.4.2.1/perl/SNMP/Makefile.PL net-snmp-5.4.2.1/perl/SNMP/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/SNMP/Makefile.PL 2007-05-31 00:53:09.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/SNMP/Makefile.PL 2009-03-25 07:55:07.873218952 +0100 -@@ -93,6 +93,7 @@ - } - $lib_version = `$opts->{'nsconfig'} --version`; - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - # } else { -diff -ru ../build-global/net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL 2007-06-18 16:10:08.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL 2009-03-25 07:56:01.868833181 +0100 -@@ -119,6 +119,7 @@ - } - - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - } else { -diff -ru ../build-global/net-snmp-5.4.2.1/perl/agent/Makefile.PL net-snmp-5.4.2.1/perl/agent/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/agent/Makefile.PL 2007-05-31 00:53:09.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/agent/Makefile.PL 2009-03-25 07:57:09.785808710 +0100 -@@ -87,6 +87,7 @@ - $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; - $lib_version = `$opts->{'nsconfig'} --version`; - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - # } else { -diff -ru ../build-global/net-snmp-5.4.2.1/perl/default_store/Makefile.PL net-snmp-5.4.2.1/perl/default_store/Makefile.PL ---- ../build-global/net-snmp-5.4.2.1/perl/default_store/Makefile.PL 2007-05-31 00:53:09.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/default_store/Makefile.PL 2009-03-25 07:51:02.425647655 +0100 -@@ -76,6 +76,7 @@ - $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; - $lib_version = `$opts->{'nsconfig'} --version`; - if (lc($opts->{'insource'}) eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; - $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'}; - } ---- ../build-global/net-snmp-5.4.2.1/perl/agent/default_store/Makefile.PL 2007-05-25 01:15:36.000000000 +0200 -+++ net-snmp-5.4.2.1/perl/agent/default_store/Makefile.PL 2009-03-25 10:56:34.665497642 +0100 -@@ -69,6 +69,7 @@ +--- a/perl/ASN/Makefile.PL ++++ b/perl/ASN/Makefile.PL +@@ -74,7 +74,7 @@ sub InitMakeParams { + else + { + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; + chomp($Params{'LIBS'}); + $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; +--- a/perl/OID/Makefile.PL ++++ b/perl/OID/Makefile.PL +@@ -73,7 +73,7 @@ sub InitMakeParams { } else { - $opts = NetSNMPGetOpts("../../"); -+ $Params{'LDDLFLAGS'} = "-L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; + chomp($Params{'LIBS'}); + $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; +--- a/perl/SNMP/Makefile.PL ++++ b/perl/SNMP/Makefile.PL +@@ -77,7 +77,7 @@ sub InitMakeParams { + } + else { + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + if (!$ENV{'NETSNMP_LIBS'}) { + $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; + chomp($Params{'LIBS'}); +--- a/perl/TrapReceiver/Makefile.PL ++++ b/perl/TrapReceiver/Makefile.PL +@@ -106,7 +106,7 @@ sub InitMakeParams { + } + else { + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + $Params{'LIBS'} = '-lnetsnmptrapd ' . `$opts->{'nsconfig'} --base-agent-libs`; + chomp($Params{'LIBS'}); + if (!$ENV{'NETSNMP_CCFLAGS'}) { +--- a/perl/agent/Makefile.PL ++++ b/perl/agent/Makefile.PL +@@ -78,7 +78,7 @@ sub InitMakeParams { + } + else { + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; + $Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`; + chomp($Params{'LIBS'}); + $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; +--- a/perl/default_store/Makefile.PL ++++ b/perl/default_store/Makefile.PL +@@ -68,7 +68,7 @@ sub InitMakeParams { + } + else { + $opts = NetSNMPGetOpts(); +- $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; -@@ -76,6 +77,7 @@ - $Params{'CCFLAGS'} .= " " . $Config{'ccflags'}; - $lib_version = `$opts->{'nsconfig'} --version`; - if ($opts->{'insource'} eq "true") { -+ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ -L/opt/csw/lib -lperl " . $Params{'LDDLFLAGS'}; - $Params{'LIBS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LIBS'}; - $Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'}; - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Apr 20 19:57:10 2012 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 20 Apr 2012 17:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17789] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 17789 http://gar.svn.sourceforge.net/gar/?rev=17789&view=rev Author: jake_goerzen Date: 2012-04-20 17:57:09 +0000 (Fri, 20 Apr 2012) Log Message: ----------- wesnoth/trunk: update to version 1.10.2 Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2012-04-20 13:04:52 UTC (rev 17788) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2012-04-20 17:57:09 UTC (rev 17789) @@ -1,5 +1,8 @@ +# NOTE: Autotools build depreciated switching to cmake. +# NOTE: cmake finds boost library but "mgar build" step can't find boost +# headers and setting EXTRA_INC or EXTRA_CPPFLAGS doesn't help. NAME = wesnoth -VERSION = 1.6.5 +VERSION = 1.10.2 CATEGORIES = apps GARTYPE = v2 @@ -16,53 +19,20 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*) -PATCHFILES = language.cpp.diff -PATCHFILES += configure.diff -PATCHFILES += global.hpp.diff -PATCHFILES += generator_private.hpp.diff -PATCHFILES += image.cpp.diff -PATCHFILES += marked-up_text.cpp.diff -PATCHFILES += simple_wml.cpp.diff -PATCHFILES += time.hpp.diff +NOGITPATCH = 1 -RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt -RUNTIME_DEP_PKGS_CSWwesnoth += CSWfconfig -RUNTIME_DEP_PKGS_CSWwesnoth += CSWggettextrt -RUNTIME_DEP_PKGS_CSWwesnoth += CSWglib2 -RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibcairo -RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl -RUNTIME_DEP_PKGS_CSWwesnoth += CSWpango -RUNTIME_DEP_PKGS_CSWwesnoth += CSWpng -RUNTIME_DEP_PKGS_CSWwesnoth += CSWpython -RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage -RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlmixer -RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlnet -RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlttf -RUNTIME_DEP_PKGS_CSWwesnoth += CSWstlport -RUNTIME_DEP_PKGS_CSWwesnoth += CSWsunmath -RUNTIME_DEP_PKGS_CSWwesnoth += CSWzlib +EXTRA_INC = /opt/csw/gxx/include -CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby +GARCOMPILER = GNU -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so -L. - -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig -CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' -CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lnsl -lresolv -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0' -CONFIGURE_ARGS += PANGO_CFLAGS='-I/opt/csw/include/pango-1.0 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/cairo' -CONFIGURE_ARGS += PANGO_LIBS='-L/opt/csw/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl' -CONFIGURE_ARGS += LUA_CFLAGS=-I/opt/csw/include -CONFIGURE_ARGS += LUA_LIBS=-L/opt/csw/lib -CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run -CONFIGURE_ARGS += --enable-server -CONFIGURE_ARGS += --enable-tools -CONFIGURE_ARGS += --enable-editor -CONFIGURE_ARGS += --with-boost=/opt/csw -CONFIGURE_ARGS += --disable-strict-compilation -CONFIGURE_ARGS += --with-zlib-prefix=/opt/csw - TEST_SCRIPTS = +CONFIGURE_SCRIPTS = custom + include gar/category.mk + +# Autotools build depreciated now using cmake +configure-custom: + + cd $(WORKSRC) && /opt/csw/bin/cmake -DCMAKE_INSTALL_PREFIX=/opt/csw -DBOOST_INCLUDEDIR=/opt/csw/gxx/include . + @$(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2012-04-20 13:04:52 UTC (rev 17788) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2012-04-20 17:57:09 UTC (rev 17789) @@ -1,9 +1 @@ -89db4313293372653371a66171268e4a configure.diff -160398f59781477186c4ae0502d3beb2 generator_private.hpp.diff -21dfaf10701d0f3a58c25d79a99cff1a global.hpp.diff -5c51a1a28e56d5725f99841dbbc30530 image.cpp.diff -59968804e93a18220d7d18e8252fff8d language.cpp.diff -29edd308920e8e44317fffb92eb19eb4 marked-up_text.cpp.diff -3a8d9b365df3c142bac7dd4188e963b5 simple_wml.cpp.diff -57b2396fad674a80f0dd1edab3e3063c time.hpp.diff -493826bbd9ba355930765a7e8fe3749a wesnoth-1.6.5.tar.bz2 +61f93437ba13a27a048e5ee2ee63736a wesnoth-1.10.2.tar.bz2 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 Apr 20 21:41:59 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 20 Apr 2012 19:41:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17790] csw/mgar/pkg Message-ID: Revision: 17790 http://gar.svn.sourceforge.net/gar/?rev=17790&view=rev Author: pfelecan Date: 2012-04-20 19:41:58 +0000 (Fri, 20 Apr 2012) Log Message: ----------- migrated from a personal recipe to a gar based recipe. Added Paths: ----------- csw/mgar/pkg/lsdvd/ csw/mgar/pkg/lsdvd/Makefile csw/mgar/pkg/lsdvd/branches/ csw/mgar/pkg/lsdvd/tags/ csw/mgar/pkg/lsdvd/trunk/ csw/mgar/pkg/lsdvd/trunk/Makefile csw/mgar/pkg/lsdvd/trunk/checksums csw/mgar/pkg/lsdvd/trunk/files/ Added: csw/mgar/pkg/lsdvd/Makefile =================================================================== --- csw/mgar/pkg/lsdvd/Makefile (rev 0) +++ csw/mgar/pkg/lsdvd/Makefile 2012-04-20 19:41:58 UTC (rev 17790) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lsdvd/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lsdvd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsdvd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lsdvd/trunk/Makefile 2012-04-20 19:41:58 UTC (rev 17790) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = lsdvd +VERSION = 0.16 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = print information about the contents and structure of a DVD +define BLURB + Print information about the contents and structure of a DVD +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +BUILD_DEP_PKGS = CSWlibdvdreaddevel +RUNTIME_DEP_PKGS = CSWlibdvdread +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU + +include gar/category.mk + Property changes on: csw/mgar/pkg/lsdvd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lsdvd/trunk/checksums =================================================================== --- csw/mgar/pkg/lsdvd/trunk/checksums (rev 0) +++ csw/mgar/pkg/lsdvd/trunk/checksums 2012-04-20 19:41:58 UTC (rev 17790) @@ -0,0 +1 @@ +340e1abe5c5e5abf7ff8031e78f49ee7 lsdvd-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 20 22:06:52 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17791] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 17791 http://gar.svn.sourceforge.net/gar/?rev=17791&view=rev Author: bdwalton Date: 2012-04-20 20:06:52 +0000 (Fri, 20 Apr 2012) Log Message: ----------- gdal/trunk: these libs are c++ and we use g++ to build them so move to gxx prefix Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 19:41:58 UTC (rev 17790) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 20:06:52 UTC (rev 17791) @@ -66,6 +66,9 @@ GARCOMPILER = GNU +# c++ libraries, so move things around a bit +prefix = /opt/csw/gxx + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Apr 20 22:10:12 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:10:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17792] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 17792 http://gar.svn.sourceforge.net/gar/?rev=17792&view=rev Author: bdwalton Date: 2012-04-20 20:10:11 +0000 (Fri, 20 Apr 2012) Log Message: ----------- gdal/trunk: link bin files from /opt/csw/gxx to traditional csw bin directory Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 20:06:52 UTC (rev 17791) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 20:10:11 UTC (rev 17792) @@ -95,3 +95,10 @@ # to avoid the __sync_fetch_and_add4 issue (must be after including category) ARCHFLAGS_GCC4_sparcvv8 = -m32 + +post-merge: + @( cd $(PKGROOT)/opt/csw; mkdir bin; cd bin; \ + for f in ../gxx/bin/*; do \ + gln -s $$f; \ + done; ) + @$(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 Fri Apr 20 22:38:59 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:38:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17793] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 17793 http://gar.svn.sourceforge.net/gar/?rev=17793&view=rev Author: chninkel Date: 2012-04-20 20:38:59 +0000 (Fri, 20 Apr 2012) Log Message: ----------- openssl: updated to 0.9.8v Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2012-04-20 20:10:11 UTC (rev 17792) +++ csw/mgar/pkg/openssl/trunk/Makefile 2012-04-20 20:38:59 UTC (rev 17793) @@ -16,7 +16,7 @@ ###### Package information ####### NAME = openssl -VERSION = 0.9.8t +VERSION = 0.9.8v CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2012-04-20 20:10:11 UTC (rev 17792) +++ csw/mgar/pkg/openssl/trunk/checksums 2012-04-20 20:38:59 UTC (rev 17793) @@ -1 +1 @@ -f5dabb7ffb068eecf245f1b2151df100 openssl-0.9.8t.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce openssl-0.9.8v.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2012-04-20 20:10:11 UTC (rev 17792) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2012-04-20 20:38:59 UTC (rev 17793) @@ -1,3 +1,10 @@ +openssl (0.9.8v,REV=2012.04.20) unstable + + * New upstream release. + * Enabled PKCS11 crypto-engine. + + -- Yann Rouillard Fri, 20 Apr 2012 22:35:55 +0200 + openssl (0.9.8t,REV=2012.01.21) 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 Fri Apr 20 22:48:44 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17794] csw/mgar/pkg/bash/trunk Message-ID: Revision: 17794 http://gar.svn.sourceforge.net/gar/?rev=17794&view=rev Author: chninkel Date: 2012-04-20 20:48:43 +0000 (Fri, 20 Apr 2012) Log Message: ----------- bash: updated to patch level 24 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 2012-04-20 20:38:59 UTC (rev 17793) +++ csw/mgar/pkg/bash/trunk/Makefile 2012-04-20 20:48:43 UTC (rev 17794) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = bash -VERSION = 4.2.10 +VERSION = 4.2.24 CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2012-04-20 20:38:59 UTC (rev 17793) +++ csw/mgar/pkg/bash/trunk/checksums 2012-04-20 20:48:43 UTC (rev 17794) @@ -9,3 +9,17 @@ 24c574bf6d6a581e300823d9c1276af6 bash42-008 4c5835f2fbab36c4292bb334977e5b6d bash42-009 0a51602b535ef661ee707be6c8bdb373 bash42-010 +58deacf3d57cbd75575444ff6a3b0806 bash42-011 +72d5059820015231483bb7415d09e9db bash42-012 +608336ebe215984ef126e3c29d2d3409 bash42-013 +ed19da878e3f630834c62b9d9dcc6fce bash42-014 +2d07daba0b8ca8f876d2aa052ff594b4 bash42-015 +53d246537e1fffd1aaa02ba5c056211c bash42-016 +304fd129a58fee2d8a34f8b4704db0aa bash42-017 +6921a0b4228fe89b6537a5c29f027c89 bash42-018 +1195d85447f3d048d2c9bcd075fa765c bash42-019 +b09000bba08da6ac753124593850cdf7 bash42-020 +09d3f96a16b881334cfaee0cf320b47e bash42-021 +597bf71a2aac6feb510b7505cdd3d4f7 bash42-022 +3fab459b4e09daea529cacad025b13b3 bash42-023 +4ad8d11e72afc6090e701073ff034cf4 bash42-024 Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2012-04-20 20:38:59 UTC (rev 17793) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2012-04-20 20:48:43 UTC (rev 17794) @@ -1,3 +1,9 @@ +bash (4.2.24,REV=2012.04.20) unstable + + * Added bash patches bash42-011 and bash42-024. + + -- Yann Rouillard Fri, 20 Apr 2012 22:41:44 +0200 + bash (4.2.10,REV=2011.07.21) 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 Fri Apr 20 22:50:08 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:50:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17795] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 17795 http://gar.svn.sourceforge.net/gar/?rev=17795&view=rev Author: chninkel Date: 2012-04-20 20:50:08 +0000 (Fri, 20 Apr 2012) Log Message: ----------- lftp: updated to 4.3.6 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2012-04-20 20:48:43 UTC (rev 17794) +++ csw/mgar/pkg/lftp/trunk/Makefile 2012-04-20 20:50:08 UTC (rev 17795) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = lftp -VERSION = 4.3.4 +VERSION = 4.3.6 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2012-04-20 20:48:43 UTC (rev 17794) +++ csw/mgar/pkg/lftp/trunk/checksums 2012-04-20 20:50:08 UTC (rev 17795) @@ -1 +1 @@ -2f9fc66597e869f3375b28d7ab42692e lftp-4.3.4.tar.gz +a732dcf66a973cbeeba246053dd35f84 lftp-4.3.6.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2012-04-20 20:48:43 UTC (rev 17794) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2012-04-20 20:50:08 UTC (rev 17795) @@ -1,3 +1,9 @@ +lftp (4.3.6,REV=2012.04.20) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 20 Apr 2012 22:46:45 +0200 + lftp (4.3.4,REV=2012.01.21) 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 Fri Apr 20 22:57:23 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 20:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17796] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 17796 http://gar.svn.sourceforge.net/gar/?rev=17796&view=rev Author: chninkel Date: 2012-04-20 20:57:23 +0000 (Fri, 20 Apr 2012) Log Message: ----------- vsftpd: updated to 3.0.0 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2012-04-20 20:50:08 UTC (rev 17795) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2012-04-20 20:57:23 UTC (rev 17796) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = vsftpd -VERSION = 2.3.4 +VERSION = 3.0.0 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2012-04-20 20:50:08 UTC (rev 17795) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2012-04-20 20:57:23 UTC (rev 17796) @@ -1 +1 @@ -2ea5d19978710527bb7444d93b67767a vsftpd-2.3.4.tar.gz +ad9fa952558c2c5b0426ccaccff0f972 vsftpd-3.0.0.tar.gz Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-04-20 20:50:08 UTC (rev 17795) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-04-20 20:57:23 UTC (rev 17796) @@ -1,3 +1,9 @@ +vsftpd (3.0.0,REV=2012.04.20) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 20 Apr 2012 22:52:55 +0200 + vsftpd (2.3.4,REV=2011.07.19) 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 Fri Apr 20 23:06:32 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 21:06:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17797] csw/mgar/pkg/bash/trunk Message-ID: Revision: 17797 http://gar.svn.sourceforge.net/gar/?rev=17797&view=rev Author: chninkel Date: 2012-04-20 21:06:32 +0000 (Fri, 20 Apr 2012) Log Message: ----------- bash: updated iconv dependancy name 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 2012-04-20 20:57:23 UTC (rev 17796) +++ csw/mgar/pkg/bash/trunk/Makefile 2012-04-20 21:06:32 UTC (rev 17797) @@ -28,7 +28,7 @@ PACKAGES = CSWbash RUNTIME_DEP_PKGS = CSWlibintl8 -RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWlibiconv2 SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2012-04-20 20:57:23 UTC (rev 17796) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2012-04-20 21:06:32 UTC (rev 17797) @@ -1,6 +1,7 @@ bash (4.2.24,REV=2012.04.20) unstable * Added bash patches bash42-011 and bash42-024. + * Updated dependancy names (CSWiconv -> CSWlibiconv2) -- Yann Rouillard Fri, 20 Apr 2012 22:41:44 +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 Fri Apr 20 23:36:32 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 20 Apr 2012 21:36:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17798] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 17798 http://gar.svn.sourceforge.net/gar/?rev=17798&view=rev Author: chninkel Date: 2012-04-20 21:36:32 +0000 (Fri, 20 Apr 2012) Log Message: ----------- lftp/trunk: updated openssl dependancy name 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 2012-04-20 21:06:32 UTC (rev 17797) +++ csw/mgar/pkg/lftp/trunk/Makefile 2012-04-20 21:36:32 UTC (rev 17798) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS = CSWlibexpat1 RUNTIME_DEP_PKGS += CSWlibiconv2 -RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWlibssl0-9-8 RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibreadline6 Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2012-04-20 21:06:32 UTC (rev 17797) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2012-04-20 21:36:32 UTC (rev 17798) @@ -1,6 +1,7 @@ lftp (4.3.6,REV=2012.04.20) unstable * New upstream release. + * Updayed dependancy name: = CSWosslrt -> CSWlibssl0-9-8 -- Yann Rouillard Fri, 20 Apr 2012 22:46:45 +0200 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 Apr 21 02:12:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 00:12:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17799] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 17799 http://gar.svn.sourceforge.net/gar/?rev=17799&view=rev Author: bdwalton Date: 2012-04-21 00:12:25 +0000 (Sat, 21 Apr 2012) Log Message: ----------- gdal/trunk: only put libdir under gxx, leaving everything else in a normal location Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 21:36:32 UTC (rev 17798) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-04-21 00:12:25 UTC (rev 17799) @@ -62,12 +62,12 @@ CATALOGNAME_CSWgdal-dev = gdal_dev SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 -PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config GARCOMPILER = GNU # c++ libraries, so move things around a bit -prefix = /opt/csw/gxx +libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(prefix) @@ -95,10 +95,3 @@ # to avoid the __sync_fetch_and_add4 issue (must be after including category) ARCHFLAGS_GCC4_sparcvv8 = -m32 - -post-merge: - @( cd $(PKGROOT)/opt/csw; mkdir bin; cd bin; \ - for f in ../gxx/bin/*; do \ - gln -s $$f; \ - done; ) - @$(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 Sat Apr 21 14:19:35 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Apr 2012 12:19:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17800] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 17800 http://gar.svn.sourceforge.net/gar/?rev=17800&view=rev Author: chninkel Date: 2012-04-21 12:19:34 +0000 (Sat, 21 Apr 2012) Log Message: ----------- vsftpd/trunk: updated depandancy name and Makefile patch Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch Added Paths: ----------- csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2012-04-21 00:12:25 UTC (rev 17799) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2012-04-21 12:19:34 UTC (rev 17800) @@ -31,8 +31,8 @@ PACKAGES = CSWvsftpd -RUNTIME_DEP_PKGS = CSWtcpwrap -RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS = CSWlibwrap1 +RUNTIME_DEP_PKGS += CSWlibssl0-9-8 # Reference to DTD path, can be safely ignored CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswvsftpd.xml @@ -91,6 +91,10 @@ # vsftpd makfile PATCHFILES += destdir.patch +# patch to avoid an incompatible pointer type +# error when compiling under Solaris with -Werror +PATCHFILES += avoid_pam_conv_warning.patch + # Documentation files DOCFILES = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security Added: csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch (rev 0) +++ csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch 2012-04-21 12:19:34 UTC (rev 17800) @@ -0,0 +1,30 @@ +--- vsftpd-3.0.0.orig/sysdeputil.c Fri Mar 26 04:25:33 2010 ++++ vsftpd-3.0.0/sysdeputil.c Fri Apr 20 23:50:22 2012 +@@ -313,8 +313,13 @@ + + static pam_handle_t* s_pamh; + static struct mystr s_pword_str; ++#if defined(sun) && defined(__SVR4) ++static int pam_conv_func(int nmsg, struct pam_message** p_msg, ++ struct pam_response** p_reply, void* p_addata); ++#else + static int pam_conv_func(int nmsg, const struct pam_message** p_msg, + struct pam_response** p_reply, void* p_addata); ++#endif + static void vsf_auth_shutdown(void); + + int +@@ -442,8 +447,13 @@ + } + + static int ++#if defined(sun) && defined(__SVR4) ++pam_conv_func(int nmsg, struct pam_message** p_msg, ++ struct pam_response** p_reply, void* p_addata) ++#else + pam_conv_func(int nmsg, const struct pam_message** p_msg, + struct pam_response** p_reply, void* p_addata) ++#endif + { + int i; + struct pam_response* p_resps = 0; Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-04-21 00:12:25 UTC (rev 17799) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-04-21 12:19:34 UTC (rev 17800) @@ -1,6 +1,11 @@ vsftpd (3.0.0,REV=2012.04.20) unstable * New upstream release. + * Added avoid_pam_conv_warning.patch to avoid an incompatible + pointer type error. + * Updated dependancy name: + CSWtcpwrap -> CSWlibwrap1 + CSWosslrt -> CSWlibssl0-9-8 -- Yann Rouillard Fri, 20 Apr 2012 22:52:55 +0200 Modified: csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch 2012-04-21 00:12:25 UTC (rev 17799) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch 2012-04-21 12:19:34 UTC (rev 17800) @@ -1,18 +1,19 @@ -diff --speed-large-files --minimal -Nru vsftpd-2.0.4.orig/Makefile vsftpd-2.0.4/Makefile ---- vsftpd-2.0.4.orig/Makefile 2006-04-12 18:18:06.382923000 -0400 -+++ vsftpd-2.0.4/Makefile 2006-04-12 18:17:58.522360000 -0400 -@@ -1,9 +1,9 @@ +--- vsftpd-3.0.0.orig/Makefile Tue Apr 3 09:21:18 2012 ++++ vsftpd-3.0.0/Makefile Sat Apr 21 13:59:59 2012 +@@ -1,16 +1,8 @@ # Makefile for systems with GNU tools -CC = gcc -+ -INSTALL = install -+ -IFLAGS = -idirafter dummyinc -+ #CFLAGS = -g --CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion -+ +-CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ +- -Wall -W -Wshadow -Werror -Wformat-security \ +- -D_FORTIFY_SOURCE=2 \ +- #-pedantic -Wconversion LIBS = `./vsf_findlibs.sh` --LINK = -Wl,-s -+LINK = -Wl,-s $(LDFLAGS) + LINK = -Wl,-s +-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ + tunables.o ftpdataio.o secbuf.o ls.o \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Apr 21 17:50:41 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 21 Apr 2012 15:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17801] csw/mgar/pkg/lsdvd/trunk/Makefile Message-ID: Revision: 17801 http://gar.svn.sourceforge.net/gar/?rev=17801&view=rev Author: pfelecan Date: 2012-04-21 15:50:41 +0000 (Sat, 21 Apr 2012) Log Message: ----------- make package description start with an upper case letter Modified Paths: -------------- csw/mgar/pkg/lsdvd/trunk/Makefile Modified: csw/mgar/pkg/lsdvd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsdvd/trunk/Makefile 2012-04-21 12:19:34 UTC (rev 17800) +++ csw/mgar/pkg/lsdvd/trunk/Makefile 2012-04-21 15:50:41 UTC (rev 17801) @@ -6,7 +6,7 @@ GARTYPE = v2 CATEGORIES = apps -DESCRIPTION = print information about the contents and structure of a DVD +DESCRIPTION = Print information about the contents and structure of a DVD define BLURB Print information about the contents and structure of a DVD endef 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 Apr 21 18:44:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 16:44:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[17802] csw/mgar/pkg Message-ID: Revision: 17802 http://gar.svn.sourceforge.net/gar/?rev=17802&view=rev Author: bdwalton Date: 2012-04-21 16:44:20 +0000 (Sat, 21 Apr 2012) Log Message: ----------- commit stub recipe for grass Added Paths: ----------- csw/mgar/pkg/grass/ csw/mgar/pkg/grass/Makefile csw/mgar/pkg/grass/branches/ csw/mgar/pkg/grass/tags/ csw/mgar/pkg/grass/trunk/ csw/mgar/pkg/grass/trunk/Makefile csw/mgar/pkg/grass/trunk/checksums csw/mgar/pkg/grass/trunk/files/ Copied: csw/mgar/pkg/grass/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/grass/Makefile (rev 0) +++ csw/mgar/pkg/grass/Makefile 2012-04-21 16:44:20 UTC (rev 17802) @@ -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/grass/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + Added: csw/mgar/pkg/grass/trunk/Makefile =================================================================== --- csw/mgar/pkg/grass/trunk/Makefile (rev 0) +++ csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:44:20 UTC (rev 17802) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = grass +VERSION = x.y +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/grass/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/grass/trunk/checksums =================================================================== 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 Apr 21 18:52:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 16:52:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17803] csw/mgar/pkg/grass/trunk Message-ID: Revision: 17803 http://gar.svn.sourceforge.net/gar/?rev=17803&view=rev Author: bdwalton Date: 2012-04-21 16:52:54 +0000 (Sat, 21 Apr 2012) Log Message: ----------- grass/trunk: add basic info to recipe Modified Paths: -------------- csw/mgar/pkg/grass/trunk/Makefile csw/mgar/pkg/grass/trunk/checksums Modified: csw/mgar/pkg/grass/trunk/Makefile =================================================================== --- csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:44:20 UTC (rev 17802) +++ csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:52:54 UTC (rev 17803) @@ -1,28 +1,18 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) # NAME = grass -VERSION = x.y +VERSION = 6.4.2 GARTYPE = v2 -CATEGORIES = category +CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = Geographic Resources Analysis Support System define BLURB - Long description +Commonly referred to as GRASS, this is free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization. GRASS is currently used in academic and commercial settings around the world, as well as by many governmental agencies and environmental consulting companies. GRASS is an official project of the Open Source Geospatial Foundation. endef -MASTER_SITES = +MASTER_SITES = http://grass.osgeo.org/grass64/source/ DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/grass/trunk/checksums =================================================================== --- csw/mgar/pkg/grass/trunk/checksums 2012-04-21 16:44:20 UTC (rev 17802) +++ csw/mgar/pkg/grass/trunk/checksums 2012-04-21 16:52:54 UTC (rev 17803) @@ -0,0 +1 @@ +d3398d6b1e3a2ef19cfb6e39a5ae9919 grass-6.4.2.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 Apr 21 18:56:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 16:56:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17804] csw/mgar/pkg/proj/trunk/Makefile Message-ID: Revision: 17804 http://gar.svn.sourceforge.net/gar/?rev=17804&view=rev Author: bdwalton Date: 2012-04-21 16:56:48 +0000 (Sat, 21 Apr 2012) Log Message: ----------- proj/trunk: use standard gar tree Modified Paths: -------------- csw/mgar/pkg/proj/trunk/Makefile Modified: csw/mgar/pkg/proj/trunk/Makefile =================================================================== --- csw/mgar/pkg/proj/trunk/Makefile 2012-04-21 16:52:54 UTC (rev 17803) +++ csw/mgar/pkg/proj/trunk/Makefile 2012-04-21 16:56:48 UTC (rev 17804) @@ -3,7 +3,7 @@ VERSION = 4.7.0 CATEGORIES = lib -GARTYPE = v2-defaultchange +GARTYPE = v2 DESCRIPTION = Cartographic Projections Library define BLURB 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 Apr 21 18:58:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 16:58:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[17805] csw/mgar/pkg/grass/trunk/Makefile Message-ID: Revision: 17805 http://gar.svn.sourceforge.net/gar/?rev=17805&view=rev Author: bdwalton Date: 2012-04-21 16:58:38 +0000 (Sat, 21 Apr 2012) Log Message: ----------- grass/trunk: note a few build dependencies Modified Paths: -------------- csw/mgar/pkg/grass/trunk/Makefile Modified: csw/mgar/pkg/grass/trunk/Makefile =================================================================== --- csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:56:48 UTC (rev 17804) +++ csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:58:38 UTC (rev 17805) @@ -13,6 +13,11 @@ MASTER_SITES = http://grass.osgeo.org/grass64/source/ DISTFILES = $(DISTNAME).tar.gz +BUILD_DEP_PKGS += CSWgdal-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWproj_dev + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 21 19:03:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 17:03:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[17806] csw/mgar/pkg/grass/trunk/Makefile Message-ID: Revision: 17806 http://gar.svn.sourceforge.net/gar/?rev=17806&view=rev Author: bdwalton Date: 2012-04-21 17:03:36 +0000 (Sat, 21 Apr 2012) Log Message: ----------- grass/trunk: mark this as solaris 10 only due to gdal Modified Paths: -------------- csw/mgar/pkg/grass/trunk/Makefile Modified: csw/mgar/pkg/grass/trunk/Makefile =================================================================== --- csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 16:58:38 UTC (rev 17805) +++ csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 17:03:36 UTC (rev 17806) @@ -10,6 +10,9 @@ Commonly referred to as GRASS, this is free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization. GRASS is currently used in academic and commercial settings around the world, as well as by many governmental agencies and environmental consulting companies. GRASS is an official project of the Open Source Geospatial Foundation. endef +# libgdal is 10+ only +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + MASTER_SITES = http://grass.osgeo.org/grass64/source/ DISTFILES = $(DISTNAME).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 Apr 21 19:06:25 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 17:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17807] csw/mgar/pkg/grass/trunk/Makefile Message-ID: Revision: 17807 http://gar.svn.sourceforge.net/gar/?rev=17807&view=rev Author: bdwalton Date: 2012-04-21 17:06:25 +0000 (Sat, 21 Apr 2012) Log Message: ----------- grass/trunk: correct typo in build dep Modified Paths: -------------- csw/mgar/pkg/grass/trunk/Makefile Modified: csw/mgar/pkg/grass/trunk/Makefile =================================================================== --- csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 17:03:36 UTC (rev 17806) +++ csw/mgar/pkg/grass/trunk/Makefile 2012-04-21 17:06:25 UTC (rev 17807) @@ -19,7 +19,7 @@ BUILD_DEP_PKGS += CSWgdal-dev BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWlibncurses-dev -BUILD_DEP_PKGS += CSWproj_dev +BUILD_DEP_PKGS += CSWproj-dev CONFIGURE_ARGS = $(DIRPATHS) 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 Apr 22 00:05:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 21 Apr 2012 22:05:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17808] csw/mgar/pkg/geos/trunk Message-ID: Revision: 17808 http://gar.svn.sourceforge.net/gar/?rev=17808&view=rev Author: bdwalton Date: 2012-04-21 22:05:18 +0000 (Sat, 21 Apr 2012) Log Message: ----------- geos/trunk: version bump, use gxx libdir; solaris 10 only; patch a c++ on solaris w/g++ issue Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile csw/mgar/pkg/geos/trunk/checksums Added Paths: ----------- csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-21 17:06:25 UTC (rev 17807) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-21 22:05:18 UTC (rev 17808) @@ -1,6 +1,6 @@ # $Id$ NAME = geos -VERSION = 3.2.2 +VERSION = 3.3.3 CATEGORIES = lib GARTYPE = v2 @@ -9,8 +9,11 @@ GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS Simple Features for SQL spatial predicate functions and spatial operators, as well as specific JTS enhanced topology functions. endef +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch GARCOMPILER = GNU @@ -62,7 +65,11 @@ RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 OBSOLETED_BY_CSWlibgeos-dev = CSWgeos +# c++ libraries, so move things around a bit +libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-inline CONFIGURE_ARGS += --enable-ruby include gar/category.mk Modified: csw/mgar/pkg/geos/trunk/checksums =================================================================== --- csw/mgar/pkg/geos/trunk/checksums 2012-04-21 17:06:25 UTC (rev 17807) +++ csw/mgar/pkg/geos/trunk/checksums 2012-04-21 22:05:18 UTC (rev 17808) @@ -1 +1 @@ -c5d264acac22fe7720f85dadc1fc17c6 geos-3.2.2.tar.bz2 +8454e653d7ecca475153cc88fd1daa26 geos-3.3.3.tar.bz2 Added: csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch =================================================================== --- csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch (rev 0) +++ csw/mgar/pkg/geos/trunk/files/0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch 2012-04-21 22:05:18 UTC (rev 17808) @@ -0,0 +1,27 @@ +From 27c0baa1a85d3ae19d869979591cf41924a2c4b5 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 21 Apr 2012 23:01:26 +0200 +Subject: [PATCH] use namespace std on isnan when building on solaris with g++ + +Signed-off-by: Ben Walton +--- + include/geos/platform.h.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in +index effcdb5..2504b15 100644 +--- a/include/geos/platform.h.in ++++ b/include/geos/platform.h.in +@@ -95,6 +95,9 @@ extern "C" + // Hack for OS/X incorrectly re-defining isnan() into oblivion. + // It does leave a version in std. + # define ISNAN(x) (std::isnan(x)) ++# elif (defined(__sun) || defined(__sun__)) && defined(__GNUG__) ++# include ++# define ISNAN(x) (std::isnan(x)) + # elif defined(__sun) || defined(__sun__) + # include + # define ISNAN(x) (::isnan(x)) +-- +1.7.10 + 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 Apr 22 15:49:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Apr 2012 13:49:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17809] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17809 http://gar.svn.sourceforge.net/gar/?rev=17809&view=rev Author: bdwalton Date: 2012-04-22 13:49:18 +0000 (Sun, 22 Apr 2012) Log Message: ----------- subversion/trunk: correct destdir for python swig binding installation; drop a pile of temp overrides Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-21 22:05:18 UTC (rev 17808) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 13:49:18 UTC (rev 17809) @@ -64,129 +64,6 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 -# temporary include this to get it built to analyze ... -CHECKPKG_OVERRIDES_CSWrbsvn += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWpythonsvn += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibssl0-9-8 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWsvn -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibneon27 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibapr1-0 -CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWpmsvn += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.pyc - -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so.0 -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/libsvn_swig_py-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.a -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.la -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.so -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/ra.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/repos.pyc -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.py -CHECKPKG_OVERRIDES_CSWsvn += bad-location-of-file|file=/lib/python/opt/csw/lib/svn/python/site-packages/svn/wc.pyc -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_repos.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_wc.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_fs.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_client.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_diff.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_core.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_delta.so -CHECKPKG_OVERRIDES_CSWsvn += soname-not-found|libsvn_swig_py-1.so.0|is|needed|by|lib/python/opt/csw/lib/svn/python/site-packages/libsvn/_ra.so -CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWpython -# end test entries ... - PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel @@ -475,7 +352,7 @@ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)/lib/python + @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 22 15:54:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Apr 2012 13:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17810] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 17810 http://gar.svn.sourceforge.net/gar/?rev=17810&view=rev Author: dmichelsen Date: 2012-04-22 13:54:31 +0000 (Sun, 22 Apr 2012) Log Message: ----------- opencsw-manual/trunk: Clarification about Solaris 8/9 Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-22 13:49:18 UTC (rev 17809) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-22 13:54:31 UTC (rev 17810) @@ -2,23 +2,29 @@ Getting started --------------- -OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities to +OpenCSW uses a tool named pkgutil_ on top of the Solaris packaging utilities to automatically download, install and update packages. It needs to be installed manually once, after that all maintenance is done via pkgutil. +.. _pkgutil: http://pkgutil.net + On a Solaris 10 system, you can use the capacity of pkgadd to download and install it via http in one step:: pkgadd -d http://get.opencsw.org/now -On Solaris 8 and 9 you need to download the package manually, e.g. using wget +You may need to specify a proxy with ``-x :``, be aware that there are +known issues with Squid and possibly other proxies. + +On Solaris 8 and 9 (or 10 if you have issues with the above ``pkgadd``) +you need to download the package manually, e.g. using wget and then install it:: wget http://mirror.opencsw.org/opencsw/pkgutil.pkg pkgadd -d pkgutil.pkg all -For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of PATH, -and ``/opt/csw/share/man`` in front of MANPATH. +For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, +and ``/opt/csw/share/man`` in front of ``MANPATH``. You can now start installing packages. For a list of available packages use:: @@ -187,3 +193,7 @@ Layout of the mirror ==================== + +Footnotes +========= + Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-04-22 13:49:18 UTC (rev 17809) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-04-22 13:54:31 UTC (rev 17810) @@ -24,3 +24,5 @@ CPPFLAGS="-I/opt/csw/include" LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" + +XXX: LD_LIBRARY_PATH considered harmful, http://linuxmafia.com/faq/Admin/ld-lib-path.html 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 Apr 22 16:41:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Apr 2012 14:41:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17811] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17811 http://gar.svn.sourceforge.net/gar/?rev=17811&view=rev Author: bdwalton Date: 2012-04-22 14:41:22 +0000 (Sun, 22 Apr 2012) Log Message: ----------- subversion/trunk: nuke the .pyc files after the merge completes Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 13:54:31 UTC (rev 17810) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 14:41:22 UTC (rev 17811) @@ -413,3 +413,7 @@ $(DESTDIR)$(mandir)/man1 @$(MAKECOOKIE) + +post-merge: + @(cd $(PKGROOT)/opt/csw/lib/svn/python; find . -name '*pyc' -exec rm {} \;) + @$(MAKECOOKIE) 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 Apr 22 18:06:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Apr 2012 16:06:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17812] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17812 http://gar.svn.sourceforge.net/gar/?rev=17812&view=rev Author: bdwalton Date: 2012-04-22 16:06:47 +0000 (Sun, 22 Apr 2012) Log Message: ----------- subversion/trunk: ensure a fully cleaned environment for the python binding build (apply to others too, after testing) Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 14:41:22 UTC (rev 17811) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 16:06:47 UTC (rev 17812) @@ -351,8 +351,8 @@ touch \ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) + @/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py + @/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Apr 22 18:52:18 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 22 Apr 2012 16:52:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17813] csw/mgar/pkg/sasl/trunk/files/changelog.CSW Message-ID: Revision: 17813 http://gar.svn.sourceforge.net/gar/?rev=17813&view=rev Author: guengel Date: 2012-04-22 16:52:18 +0000 (Sun, 22 Apr 2012) Log Message: ----------- sasl/trunk: Updated changelog Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2012-04-22 16:06:47 UTC (rev 17812) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2012-04-22 16:52:18 UTC (rev 17813) @@ -1,3 +1,11 @@ +sasl (2.1.25,REV=2012.04.22) + + * Fixed core dump when using gss (dmichelsen) + + * Updated dependencies (dmichelsen) + + -- Rafael Ostertag Sun, 22 Apr 2012 18:48:17 +0200 + sasl (2.1.25,REV=2012.01.20) * Link against Berkeley DB 4.8. 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 Apr 22 19:08:10 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 22 Apr 2012 17:08:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[17814] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 17814 http://gar.svn.sourceforge.net/gar/?rev=17814&view=rev Author: guengel Date: 2012-04-22 17:08:10 +0000 (Sun, 22 Apr 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: Bumped to version 8.3.18 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-04-22 16:52:18 UTC (rev 17813) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-04-22 17:08:10 UTC (rev 17814) @@ -90,7 +90,7 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 17 +PATCHLEVEL = 18 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-04-22 16:52:18 UTC (rev 17813) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-04-22 17:08:10 UTC (rev 17814) @@ -1 +1 @@ -cedfbcdb153291c0762492ef34fa7b41 postgresql-8.3.17.tar.bz2 +3819e3b687287879e2821a1c0da18520 postgresql-8.3.18.tar.bz2 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 Apr 22 19:27:35 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Apr 2012 17:27:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17815] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17815 http://gar.svn.sourceforge.net/gar/?rev=17815&view=rev Author: bdwalton Date: 2012-04-22 17:27:35 +0000 (Sun, 22 Apr 2012) Log Message: ----------- subversion/trunk: run the other language binding build/install stages with a cleaned environment Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 17:08:10 UTC (rev 17814) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-22 17:27:35 UTC (rev 17815) @@ -361,23 +361,23 @@ touch \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.c \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm - $(BUILD_ENV) gmake -C $(WORKSRC) swig-pl - $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl + /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-pl + /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl @$(MAKECOOKIE) svn-ruby: @echo " ==> Building Ruby bindings" touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c - $(BUILD_ENV) gmake -C $(WORKSRC) swig-rb - $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb + /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-rb + /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-rb @$(MAKECOOKIE) svn-java: EXTRA_LINKER_FLAGS += -norunpath svn-java: @echo " ==> Building Java bindings" touch $(WORKSRC)/subversion/bindings/javahl/native/*.c - $(BUILD_ENV) gmake -C $(WORKSRC) javahl; - $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; + /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) javahl; + /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-javahl; @$(MAKECOOKIE) #post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 23 02:42:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Apr 2012 00:42:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17816] csw/mgar/pkg/geos/trunk Message-ID: Revision: 17816 http://gar.svn.sourceforge.net/gar/?rev=17816&view=rev Author: bdwalton Date: 2012-04-23 00:42:08 +0000 (Mon, 23 Apr 2012) Log Message: ----------- geos/trunk: use a real hack of a patch to fix isnan use in the test suite that breaks with the fix for the main code body Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-22 17:27:35 UTC (rev 17815) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:42:08 UTC (rev 17816) @@ -14,6 +14,7 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch +PATCHFILES += 0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch GARCOMPILER = GNU Added: csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch =================================================================== --- csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch (rev 0) +++ csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch 2012-04-23 00:42:08 UTC (rev 17816) @@ -0,0 +1,50 @@ +From d4f1d807146bfe7c406fd3cc30e59f9e7e4c52a0 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 22 Apr 2012 03:24:14 +0200 +Subject: [PATCH] drop use of macro in test suite that conflicts with required + change for real code (a bad hack, yes) + +Signed-off-by: Ben Walton +--- + tests/unit/geom/CoordinateArraySequenceTest.cpp | 2 +- + tests/unit/io/WKBWriterTest.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/unit/geom/CoordinateArraySequenceTest.cpp b/tests/unit/geom/CoordinateArraySequenceTest.cpp +index e46f102..67b666a 100644 +--- a/tests/unit/geom/CoordinateArraySequenceTest.cpp ++++ b/tests/unit/geom/CoordinateArraySequenceTest.cpp +@@ -30,7 +30,7 @@ namespace tut + Filter() : is3d(false) {} + void filter_rw(geos::geom::Coordinate* c) const { + if ( is3d ) { +- if ( ISNAN(c->z) ) c->z = 0.0; ++ if ( __builtin_isnan(c->z) ) c->z = 0.0; + } + else c->z = DoubleNotANumber; + } +diff --git a/tests/unit/io/WKBWriterTest.cpp b/tests/unit/io/WKBWriterTest.cpp +index 13f158f..43c0318 100644 +--- a/tests/unit/io/WKBWriterTest.cpp ++++ b/tests/unit/io/WKBWriterTest.cpp +@@ -76,7 +76,7 @@ namespace tut + ensure( geom->getCoordinateDimension() == 2 ); + ensure( geom->getCoordinate()->x == -117.0 ); + ensure( geom->getCoordinate()->y == 33.0 ); +- ensure( ISNAN(geom->getCoordinate()->z) != 0 ); ++ ensure( __builtin_isnan(geom->getCoordinate()->z) != 0 ); + + delete geom; + } +@@ -128,7 +128,7 @@ namespace tut + ensure( geom->getCoordinateDimension() == 2 ); + ensure( geom->getCoordinate()->x == -117.0 ); + ensure( geom->getCoordinate()->y == 33.0 ); +- ensure( ISNAN(geom->getCoordinate()->z) != 0); ++ ensure( __builtin_isnan(geom->getCoordinate()->z) != 0); + + delete geom; + } +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 23 02:51:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Apr 2012 00:51:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17817] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 17817 http://gar.svn.sourceforge.net/gar/?rev=17817&view=rev Author: bdwalton Date: 2012-04-23 00:51:03 +0000 (Mon, 23 Apr 2012) Log Message: ----------- geos/trunk: update some dependencies Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:42:08 UTC (rev 17816) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:51:03 UTC (rev 17817) @@ -27,9 +27,9 @@ SPKG_DESC_CSWrb18-geos3-2-2 += $(DESCRIPTION), ruby 1.8 bindings RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 = CSWruby18 RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos-c1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos3-2-2 PKGFILES_CSWrb18-geos3-2-2 += .*ruby.* CHECKPKG_OVERRIDES_CSWrb18-geos3-2-2 += surplus-dependency|CSWruby18 @@ -38,8 +38,8 @@ SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos3-2-2 = CSWgeos CHECKPKG_OVERRIDES_CSWlibgeos3-2-2 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so @@ -48,8 +48,8 @@ PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-2-2 -RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos CATALOGNAME_CSWgeos-dev = geos_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 23 02:57:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Apr 2012 00:57:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17818] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 17818 http://gar.svn.sourceforge.net/gar/?rev=17818&view=rev Author: bdwalton Date: 2012-04-23 00:57:59 +0000 (Mon, 23 Apr 2012) Log Message: ----------- geos/trunk: update library package name due to version update Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:51:03 UTC (rev 17817) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:57:59 UTC (rev 17818) @@ -18,36 +18,36 @@ GARCOMPILER = GNU -PACKAGES = CSWlibgeos3-2-2 +PACKAGES = CSWlibgeos3-3-3 PACKAGES += CSWlibgeos-c1 PACKAGES += CSWgeos-dev -PACKAGES += CSWrb18-geos3-2-2 +PACKAGES += CSWrb18-geos3-3-3 -CATALOGNAME_CSWrb18-geos3-2-2 = rb18_geos3_2_2 -SPKG_DESC_CSWrb18-geos3-2-2 += $(DESCRIPTION), ruby 1.8 bindings -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 = CSWruby18 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos-c1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos3-2-2 -PKGFILES_CSWrb18-geos3-2-2 += .*ruby.* -CHECKPKG_OVERRIDES_CSWrb18-geos3-2-2 += surplus-dependency|CSWruby18 +CATALOGNAME_CSWrb18-geos3-3-3 = rb18_geos3_2_2 +SPKG_DESC_CSWrb18-geos3-3-3 += $(DESCRIPTION), ruby 1.8 bindings +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 = CSWruby18 +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos-c1 +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos3-3-3 +PKGFILES_CSWrb18-geos3-3-3 += .*ruby.* +CHECKPKG_OVERRIDES_CSWrb18-geos3-3-3 += surplus-dependency|CSWruby18 -CATALOGNAME_CSWlibgeos3-2-2 = libgeos3_2_2 -SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so -PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) -PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgeos3-2-2 = CSWgeos -CHECKPKG_OVERRIDES_CSWlibgeos3-2-2 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so +CATALOGNAME_CSWlibgeos3-3-3 = libgeos3_2_2 +SPKG_DESC_CSWlibgeos3-3-3 += $(DESCRIPTION), libgeos-3.2.2.so +PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so) +PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibgeos3-3-3 = CSWgeos +CHECKPKG_OVERRIDES_CSWlibgeos3-3-3 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-2-2 +RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-3-3 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos @@ -63,7 +63,7 @@ PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE) PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so -RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 +RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-3-3 CSWlibgeos-c1 OBSOLETED_BY_CSWlibgeos-dev = CSWgeos # c++ libraries, so move things around a bit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 23 03:03:52 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Apr 2012 01:03:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17819] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 17819 http://gar.svn.sourceforge.net/gar/?rev=17819&view=rev Author: bdwalton Date: 2012-04-23 01:03:52 +0000 (Mon, 23 Apr 2012) Log Message: ----------- geos/trunk: drop explict catalog name setting and rely on the default conversions Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 00:57:59 UTC (rev 17818) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 01:03:52 UTC (rev 17819) @@ -23,7 +23,6 @@ PACKAGES += CSWgeos-dev PACKAGES += CSWrb18-geos3-3-3 -CATALOGNAME_CSWrb18-geos3-3-3 = rb18_geos3_2_2 SPKG_DESC_CSWrb18-geos3-3-3 += $(DESCRIPTION), ruby 1.8 bindings RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 = CSWruby18 RUNTIME_DEP_PKGS_CSWrb18-geos3-3-3 += CSWlibgeos-c1 @@ -34,7 +33,6 @@ PKGFILES_CSWrb18-geos3-3-3 += .*ruby.* CHECKPKG_OVERRIDES_CSWrb18-geos3-3-3 += surplus-dependency|CSWruby18 -CATALOGNAME_CSWlibgeos3-3-3 = libgeos3_2_2 SPKG_DESC_CSWlibgeos3-3-3 += $(DESCRIPTION), libgeos-3.2.2.so PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so) PKGFILES_CSWlibgeos3-3-3 += $(call baseisadirs,$(libdir),libgeos-3\.3\.3\.so(\.\d+)*) @@ -43,7 +41,6 @@ OBSOLETED_BY_CSWlibgeos3-3-3 = CSWgeos CHECKPKG_OVERRIDES_CSWlibgeos3-3-3 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so -CATALOGNAME_CSWlibgeos-c1 = libgeos_c1 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1(\.\d+)*) @@ -52,7 +49,6 @@ RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos -CATALOGNAME_CSWgeos-dev = geos_dev SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_CONFIG) PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_STATICLIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 23 03:06:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Apr 2012 01:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17820] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 17820 http://gar.svn.sourceforge.net/gar/?rev=17820&view=rev Author: bdwalton Date: 2012-04-23 01:06:37 +0000 (Mon, 23 Apr 2012) Log Message: ----------- geos/trunk: drop unused override Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 01:03:52 UTC (rev 17819) +++ csw/mgar/pkg/geos/trunk/Makefile 2012-04-23 01:06:37 UTC (rev 17820) @@ -39,7 +39,6 @@ RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgeos3-3-3 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibgeos3-3-3 = CSWgeos -CHECKPKG_OVERRIDES_CSWlibgeos3-3-3 += soname-equals-filename|file=/opt/csw/lib/libgeos-3.2.2.so SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1 PKGFILES_CSWlibgeos-c1 += $(call baseisadirs,$(libdir),libgeos_c\.so\.1\.6\.2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 23 08:42:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 06:42:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17821] csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles. diff Message-ID: Revision: 17821 http://gar.svn.sourceforge.net/gar/?rev=17821&view=rev Author: cgrzemba Date: 2012-04-23 06:42:44 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: fix perl_makefiles.diff for version 5.6.1.1 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 01:06:37 UTC (rev 17820) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 06:42:44 UTC (rev 17821) @@ -5,7 +5,7 @@ { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -16,7 +16,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -27,7 +27,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; if (!$ENV{'NETSNMP_LIBS'}) { $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); @@ -38,7 +38,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = '-lnetsnmptrapd ' . `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); if (!$ENV{'NETSNMP_CCFLAGS'}) { @@ -49,7 +49,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -60,7 +60,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; 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 Apr 23 09:40:23 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 07:40:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17822] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17822 http://gar.svn.sourceforge.net/gar/?rev=17822&view=rev Author: cgrzemba Date: 2012-04-23 07:40:22 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: refine LDDLFLAGS for TrapeReceiver, add rpath overrides Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 06:42:44 UTC (rev 17821) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 07:40:22 UTC (rev 17822) @@ -98,8 +98,16 @@ CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/ASN/ASN.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/OID/OID.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/TrapReceiver/TrapReceiver.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/agent.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/default_store/default_store.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/default_store/default_store.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/SNMP/SNMP.so + include gar/category.mk pre-configure-modulated: Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 06:42:44 UTC (rev 17821) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 07:40:22 UTC (rev 17822) @@ -38,7 +38,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = '-lnetsnmptrapd ' . `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); if (!$ENV{'NETSNMP_CCFLAGS'}) { 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 Apr 23 10:15:42 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 08:15:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17823] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17823 http://gar.svn.sourceforge.net/gar/?rev=17823&view=rev Author: cgrzemba Date: 2012-04-23 08:15:41 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: refine LDDLFLAGS for agent and defaut_store, refine rpath overrides Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 07:40:22 UTC (rev 17822) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 08:15:41 UTC (rev 17823) @@ -98,16 +98,14 @@ CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/ASN/ASN.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/OID/OID.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/TrapReceiver/TrapReceiver.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/agent.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/default_store/default_store.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/NetSNMP/default_store/default_store.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|/tmp/pkg_LKUeaT/CSWnetsnmp/root/opt/csw/lib/perl/site_perl/auto/SNMP/SNMP.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/ASN/ASN.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/OID/OID.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/TrapReceiver/TrapReceiver.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/agent.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/default_store/default_store.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/default_store/default_store.so +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/SNMP/SNMP.so - - include gar/category.mk pre-configure-modulated: Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 07:40:22 UTC (rev 17822) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 08:15:41 UTC (rev 17823) @@ -49,7 +49,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -60,7 +60,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; 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 Apr 23 10:43:52 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 23 Apr 2012 08:43:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17824] csw/mgar/pkg Message-ID: Revision: 17824 http://gar.svn.sourceforge.net/gar/?rev=17824&view=rev Author: pfelecan Date: 2012-04-23 08:43:52 +0000 (Mon, 23 Apr 2012) Log Message: ----------- Migrated from a private recipe to a gar recipe. Added Paths: ----------- csw/mgar/pkg/libotf/ csw/mgar/pkg/libotf/Makefile csw/mgar/pkg/libotf/branches/ csw/mgar/pkg/libotf/tags/ csw/mgar/pkg/libotf/trunk/ csw/mgar/pkg/libotf/trunk/Makefile csw/mgar/pkg/libotf/trunk/checksums csw/mgar/pkg/libotf/trunk/files/ Added: csw/mgar/pkg/libotf/Makefile =================================================================== --- csw/mgar/pkg/libotf/Makefile (rev 0) +++ csw/mgar/pkg/libotf/Makefile 2012-04-23 08:43:52 UTC (rev 17824) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libotf/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-23 08:43:52 UTC (rev 17824) @@ -0,0 +1,67 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libotf +VERSION = 0.9.12 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A Library for handling OpenType Font (OTF) +define BLURB +The library "libotf" provides the following facilites: + + o Read Open Type Layout Tables from OTF file. Currently these + tables are supported; head, name, cmap, GDEF, GSUB, and GPOS. + + o Convert a Unicode character sequence to a glyph code sequence by + using the above tables. + +The combination of libotf and the FreeType library (Ver.2) realizes +CTL (complex text layout) by OpenType fonts. +endef + +MASTER_SITES = http://www.m17n.org/libotf/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +BUILD_DEP_PKGS = \ + CSWlibxmudevel \ + CSWlibxawdevel \ + CSWlibfreetype-dev \ + CSWlibz-dev +RUNTIME_DEP_PKGS = \ + CSWlibxmu \ + CSWlibxaw \ + CSWlibfreetype6 \ + CSWlibz1 +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +EXTRA_INC = /opt/csw/X11/include + +PACKAGES += CSWlibotf0 +SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime +PKGFILES_CSWlibotf0 += $(call pkgfiles_lib,libotf.so.0.0.0) +OBSOLETED_BY_CSWlibotf0 += CSWlibotf + +PACKAGES += CSWlibotf-dev +SPKG_DESC_CSWlibotf-dev = A Library for handling OpenType Font - development +PKGFILES_CSWlibotf-dev = $(PKGFILES_DEVEL) +CATALOGNAME_CSWlibotf-dev = libotf_dev +RUNTIME_DEP_PKGS_CSWlibotf-dev += CSWlibotf0 + +PACKAGES += CSWlibotf-utils +SPKG_DESC_CSWlibotf-utils = A Library for handling OpenType Font - utilities +CATALOGNAME_CSWlibotf-utils = libotf_utils +OBSOLETED_BY_CSWlibotf-utils += CSWlibotf +RUNTIME_DEP_PKGS_CSWlibotf-utils += CSWlibotf0 + +include gar/category.mk + Property changes on: csw/mgar/pkg/libotf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libotf/trunk/checksums =================================================================== --- csw/mgar/pkg/libotf/trunk/checksums (rev 0) +++ csw/mgar/pkg/libotf/trunk/checksums 2012-04-23 08:43:52 UTC (rev 17824) @@ -0,0 +1 @@ +630a0556af3be60360e8a75e59561eda libotf-0.9.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Apr 23 10:51:56 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 23 Apr 2012 10:51:56 +0200 Subject: [csw-devel] SF.net SVN: gar:[17824] csw/mgar/pkg In-Reply-To: References: Message-ID: <828DBBC2-463A-4BEB-A173-3744456577F7@opencsw.org> Hi Peter, Am 23.04.2012 um 10:43 schrieb pfelecan at users.sourceforge.net: > Revision: 17824 > http://gar.svn.sourceforge.net/gar/?rev=17824&view=rev > Author: pfelecan > Date: 2012-04-23 08:43:52 +0000 (Mon, 23 Apr 2012) > Log Message: > ----------- > Migrated from a private recipe to a gar recipe. > > Added Paths: > ----------- > csw/mgar/pkg/libotf/ > csw/mgar/pkg/libotf/Makefile > csw/mgar/pkg/libotf/branches/ > csw/mgar/pkg/libotf/tags/ > csw/mgar/pkg/libotf/trunk/ > csw/mgar/pkg/libotf/trunk/Makefile > csw/mgar/pkg/libotf/trunk/checksums > csw/mgar/pkg/libotf/trunk/files/ > > Added: csw/mgar/pkg/libotf/Makefile > =================================================================== > --- csw/mgar/pkg/libotf/Makefile (rev 0) > +++ csw/mgar/pkg/libotf/Makefile 2012-04-23 08:43:52 UTC (rev 17824) > @@ -0,0 +1,2 @@ > +%: > + $(MAKE) -C trunk $* > > > Property changes on: csw/mgar/pkg/libotf/trunk > ___________________________________________________________________ > Added: svn:ignore > + work > > > Added: csw/mgar/pkg/libotf/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libotf/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-23 08:43:52 UTC (rev 17824) > @@ -0,0 +1,67 @@ > +# $Id$ > +# TODO (release-critical prefixed with !, non release-critical with *) > +# > +NAME = libotf > +VERSION = 0.9.12 > +GARTYPE = v2 > +CATEGORIES = lib > + > +DESCRIPTION = A Library for handling OpenType Font (OTF) > +define BLURB > +The library "libotf" provides the following facilites: > + > + o Read Open Type Layout Tables from OTF file. Currently these > + tables are supported; head, name, cmap, GDEF, GSUB, and GPOS. > + > + o Convert a Unicode character sequence to a glyph code sequence by > + using the above tables. > + > +The combination of libotf and the FreeType library (Ver.2) realizes > +CTL (complex text layout) by OpenType fonts. > +endef > + > +MASTER_SITES = http://www.m17n.org/libotf/ > +DISTFILES = $(DISTNAME).tar.gz > + > +# File name regex to get notifications about upstream software releases > +# NOTE: Use this only if the automatic regex creation > +# does not work for your package > +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > + > +# 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 = > + > +BUILD_DEP_PKGS = \ > + CSWlibxmudevel \ > + CSWlibxawdevel \ > + CSWlibfreetype-dev \ > + CSWlibz-dev > +RUNTIME_DEP_PKGS = \ > + CSWlibxmu \ > + CSWlibxaw \ > + CSWlibfreetype6 \ > + CSWlibz1 > +CONFIGURE_ARGS = $(DIRPATHS) > +GARCOMPILER = GNU > +EXTRA_INC = /opt/csw/X11/include Is it really necessary to link against the CSW X11 libraries? They are somewhat deprecated and linking to the SUNW libs is preferred. Best regards -- Dago > + > +PACKAGES += CSWlibotf0 > +SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime > +PKGFILES_CSWlibotf0 += $(call pkgfiles_lib,libotf.so.0.0.0) > +OBSOLETED_BY_CSWlibotf0 += CSWlibotf > + > +PACKAGES += CSWlibotf-dev > +SPKG_DESC_CSWlibotf-dev = A Library for handling OpenType Font - development > +PKGFILES_CSWlibotf-dev = $(PKGFILES_DEVEL) > +CATALOGNAME_CSWlibotf-dev = libotf_dev > +RUNTIME_DEP_PKGS_CSWlibotf-dev += CSWlibotf0 > + > +PACKAGES += CSWlibotf-utils > +SPKG_DESC_CSWlibotf-utils = A Library for handling OpenType Font - utilities > +CATALOGNAME_CSWlibotf-utils = libotf_utils > +OBSOLETED_BY_CSWlibotf-utils += CSWlibotf > +RUNTIME_DEP_PKGS_CSWlibotf-utils += CSWlibotf0 > + > +include gar/category.mk > + > > > Property changes on: csw/mgar/pkg/libotf/trunk/Makefile > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: csw/mgar/pkg/libotf/trunk/checksums > =================================================================== > --- csw/mgar/pkg/libotf/trunk/checksums (rev 0) > +++ csw/mgar/pkg/libotf/trunk/checksums 2012-04-23 08:43:52 UTC (rev 17824) > @@ -0,0 +1 @@ > +630a0556af3be60360e8a75e59561eda libotf-0.9.12.tar.gz > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From dmichelsen at users.sourceforge.net Mon Apr 23 11:10:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Apr 2012 09:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[17825] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17825 http://gar.svn.sourceforge.net/gar/?rev=17825&view=rev Author: dmichelsen Date: 2012-04-23 09:10:53 +0000 (Mon, 23 Apr 2012) Log Message: ----------- opencsw-manual: Use explicit path on pkgutil Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 08:43:52 UTC (rev 17824) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 09:10:53 UTC (rev 17825) @@ -23,13 +23,13 @@ wget http://mirror.opencsw.org/opencsw/pkgutil.pkg pkgadd -d pkgutil.pkg all +You can now start installing packages. For a list of available packages use:: + + /opt/csw/bin/pkgutil -l + For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. -You can now start installing packages. For a list of available packages use:: - - pkgutil -l - As the list is quite long and you probably have an idea what you are looking for the list can be fuzzy-matched with:: 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 Apr 23 11:15:39 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Apr 2012 09:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17826] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators Message-ID: Revision: 17826 http://gar.svn.sourceforge.net/gar/?rev=17826&view=rev Author: wahwah Date: 2012-04-23 09:15:38 +0000 (Mon, 23 Apr 2012) Log Message: ----------- opencsw-manual/trunk: Separating out mirror setup instructions, and other changes. I'm missing git. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 09:10:53 UTC (rev 17825) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 09:15:38 UTC (rev 17826) @@ -16,9 +16,8 @@ You may need to specify a proxy with ``-x :``, be aware that there are known issues with Squid and possibly other proxies. -On Solaris 8 and 9 (or 10 if you have issues with the above ``pkgadd``) -you need to download the package manually, e.g. using wget -and then install it:: +On Solaris 8 and 9 (or 10 if you have issues with the above ``pkgadd``) you +need to download the package manually (e.g. using wget) and then install it:: wget http://mirror.opencsw.org/opencsw/pkgutil.pkg pkgadd -d pkgutil.pkg all @@ -27,8 +26,10 @@ /opt/csw/bin/pkgutil -l -For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, -and ``/opt/csw/share/man`` in front of ``MANPATH``. +For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of +``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On Solaris 10, +you can do that by editing the ``/etc/default/login`` file, and logging out +and back in. As the list is quite long and you probably have an idea what you are looking for the list can be fuzzy-matched with:: @@ -93,7 +94,7 @@ Then you need to import the public key:: root# wget -O - http://www.opencsw.org/security/ | gpg --import - - + The current fingerprint looks like this:: root# gpg --fingerprint board at opencsw.org @@ -113,7 +114,7 @@ You can verify that it worked with ``pkgutil -V``:: - root at login [login]:/etc/opt/csw > pkgutil -V + root at login [login]:/etc/opt/csw > pkgutil -V ... show_current true (default: true) stop_on_hook_soft_error not set (default: false) @@ -148,52 +149,21 @@ the interoperability and we feel that in times of ever growing disks the flexibility is worth more than the saved bytes. -Package dependencies are modeled in the OpenCSW `catalogs`_ to allow automatic +Package dependencies are modeled in the OpenCSW catalogs to allow automatic dependency resolution via pkgutil. To view the current dependencies for a package you can use:: pkgutil --deptree ---------------------------- -Setting up a private mirror ---------------------------- +-------------------------------------------------------------- +Creating a .pkg file for a host without an Internet connection +-------------------------------------------------------------- -Sometimes it is sufficient to just go on with a mirror on the internet. -However, there are situations where a local mirror can be useful. When you have -a lot of servers accessing the repository, want to control the package updates -exactly or when your production servers just can't access the internet at all a -local mirror is necessary. +You can also mirror only a subset of the repository, e.g. the ``unstable`` +catalog or even just a few packages:: -To set up the mirror you should use rsync as it can update your local copy -quickly and with low bandwidth use and also preserves hardlinks. Not all -mirrors provide access via the rsync protocol, a list can be found at -http://www.opencsw.org/get-it/mirrors/ . To make a full copy of the OpenCSW -repository use this:: - - pkgutil -y -i rsync - rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo - -The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil -clients. Use http://myserver/url-to-repo/ for HTTP and -file:///myserver/dir-to-repo for NFS as mirror option in pkgutil. - - -Mirroring only a subset -======================= - -You can also mirror only a subset of the repository, e.g. the 'unstable' -catalog or even just a few packages.:: - pkgutil --stream vim This option is useful when you want to install a package with dependencies on a host with no direct Internet access. - - -Layout of the mirror -==================== - -Footnotes -========= - Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-23 09:10:53 UTC (rev 17825) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2012-04-23 09:15:38 UTC (rev 17826) @@ -11,6 +11,7 @@ getting-started configuring-services pkgutil-reference + mirror-setup glossary .. [#dagosscrapbook] Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2012-04-23 09:15:38 UTC (rev 17826) @@ -0,0 +1,22 @@ +--------------------------- +Setting up a private mirror +--------------------------- + +Sometimes it is sufficient to just go on with a mirror on the internet. +However, there are situations where a local mirror can be useful. When you have +a lot of servers accessing the repository, want to control the package updates +exactly or when your production servers just can't access the internet at all a +local mirror is necessary. + +To set up the mirror you should use rsync as it can update your local copy +quickly and with low bandwidth use and also preserves hardlinks. Not all +mirrors provide access via the rsync protocol, a list can be found at +http://www.opencsw.org/get-it/mirrors/ . To make a full copy of the OpenCSW +repository use this:: + + pkgutil -y -i rsync + rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo + +The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil +clients. Use http://myserver/url-to-repo/ for HTTP and +file:///myserver/dir-to-repo for NFS as mirror option in pkgutil. 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 Apr 23 11:51:03 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 09:51:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17827] csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles. diff Message-ID: Revision: 17827 http://gar.svn.sourceforge.net/gar/?rev=17827&view=rev Author: cgrzemba Date: 2012-04-23 09:51:03 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDDLFLAGS for perl stuff Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 09:15:38 UTC (rev 17826) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 09:51:03 UTC (rev 17827) @@ -5,7 +5,7 @@ { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -16,7 +16,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -27,7 +27,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; if (!$ENV{'NETSNMP_LIBS'}) { $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); @@ -38,7 +38,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = '-lnetsnmptrapd ' . `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); if (!$ENV{'NETSNMP_CCFLAGS'}) { @@ -49,7 +49,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; @@ -60,7 +60,7 @@ else { $opts = NetSNMPGetOpts(); - $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; -+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib/\$$ISALIST -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; ++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib -L../../apps/.libs -L../../agent/.libs -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; 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 Apr 23 14:02:17 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:02:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17828] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17828 http://gar.svn.sourceforge.net/gar/?rev=17828&view=rev Author: cgrzemba Date: 2012-04-23 12:02:17 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDDLFLAGS for default_store.so Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 09:51:03 UTC (rev 17827) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-23 12:02:17 UTC (rev 17828) @@ -98,13 +98,8 @@ CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/ASN/ASN.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/OID/OID.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/TrapReceiver/TrapReceiver.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/agent.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/agent/default_store/default_store.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/NetSNMP/default_store/default_store.so -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry|/opt/csw/lib/|root/opt/csw/lib/perl/site_perl/auto/SNMP/SNMP.so +# override bad-rpath-entry becasue of /opt/csw/lib/ in perl module libs +CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry include gar/category.mk Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 09:51:03 UTC (rev 17827) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 12:02:17 UTC (rev 17828) @@ -64,3 +64,14 @@ $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; +--- a/perl/agent/default_store/Makefile.PL ++++ b/perl/agent/default_store/Makefile.PL +@@ -69,6 +69,7 @@ sub InitMakeParams { + } + else { + $opts = NetSNMPGetOpts("../../"); ++ $Params{'LDDLFLAGS'} = "$Config{lddlflags} -L../../../snmplib/.libs"; + $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; + chomp($Params{'LIBS'}); + $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 23 14:17:09 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:17:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17829] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17829 http://gar.svn.sourceforge.net/gar/?rev=17829&view=rev Author: wahwah Date: 2012-04-23 12:17:09 +0000 (Mon, 23 Apr 2012) Log Message: ----------- manual: The package is named gnupg Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:02:17 UTC (rev 17828) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:17:09 UTC (rev 17829) @@ -86,10 +86,10 @@ The catalog is signed with PGP and it is a good idea to set up your system to verify the integrity of the catalog. As the catalog itself contains hashes for all packages in the catalog this ensures you actually install the packages -which were officially released. First you need to install ``pgp`` (of course +which were officially released. First you need to install ``gnupg`` (of course with pkgutil!):: - pkgutil -y -i gpg + pkgutil -y -i gnupg Then you need to import the public key:: 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 Apr 23 14:17:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:17:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17830] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17830 http://gar.svn.sourceforge.net/gar/?rev=17830&view=rev Author: wahwah Date: 2012-04-23 12:17:31 +0000 (Mon, 23 Apr 2012) Log Message: ----------- manual: Installing without direct Internet access Added better instructions and added back link to the community site. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:17:09 UTC (rev 17829) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:17:31 UTC (rev 17830) @@ -160,10 +160,28 @@ Creating a .pkg file for a host without an Internet connection -------------------------------------------------------------- -You can also mirror only a subset of the repository, e.g. the ``unstable`` -catalog or even just a few packages:: +If you need to install a package with multiple dependencies on a host with no +Internet access, you can use pkgutil to prepare a .pkg file with the whole +dependency chain. This wasy is much easier than copying dependencies one by +one:: - pkgutil --stream vim + pkgutil \ + --stream \ + --target=sparc:5.10 \ + --output imagemagick-and-others.pkg \ + --yes \ + --download \ + imagemagick coreutils vim ggrep gsed -This option is useful when you want to install a package with dependencies on a -host with no direct Internet access. +At the end of the run, pkgutil displays the correct order to install the +packages in. + +The resulting package stream will be placed in the ``~/.pkgutil/packages`` +directory. + +This topic is also `discussed`_ on the community site. + +.. _discussed: + http://www.opencsw.org/community/ + questions/92/ + installing-without-a-direct-internet-access 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 Apr 23 14:17:52 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:17:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17831] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 17831 http://gar.svn.sourceforge.net/gar/?rev=17831&view=rev Author: wahwah Date: 2012-04-23 12:17:51 +0000 (Mon, 23 Apr 2012) Log Message: ----------- manual: Small cleanup Style and capitalization changes. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:17:31 UTC (rev 17830) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2012-04-23 12:17:51 UTC (rev 17831) @@ -140,12 +140,12 @@ -------------------- The OpenCSW packages have been compiled to allow easy forward migration and -crossgrades/mixing between Sparc and x64 CPUs. That means the same version of the -package is available for Solaris 10 and 11 for both Sparc and i386. There are +crossgrades/mixing between SPARC and x86_64 CPUs. That means the same version of the +package is available for Solaris 10 and 11 for both SPARC and x86. There are some exceptions where the software is absolutely not available or has a version -mismatch (e.g. acroread). To allow this there are usually no dependencies to +mismatch (e.g. acroread). To allow this, there are usually no dependencies on SUNW packages. This sometimes leads to large dependency chains (and people -thinking of OpenCSW packages as "bloated") but that is the price to pay for +thinking of OpenCSW packages as bloated) but that is the price to pay for the interoperability and we feel that in times of ever growing disks the flexibility is worth more than the saved bytes. 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 Apr 23 14:24:17 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:24:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17832] csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles. diff Message-ID: Revision: 17832 http://gar.svn.sourceforge.net/gar/?rev=17832&view=rev Author: cgrzemba Date: 2012-04-23 12:24:17 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDDLFLAGS for default_store.so Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 12:17:51 UTC (rev 17831) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 12:24:17 UTC (rev 17832) @@ -70,7 +70,7 @@ } else { $opts = NetSNMPGetOpts("../../"); -+ $Params{'LDDLFLAGS'} = "$Config{lddlflags} -L../../../snmplib/.libs"; ++ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs $Config{lddlflags}"; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Apr 23 14:25:24 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 23 Apr 2012 12:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17833] csw/mgar/pkg/lang-python Message-ID: Revision: 17833 http://gar.svn.sourceforge.net/gar/?rev=17833&view=rev Author: idogan23 Date: 2012-04-23 12:25:24 +0000 (Mon, 23 Apr 2012) Log Message: ----------- py_milter: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/py_milter/ csw/mgar/pkg/lang-python/py_milter/Makefile csw/mgar/pkg/lang-python/py_milter/branches/ csw/mgar/pkg/lang-python/py_milter/tags/ csw/mgar/pkg/lang-python/py_milter/trunk/ csw/mgar/pkg/lang-python/py_milter/trunk/Makefile csw/mgar/pkg/lang-python/py_milter/trunk/checksums csw/mgar/pkg/lang-python/py_milter/trunk/files/ Added: csw/mgar/pkg/lang-python/py_milter/Makefile =================================================================== --- csw/mgar/pkg/lang-python/py_milter/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/py_milter/Makefile 2012-04-23 12:25:24 UTC (rev 17833) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/py_milter/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/py_milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/py_milter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/py_milter/trunk/Makefile 2012-04-23 12:25:24 UTC (rev 17833) @@ -0,0 +1,41 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pymilter +VERSION = 0.9.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Python Milter extension +define BLURB + This is a python extension module to enable python scripts to attach to + Sendmail's libmilter API, enabling filtering of messages as they arrive. + Since it's a script, you can do anything you want to the message - screen + out viruses, collect statistics, add or modify headers, etc. You can, at + any point, tell Sendmail to reject, discard, or accept the message. +endef + +MASTER_SITES = http://downloads.sourceforge.net/project/pymilter/pymilter +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +RUNTIME_DEP_PKGS_CSWpy-pymilter += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pymilter += CSWlibmilter +CHECKPKG_OVERRIDES_CSWpy-pymilter += surplus-dependency|CSWlibmilter + +LICENSE = COPYING + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/py_milter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/py_milter/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/py_milter/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/py_milter/trunk/checksums 2012-04-23 12:25:24 UTC (rev 17833) @@ -0,0 +1 @@ +152746cac536df174b877d27780a407b pymilter-0.9.5.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 Apr 23 15:35:57 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 23 Apr 2012 13:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17834] csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles. diff Message-ID: Revision: 17834 http://gar.svn.sourceforge.net/gar/?rev=17834&view=rev Author: cgrzemba Date: 2012-04-23 13:35:57 +0000 (Mon, 23 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDDLFLAGS for default_store.so Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 12:25:24 UTC (rev 17833) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-23 13:35:57 UTC (rev 17834) @@ -69,9 +69,8 @@ @@ -69,6 +69,7 @@ sub InitMakeParams { } else { - $opts = NetSNMPGetOpts("../../"); -+ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs $Config{lddlflags}"; - $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; - chomp($Params{'LIBS'}); - $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; - + $opts = NetSNMPGetOpts("../../"); ++ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs $Config{lddlflags}"; + $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; + chomp($Params{'LIBS'}); + $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; 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 Apr 23 16:47:08 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 23 Apr 2012 14:47:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17835] csw/mgar/pkg Message-ID: Revision: 17835 http://gar.svn.sourceforge.net/gar/?rev=17835&view=rev Author: pfelecan Date: 2012-04-23 14:47:08 +0000 (Mon, 23 Apr 2012) Log Message: ----------- migrated from a personal recipe to a gar based recipe. Added Paths: ----------- csw/mgar/pkg/m17n/ csw/mgar/pkg/m17n/Makefile csw/mgar/pkg/m17n/branches/ csw/mgar/pkg/m17n/tags/ csw/mgar/pkg/m17n/trunk/ csw/mgar/pkg/m17n/trunk/Makefile csw/mgar/pkg/m17n/trunk/checksums csw/mgar/pkg/m17n/trunk/files/ Added: csw/mgar/pkg/m17n/Makefile =================================================================== --- csw/mgar/pkg/m17n/Makefile (rev 0) +++ csw/mgar/pkg/m17n/Makefile 2012-04-23 14:47:08 UTC (rev 17835) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/m17n/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile (rev 0) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-23 14:47:08 UTC (rev 17835) @@ -0,0 +1,63 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = m17n +VERSION = 1.6.3 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A multilingual text processing library for the C language. +define BLURB + An open source software for any Linux/Unix applications which + realizes multilingualization of many aspects of applications. + + It represents multilingual text as an object named M-text. + M-text is a string with attributes called text properties, + and designed to substitute for string in C. + Text properties carry any information required to input, display + and edit the text. +endef + +MASTER_SITES = http://www.m17n.org/m17n-lib-download/ + +DISTNAME = $(NAME)-lib-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +EXTRA_INC = /opt/csw/X11/include +EXTRA_LINKER_FLAGS = -lintl +CONFIGURE_ARGS += \ + --without-included-gettext \ + --with-libintl-prefix=/opt/csw +BUILD_DEP_PKGS = \ + CSWggettext-dev \ + CSWlibthaidevel \ + CSWlibotf-dev +RUNTIME_DEP_PKGS = \ + CSWggettext \ + CSWlibthai \ + CSWlibotf +PACKAGES += CSWlibn17n0 +SPKG_DESC_CSWlibn17n0 += A multilingual text processing library for the C language - runtime. +PKGFILES_CSWlibn17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) +PACKAGES += CSWlibn17n-dev +SPKG_DESC_CSWlibn17n-dev += A multilingual text processing library for the C language - development. +PKGFILES_CSWlibn17n-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibn17n-dev += CSWlibn17n0 + +PACKAGES += CSWlibn17n-utils +SPKG_DESC_CSWlibn17n-utils += A multilingual text processing library for the C language - utilities. +RUNTIME_DEP_PKGS_CSWlibn17n-utils += CSWlibn17n0 + +include gar/category.mk + Property changes on: csw/mgar/pkg/m17n/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/m17n/trunk/checksums =================================================================== --- csw/mgar/pkg/m17n/trunk/checksums (rev 0) +++ csw/mgar/pkg/m17n/trunk/checksums 2012-04-23 14:47:08 UTC (rev 17835) @@ -0,0 +1 @@ +24c8f0a2fb167e1a0e25815c8421a2a4 m17n-lib-1.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 24 09:32:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 07:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17836] csw/mgar/pkg/opencsw-manual/trunk/files/ for-developers/index.rst Message-ID: Revision: 17836 http://gar.svn.sourceforge.net/gar/?rev=17836&view=rev Author: dmichelsen Date: 2012-04-24 07:32:56 +0000 (Tue, 24 Apr 2012) Log Message: ----------- opencsw-manual: Add link about LD_LIBRARY_PATH Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-04-23 14:47:08 UTC (rev 17835) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2012-04-24 07:32:56 UTC (rev 17836) @@ -25,4 +25,6 @@ LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" -XXX: LD_LIBRARY_PATH considered harmful, http://linuxmafia.com/faq/Admin/ld-lib-path.html +.. _LD_LIBRARY_PATH - just say no: + https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt + 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 Apr 24 10:13:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 08:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17837] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 17837 http://gar.svn.sourceforge.net/gar/?rev=17837&view=rev Author: dmichelsen Date: 2012-04-24 08:13:17 +0000 (Tue, 24 Apr 2012) Log Message: ----------- mGAR v2: Add manual:// download rule Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-04-24 07:32:56 UTC (rev 17836) +++ csw/mgar/gar/v2/gar.lib.mk 2012-04-24 08:13:17 UTC (rev 17837) @@ -152,6 +152,18 @@ svn-https//%: @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) +# Sometimes files must be downloaded manually (e.g. for license reasons) +manual//%: + @echo + @echo "Please download the file" + @echo " $*" + @echo "manually from" + @echo " $(SPKG_SOURCEURL)" + @echo "and copy it to" + @echo " $(GARCHIVEDIR)" + @echo + + #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and 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 Apr 24 10:57:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 08:57:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17838] csw/mgar/pkg/cpan/Geo-IP/trunk Message-ID: Revision: 17838 http://gar.svn.sourceforge.net/gar/?rev=17838&view=rev Author: dmichelsen Date: 2012-04-24 08:57:39 +0000 (Tue, 24 Apr 2012) Log Message: ----------- cpan/Geo-IP/trunk: Update to 1.40 Modified Paths: -------------- csw/mgar/pkg/cpan/Geo-IP/trunk/Makefile csw/mgar/pkg/cpan/Geo-IP/trunk/checksums Modified: csw/mgar/pkg/cpan/Geo-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP/trunk/Makefile 2012-04-24 08:13:17 UTC (rev 17837) +++ csw/mgar/pkg/cpan/Geo-IP/trunk/Makefile 2012-04-24 08:57:39 UTC (rev 17838) @@ -1,22 +1,26 @@ NAME = Geo-IP -VERSION = 1.38 +VERSION = 1.40 CATEGORIES = cpan GARTYPE = v2 AUTHOR = BORISZ -DESCRIPTION = Look up location and network information by IP Address +DESCRIPTION = Maxmind GeoIP native C bindings define BLURB - This Perl module enables the user to find geographical and network - information of an IP address. endef -DISTFILES = $(NAME)-$(VERSION).tar.gz +CATALOG_RELEASE = unstable -PACKAGES = CSWpmgeoip -CATALOGNAME = pm_geoip +LICENSE = README -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWpm-geo-ip +SPKG_DESC_CSWpm-geo-ip = Maxmind GeoIP native C bindings +RUNTIME_DEP_PKGS_CSWpm-geo-ip += CSWlibgeoip1 -RUNTIME_DEP_PKGS = CSWgeolitedb +# Adjust location of GeoIP database +REINPLACEMENTS += geoip +REINPLACE_MATCH_geoip = /usr/local/share/GeoIP +REINPLACE_WITH_geoip = $(sharedstatedir)/GeoIP +REINPLACE_FILES_geoip += lib/Geo/IP/Record.pod +REINPLACE_FILES_geoip += lib/Geo/IP.pm include gar/category.mk Modified: csw/mgar/pkg/cpan/Geo-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Geo-IP/trunk/checksums 2012-04-24 08:13:17 UTC (rev 17837) +++ csw/mgar/pkg/cpan/Geo-IP/trunk/checksums 2012-04-24 08:57:39 UTC (rev 17838) @@ -1 +1 @@ -22ab07f98c79b316062881ed72cdc3c6 Geo-IP-1.38.tar.gz +f2e0ebe860052edf250ae02da81af1a5 Geo-IP-1.40.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 Tue Apr 24 11:20:15 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 24 Apr 2012 09:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[17839] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 17839 http://gar.svn.sourceforge.net/gar/?rev=17839&view=rev Author: chninkel Date: 2012-04-24 09:20:15 +0000 (Tue, 24 Apr 2012) Log Message: ----------- openssl/trunk: updated to 0.9.8w Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2012-04-24 08:57:39 UTC (rev 17838) +++ csw/mgar/pkg/openssl/trunk/Makefile 2012-04-24 09:20:15 UTC (rev 17839) @@ -16,7 +16,7 @@ ###### Package information ####### NAME = openssl -VERSION = 0.9.8v +VERSION = 0.9.8w CATEGORIES = lib GARTYPE = v2 @@ -67,7 +67,7 @@ #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += surplus-dependency|CSWcacertificates # this package contains several libraries files and we will not split -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += non-uniform-lib-versions-in-package|sonames=libcrypto.so.0.9.7,libcrypto.so.0.9.8,libssl.so.0.9.7,libssl.so.0.9.8 +#CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += non-uniform-lib-versions-in-package|sonames=libcrypto.so.0.9.7,libcrypto.so.0.9.8,libssl.so.0.9.7,libssl.so.0.9.8 # we will not recompile old 0.9.7 version for now ifeq ($(shell /usr/bin/uname -p),sparc) 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 Apr 24 11:21:39 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 24 Apr 2012 09:21:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17840] csw/mgar/pkg/openssl/trunk/files/changelog.CSW Message-ID: Revision: 17840 http://gar.svn.sourceforge.net/gar/?rev=17840&view=rev Author: chninkel Date: 2012-04-24 09:21:39 +0000 (Tue, 24 Apr 2012) Log Message: ----------- openssl/trunk: changelog update Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2012-04-24 09:20:15 UTC (rev 17839) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2012-04-24 09:21:39 UTC (rev 17840) @@ -1,3 +1,9 @@ +openssl (0.9.8w,REV=2012.04.24) unstable + + * New upstream release. + + -- Yann Rouillard Tue, 24 Apr 2012 11:20:32 +0200 + openssl (0.9.8v,REV=2012.04.20) unstable * New upstream release. 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 Apr 24 11:46:18 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 09:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17841] csw/mgar/pkg/libotf/trunk/Notes.org Message-ID: Revision: 17841 http://gar.svn.sourceforge.net/gar/?rev=17841&view=rev Author: pfelecan Date: 2012-04-24 09:46:18 +0000 (Tue, 24 Apr 2012) Log Message: ----------- add packaging notes: using Sun provided Xaw is poorer than using our Xaw Added Paths: ----------- csw/mgar/pkg/libotf/trunk/Notes.org Added: csw/mgar/pkg/libotf/trunk/Notes.org =================================================================== --- csw/mgar/pkg/libotf/trunk/Notes.org (rev 0) +++ csw/mgar/pkg/libotf/trunk/Notes.org 2012-04-24 09:46:18 UTC (rev 17841) @@ -0,0 +1,5 @@ +* X11/Xaw/Command.h usability failure + when using the Sun provided Xaw the test and the generation of + example/otfview fails; using the headers provided by the OCSW X11 + project solves this issue but we decided to fade our XWindows + project.. 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 Apr 24 11:51:18 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 09:51:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17842] csw/mgar/pkg/libotf/trunk/Makefile Message-ID: Revision: 17842 http://gar.svn.sourceforge.net/gar/?rev=17842&view=rev Author: pfelecan Date: 2012-04-24 09:51:18 +0000 (Tue, 24 Apr 2012) Log Message: ----------- use Sun provided Xaw instead of our Xaw Modified Paths: -------------- csw/mgar/pkg/libotf/trunk/Makefile Modified: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 09:46:18 UTC (rev 17841) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 09:51:18 UTC (rev 17842) @@ -44,7 +44,6 @@ CSWlibz1 CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -EXTRA_INC = /opt/csw/X11/include PACKAGES += CSWlibotf0 SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime 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 Apr 24 11:56:37 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 09:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17843] csw/mgar/pkg/libotf/trunk/Makefile Message-ID: Revision: 17843 http://gar.svn.sourceforge.net/gar/?rev=17843&view=rev Author: pfelecan Date: 2012-04-24 09:56:37 +0000 (Tue, 24 Apr 2012) Log Message: ----------- removed dependencies toward our X11 project packages. Modified Paths: -------------- csw/mgar/pkg/libotf/trunk/Makefile Modified: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 09:51:18 UTC (rev 17842) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 09:56:37 UTC (rev 17843) @@ -33,13 +33,9 @@ # UPSTREAM_MASTER_SITES = BUILD_DEP_PKGS = \ - CSWlibxmudevel \ - CSWlibxawdevel \ CSWlibfreetype-dev \ CSWlibz-dev RUNTIME_DEP_PKGS = \ - CSWlibxmu \ - CSWlibxaw \ CSWlibfreetype6 \ CSWlibz1 CONFIGURE_ARGS = $(DIRPATHS) 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 Apr 24 12:17:04 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 24 Apr 2012 10:17:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17844] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 17844 http://gar.svn.sourceforge.net/gar/?rev=17844&view=rev Author: cgrzemba Date: 2012-04-24 10:17:03 +0000 (Tue, 24 Apr 2012) Log Message: ----------- netsnmp/trunk: comment RUNTIME_DEP_PKGS_CSWnetsnmp += CSWpython Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-24 09:56:37 UTC (rev 17843) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-24 10:17:03 UTC (rev 17844) @@ -30,7 +30,7 @@ VENDOR_URL = http://www.net-snmp.org/ BUILD_DEP_PKGS = CSWpysetuptools -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWpython +# RUNTIME_DEP_PKGS_CSWnetsnmp += CSWpython RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl 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 Apr 24 12:39:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 10:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17845] csw/mgar/pkg/libstlport/trunk Message-ID: Revision: 17845 http://gar.svn.sourceforge.net/gar/?rev=17845&view=rev Author: dmichelsen Date: 2012-04-24 10:39:50 +0000 (Tue, 24 Apr 2012) Log Message: ----------- libstlport/trunk: Update to patch 145730/145731 for Solaris 10 only Modified Paths: -------------- csw/mgar/pkg/libstlport/trunk/Makefile csw/mgar/pkg/libstlport/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libstlport/trunk/ Property changes on: csw/mgar/pkg/libstlport/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work Modified: csw/mgar/pkg/libstlport/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstlport/trunk/Makefile 2012-04-24 10:17:03 UTC (rev 17844) +++ csw/mgar/pkg/libstlport/trunk/Makefile 2012-04-24 10:39:50 UTC (rev 17845) @@ -1,22 +1,59 @@ NAME = libstlport -VERSION = 5.2.1 +VERSION = 4.5.3 CATEGORIES = lib GARTYPE = v2 DESCRIPTION = A multiplatform C++ standard library implementation -define BLURB - STLport is a multiplatform C++ Standard Library implementation. -endef -MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = stlport -DISTNAME = STLport-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = manual:// +PATCH-sparc = 145730-05 +PATCH-i386 = 145731-05 +PATCH = $(PATCH-$(GARCH)) +DISTNAME = $(PATCH) +DISTFILES += $(PATCH-sparc).zip +DISTFILES += $(PATCH-i386).zip +NOEXTRACT = $(filter-out $(addsuffix .zip,$(PATCH)),$(DISTFILES)) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Redistribution of libstlport.so.1 is allowed as noted in +# http://developers.sun.com/sunstudio/documentation/ss12/mr/READMEs/runtime.libraries.html -BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) +# This patch requires some functions from libm only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://wesunsolve.net/patch/id/$(PATCH) + +LICENSE = LEGAL_LICENSE.TXT + +PACKAGES += CSWlibstlport1-stlport +SPKG_DESC_CSWlibstlport1-stlport = Runtime library for Sun Studio STLPort, libstlport.so.1 from patch $(PATCH) +PKGFILES_CSWlibstlport1-stlport += $(call baseisadirs,$(prefix)/stlport/lib,libstlport.so.1) +OBSOLETED_BY_CSWlibstlport1-stlport = CSWstlport +# These are legacy symlinks. Add them to the stub packages for packages that have not been rebuild and require +# the libstlport.so.1 in /opt/csw/lib +PKGFILES_CSWstlport += $(libdir)/.* +# Disable archall as the directories contain sparcv9|amd64 +ARCHALL_CSWstlport = + +# Just keep the pathes as we copy the libs verbatim +CHECKPKG_OVERRIDES_CSWlibstlport1-stlport += bad-rpath-entry + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + include gar/category.mk + +ISADIR_sparcv9 = v9 +ISADIR_amd64 = amd64 + +install-custom: + ginstall -d $(DESTDIR)$(prefix)/stlport/lib + ginstall $(WORKSRC)/SPRO-12u2-c++-libs/reloc/solstudio12.2/prod/lib/stlport4/libstlport.so.1 $(DESTDIR)$(prefix)/stlport/lib + ginstall -d $(DESTDIR)$(prefix)/stlport/lib/$(ISA_DEFAULT64) + ginstall $(WORKSRC)/SPRO-12u2-c++-libs/reloc/solstudio12.2/prod/lib/stlport4/$(ISADIR_$(ISA_DEFAULT64))/libstlport.so.1 $(DESTDIR)$(prefix)/stlport/lib/$(ISA_DEFAULT64) + ginstall -d $(DESTDIR)$(prefix)/lib + ln -s ../stlport/lib/libstlport.so.1 $(DESTDIR)$(prefix)/lib + ginstall -d $(DESTDIR)$(prefix)/lib/$(ISA_DEFAULT64) + ln -s ../../stlport/lib/$(ISA_DEFAULT64)/libstlport.so.1 $(DESTDIR)$(prefix)/lib/$(ISA_DEFAULT64) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libstlport/trunk/checksums =================================================================== --- csw/mgar/pkg/libstlport/trunk/checksums 2012-04-24 10:17:03 UTC (rev 17844) +++ csw/mgar/pkg/libstlport/trunk/checksums 2012-04-24 10:39:50 UTC (rev 17845) @@ -1 +1,2 @@ -b20ace9f4a487b2614dfbb205bee112c download/STLport-5.2.1.tar.gz +340e537c46f601c95b25582ccabf0062 145730-05.zip +c8a20d60154f2157c20896b4324b190f 145731-05.zip 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 Apr 24 12:47:40 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 10:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[17846] csw/mgar/pkg/bdb48/branches/stlport/ Message-ID: Revision: 17846 http://gar.svn.sourceforge.net/gar/?rev=17846&view=rev Author: dmichelsen Date: 2012-04-24 10:47:39 +0000 (Tue, 24 Apr 2012) Log Message: ----------- bdb48: Make branch for stl build Added Paths: ----------- csw/mgar/pkg/bdb48/branches/stlport/ Property changes on: csw/mgar/pkg/bdb48/branches/stlport ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:mergeinfo + /csw/mgar/pkg/bdb42/trunk:6805 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 Apr 24 13:22:12 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 11:22:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17847] csw/mgar/pkg/libotf/trunk/ Message-ID: Revision: 17847 http://gar.svn.sourceforge.net/gar/?rev=17847&view=rev Author: pfelecan Date: 2012-04-24 11:22:11 +0000 (Tue, 24 Apr 2012) Log Message: ----------- ignore work-old to avoid UNCOMMITED tag in packages (this should be considered by mgar newpkg) Property Changed: ---------------- csw/mgar/pkg/libotf/trunk/ Property changes on: csw/mgar/pkg/libotf/trunk ___________________________________________________________________ Modified: svn:ignore - work + work work-old 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 Apr 24 13:52:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Apr 2012 11:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17848] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 17848 http://gar.svn.sourceforge.net/gar/?rev=17848&view=rev Author: wahwah Date: 2012-04-24 11:52:23 +0000 (Tue, 24 Apr 2012) Log Message: ----------- subversion/trunk: Added an apparently missing plus sign Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-04-24 11:22:11 UTC (rev 17847) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-04-24 11:52:23 UTC (rev 17848) @@ -178,7 +178,7 @@ SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding CATALOGNAME_CSWpythonsvn = pythonsvn PKGFILES_CSWpythonsvn = $(libdir)/python.* -PKGFILES_CSWpythonsvn = $(SVNLIB)/python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1 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 Apr 24 14:23:54 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 12:23:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[17849] csw/mgar/pkg/m17n/trunk Message-ID: Revision: 17849 http://gar.svn.sourceforge.net/gar/?rev=17849&view=rev Author: pfelecan Date: 2012-04-24 12:23:54 +0000 (Tue, 24 Apr 2012) Log Message: ----------- - do not depend on our X11 includes - ignore work-old to avoid UNCOMMITED tag in packages (this should be considered by mgar newpkg) - add packaging notes Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/m17n/trunk/Notes.org Property Changed: ---------------- csw/mgar/pkg/m17n/trunk/ Property changes on: csw/mgar/pkg/m17n/trunk ___________________________________________________________________ Modified: svn:ignore - work + work work-old Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 11:52:23 UTC (rev 17848) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 12:23:54 UTC (rev 17849) @@ -34,7 +34,6 @@ CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -EXTRA_INC = /opt/csw/X11/include EXTRA_LINKER_FLAGS = -lintl CONFIGURE_ARGS += \ --without-included-gettext \ Added: csw/mgar/pkg/m17n/trunk/Notes.org =================================================================== --- csw/mgar/pkg/m17n/trunk/Notes.org (rev 0) +++ csw/mgar/pkg/m17n/trunk/Notes.org 2012-04-24 12:23:54 UTC (rev 17849) @@ -0,0 +1,9 @@ +* X11/Xaw/Command.h usability failure + when using the Sun provided Xaw the test and the generation of + example/otfview fails; using the headers provided by the OCSW X11 + project solves this issue but we decided to fade our XWindows + project.. +* TODO dpendens on future packages: + - depends on future anthy + - depends on future wordcut + see README in sources for the master download sites 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 Apr 24 14:28:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 12:28:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17850] csw/mgar/pkg/bdb48/branches/stlport/Makefile Message-ID: Revision: 17850 http://gar.svn.sourceforge.net/gar/?rev=17850&view=rev Author: dmichelsen Date: 2012-04-24 12:28:42 +0000 (Tue, 24 Apr 2012) Log Message: ----------- bdb48/branches/stlport: Adjust for C++ bdb library compiled against stlport Modified Paths: -------------- csw/mgar/pkg/bdb48/branches/stlport/Makefile Modified: csw/mgar/pkg/bdb48/branches/stlport/Makefile =================================================================== --- csw/mgar/pkg/bdb48/branches/stlport/Makefile 2012-04-24 12:23:54 UTC (rev 17849) +++ csw/mgar/pkg/bdb48/branches/stlport/Makefile 2012-04-24 12:28:42 UTC (rev 17850) @@ -17,9 +17,6 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix PATCHDIR = $(WORKSRC)/.. @@ -31,7 +28,10 @@ CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb48 +# prefix = $(BUILD_PREFIX)/bdb48 +prefix = $(BUILD_PREFIX)/stlport4 +EXTRA_CXXFLAGS += -library=stlport4 + docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -40,6 +40,7 @@ # No longer there in 4.8 #CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx +# CONFIGURE_ARGS += --enable-stl CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL @@ -49,40 +50,19 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc +VENDOR_URL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -CATALOGNAME_CSWbdb48 = berkeleydb48 -CATALOGNAME_CSWbdb48devel = berkeleydb48_devel -CATALOGNAME_CSWbdb48doc = berkeleydb48_doc - -ARCHALL_CSWbdb48doc = 1 - -SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities -SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support -SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation - -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -RUNTIME_DEP_PKGS_CSWbdb48devel = CSWbdb48 -CHECKPKG_OVERRIDES_CSWbdb48devel += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWbdb48 += missing-dependency|CSWbdb48devel - LICENSE = LICENSE -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar +PACKAGES += CSWlibdb-cxx4-8-stlport +SPKG_DESC_CSWlibdb-cxx4-8-stlport = BerkeleyDB 4.8 bindings for C++ with STLPort +PKGFILES_CSWlibdb-cxx4-8-stlport += $(call baseisadirs,$(libdir),libdb_cxx(-\d+(\.\d+)*)?\.so) +# Change later on to new stlport package CSWlibstlport1-stlport +RUNTIME_DEP_PKGS_CSWlibdb-cxx4-8-stlport += CSWstlport -# Remove the license from share/doc/berkeleydb/license/.* -# because GAR expects license to be a file instead of a directory -EXTRA_MERGE_EXCLUDE_FILES = .*/license.* +# Compiler run pathes, skip for now +CHECKPKG_OVERRIDES_CSWlibdb-cxx4-8-stlport += bad-rpath-entry -PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb48devel = $(includedir)/.* - -# Compiler run pathes, skip for now. -CHECKPKG_OVERRIDES_CSWbdb48 += bad-rpath-entry - include gar/category.mk LIBS += -lnsl 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 Apr 24 14:38:23 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 12:38:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[17851] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17851 http://gar.svn.sourceforge.net/gar/?rev=17851&view=rev Author: pfelecan Date: 2012-04-24 12:38:22 +0000 (Tue, 24 Apr 2012) Log Message: ----------- - corrected type in packages names - where relevant, add obsolescence macro-commands Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 12:28:42 UTC (rev 17850) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 12:38:22 UTC (rev 17851) @@ -46,17 +46,19 @@ CSWggettext \ CSWlibthai \ CSWlibotf -PACKAGES += CSWlibn17n0 -SPKG_DESC_CSWlibn17n0 += A multilingual text processing library for the C language - runtime. -PKGFILES_CSWlibn17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) -PACKAGES += CSWlibn17n-dev -SPKG_DESC_CSWlibn17n-dev += A multilingual text processing library for the C language - development. -PKGFILES_CSWlibn17n-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibn17n-dev += CSWlibn17n0 +PACKAGES += CSWlibm17n0 +SPKG_DESC_CSWlibm17n0 += A multilingual text processing library for the C language - runtime. +PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) +OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n +PACKAGES += CSWlibm17n-dev +SPKG_DESC_CSWlibm17n-dev += A multilingual text processing library for the C language - development. +PKGFILES_CSWlibm17n-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibm17n-dev += CSWlibm17n0 -PACKAGES += CSWlibn17n-utils -SPKG_DESC_CSWlibn17n-utils += A multilingual text processing library for the C language - utilities. -RUNTIME_DEP_PKGS_CSWlibn17n-utils += CSWlibn17n0 +PACKAGES += CSWlibm17n-utils +SPKG_DESC_CSWlibm17n-utils += A multilingual text processing library for the C language - utilities. +OBSOLETED_BY_CSWlibm17n += CSWlibm17n +RUNTIME_DEP_PKGS_CSWlibm17n-utils += CSWlibm17n0 include gar/category.mk 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 Apr 24 14:51:13 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 12:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17852] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17852 http://gar.svn.sourceforge.net/gar/?rev=17852&view=rev Author: pfelecan Date: 2012-04-24 12:51:13 +0000 (Tue, 24 Apr 2012) Log Message: ----------- - corrected obsolescence for libm17n-utils Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 12:38:22 UTC (rev 17851) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 12:51:13 UTC (rev 17852) @@ -49,7 +49,7 @@ PACKAGES += CSWlibm17n0 SPKG_DESC_CSWlibm17n0 += A multilingual text processing library for the C language - runtime. PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) -OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n +OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n PACKAGES += CSWlibm17n-dev SPKG_DESC_CSWlibm17n-dev += A multilingual text processing library for the C language - development. PKGFILES_CSWlibm17n-dev = $(PKGFILES_DEVEL) @@ -57,7 +57,7 @@ PACKAGES += CSWlibm17n-utils SPKG_DESC_CSWlibm17n-utils += A multilingual text processing library for the C language - utilities. -OBSOLETED_BY_CSWlibm17n += CSWlibm17n +OBSOLETED_BY_CSWlibm17n-utils += CSWlibm17n RUNTIME_DEP_PKGS_CSWlibm17n-utils += CSWlibm17n0 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 Apr 24 15:55:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 13:55:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17853] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 17853 http://gar.svn.sourceforge.net/gar/?rev=17853&view=rev Author: dmichelsen Date: 2012-04-24 13:55:11 +0000 (Tue, 24 Apr 2012) Log Message: ----------- tcl85/trunk: Disable DTrace due to problems for now Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-04-24 12:51:13 UTC (rev 17852) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-04-24 13:55:11 UTC (rev 17853) @@ -72,8 +72,14 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threads -CONFIGURE_ARGS += --enable-dtrace +# DTrace support is currently broken, disable for now +# Text relocation remains referenced +# against symbol offset in file +# st 0x634 tclDTrace.o +# ld: fatal: relocations remain against allocatable but non-writable sections +#CONFIGURE_ARGS += --enable-dtrace + INSTALL_ARGS = install install-private-headers install-tzdata install-msgs # tk need the static tclstub library for some reason 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 Apr 24 16:03:13 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 14:03:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17854] csw/mgar/pkg/libotf/trunk/Makefile Message-ID: Revision: 17854 http://gar.svn.sourceforge.net/gar/?rev=17854&view=rev Author: pfelecan Date: 2012-04-24 14:03:13 +0000 (Tue, 24 Apr 2012) Log Message: ----------- addition of (as suggested by chkpkg): - dependencies - obsolescence Modified Paths: -------------- csw/mgar/pkg/libotf/trunk/Makefile Modified: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 13:55:11 UTC (rev 17853) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 14:03:13 UTC (rev 17854) @@ -34,29 +34,38 @@ BUILD_DEP_PKGS = \ CSWlibfreetype-dev \ - CSWlibz-dev + CSWlibz-dev \ + CSWlibbz2-dev RUNTIME_DEP_PKGS = \ + CSWlibgcc-s1 \ CSWlibfreetype6 \ - CSWlibz1 + CSWlibz1 \ + CSWlibbz2-1-0 CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -PACKAGES += CSWlibotf0 -SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime -PKGFILES_CSWlibotf0 += $(call pkgfiles_lib,libotf.so.0.0.0) -OBSOLETED_BY_CSWlibotf0 += CSWlibotf - +PACKAGES += CSWlibotf0 +SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime +PKGFILES_CSWlibotf0 += $(call pkgfiles_lib,libotf.so.0.0.0) +OBSOLETED_BY_CSWlibotf0 += CSWlibotf +RUNTIME_DEP_PKGS_CSWlibotf0 += \ + CSWlibgcc-s1 \ + CSWlibbz2-1-0 PACKAGES += CSWlibotf-dev SPKG_DESC_CSWlibotf-dev = A Library for handling OpenType Font - development PKGFILES_CSWlibotf-dev = $(PKGFILES_DEVEL) CATALOGNAME_CSWlibotf-dev = libotf_dev +OBSOLETED_BY_CSWlibotf-dev = CSWlibotfdevel RUNTIME_DEP_PKGS_CSWlibotf-dev += CSWlibotf0 PACKAGES += CSWlibotf-utils SPKG_DESC_CSWlibotf-utils = A Library for handling OpenType Font - utilities CATALOGNAME_CSWlibotf-utils = libotf_utils -OBSOLETED_BY_CSWlibotf-utils += CSWlibotf -RUNTIME_DEP_PKGS_CSWlibotf-utils += CSWlibotf0 - +OBSOLETED_BY_CSWlibotf-utils += CSWlibotf +RUNTIME_DEP_PKGS_CSWlibotf-utils += \ + CSWlibotf0 \ + CSWlibfreetype6 \ + CSWlibz1 \ + CSWlibbz2-1-0 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 Tue Apr 24 16:16:28 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 24 Apr 2012 14:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17855] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 17855 http://gar.svn.sourceforge.net/gar/?rev=17855&view=rev Author: cgrzemba Date: 2012-04-24 14:16:28 +0000 (Tue, 24 Apr 2012) Log Message: ----------- netsnmp/trunk: add build python binding Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-24 14:03:13 UTC (rev 17854) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-24 14:16:28 UTC (rev 17855) @@ -34,7 +34,47 @@ RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl +PACKAGES += CSWnetsnmp-dev +CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev +SPKG_DESC_CSWnetsnmp-dev += $(DESCRIPTION), development files +PKGFILES_CSWnetsnmp-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibnetsnmp25 +CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 +SPKG_DESC_CSWlibnetsnmp25 += $(DESCRIPTION), libsnmp.so.25 +PKGFILES_CSWlibnetsnmp25 += $(call baseisadirs,$(libdir),libnetsnmp\.so\.25(\.\d+)*) + +PACKAGES += CSWlibnetsnmpagent25 +CATALOGNAME_CSWlibnetsnmpagent25 = libnetsnmpagent25 +SPKG_DESC_CSWlibnetsnmpagent25 += $(DESCRIPTION), libsnmpagent.so.25 +PKGFILES_CSWlibnetsnmpagent25 += $(call baseisadirs,$(libdir),libnetsnmpagent\.so\.25(\.\d+)*) + +PACKAGES += CSWlibnetsnmphelpers25 +CATALOGNAME_CSWlibnetsnmphelpers25 = libnetsnmphelpers25 +SPKG_DESC_CSWlibnetsnmphelpers25 += $(DESCRIPTION), libsnmphelpers.so.25 +PKGFILES_CSWlibnetsnmphelpers25 += $(call baseisadirs,$(libdir),libnetsnmphelpers\.so\.25(\.\d+)*) + +PACKAGES += CSWlibnetsnmpmibs25 +CATALOGNAME_CSWlibnetsnmpmibs25 = libnetsnmpmibs25 +SPKG_DESC_CSWlibnetsnmpmibs25 += $(DESCRIPTION), libsnmpmibs.so.25 +PKGFILES_CSWlibnetsnmpmibs25 += $(call baseisadirs,$(libdir),libnetsnmpmibs\.so\.25(\.\d+)*) + +PACKAGES += CSWlibnetsnmptrapd25 +CATALOGNAME_CSWlibnetsnmptrapd25 = libnetsnmptrapd25 +SPKG_DESC_CSWlibnetsnmptrapd25 += $(DESCRIPTION), libsnmptrapd.so.25 +PKGFILES_CSWlibnetsnmptrapd25 += $(call baseisadirs,$(libdir),libnetsnmptrapd\.so\.25(\.\d+)*) + +PACKAGES += CSWpmnetsnmp +SPKG_DESC_CSWpmnetsnmp+= $(DESCRIPTION), Perl binding +PKGFILES_CSWpmnetsnmp += $(libdir)/perl + +PACKAGES += CSWpynetsnmp +SPKG_DESC_CSWpynetsnmp += $(DESCRIPTION), Python binding +PKGFILES_CSWpynetsnmp = $(libdir)/python.* + +PACKAGES += CSWnetsnmp +SPKG_DESC_CSWnetsnmp += $(DESCRIPTION), Base + # BUILD64 = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite @@ -44,7 +84,9 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -xnorunpath -CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes +CONFIGURE_ARGS_mm-32 = --disable-embedded-perl +CONFIGURE_ARGS_mm-32 += --with-perl-modules=yes +CONFIGURE_ARGS_mm-32 += --with-python-modules=yes # Enable Perl for 64 bit later # # CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules @@ -55,8 +97,8 @@ CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown CONFIGURE_ARGS += --with-sys-location=unknown -CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log -CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp +CONFIGURE_ARGS += --with-logfile=/var/opt/csw/log/snmpd.log +CONFIGURE_ARGS += --with-persistent-directory=/var/opt/csw/net-snmp CONFIGURE_ARGS += --with-mib-modules="ucd-snmp/diskio agentx mibII/mta_sendmail" # Disable for now # CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib @@ -108,6 +150,9 @@ cd $(WORKSRC) && autoreconf @$(MAKECOOKIE) +# if find the header in /opt/csw/include first use the old header from +# installed older version, thats why remove /opt/csw/include +CFLAGS := $(filter-out -I/opt/csw/include,$(CFLAGS)) #post-install-isa-sparcv8: # ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) 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 Apr 24 16:24:08 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Apr 2012 14:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17856] csw/mgar/pkg/libotf/trunk/Makefile Message-ID: Revision: 17856 http://gar.svn.sourceforge.net/gar/?rev=17856&view=rev Author: pfelecan Date: 2012-04-24 14:24:08 +0000 (Tue, 24 Apr 2012) Log Message: ----------- applied new suggestions made by checkpkg - unified build dependencies - split runt-time dependencies Modified Paths: -------------- csw/mgar/pkg/libotf/trunk/Makefile Modified: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 14:16:28 UTC (rev 17855) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-24 14:24:08 UTC (rev 17856) @@ -23,24 +23,13 @@ MASTER_SITES = http://www.m17n.org/libotf/ DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - +# centralize the build dependencies (it seems that the run-time +# dependencies must be given for each package) BUILD_DEP_PKGS = \ CSWlibfreetype-dev \ CSWlibz-dev \ CSWlibbz2-dev -RUNTIME_DEP_PKGS = \ - CSWlibgcc-s1 \ - CSWlibfreetype6 \ - CSWlibz1 \ - CSWlibbz2-1-0 + CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU @@ -50,6 +39,8 @@ OBSOLETED_BY_CSWlibotf0 += CSWlibotf RUNTIME_DEP_PKGS_CSWlibotf0 += \ CSWlibgcc-s1 \ + CSWlibfreetype6 \ + CSWlibz1 \ CSWlibbz2-1-0 PACKAGES += CSWlibotf-dev SPKG_DESC_CSWlibotf-dev = A Library for handling OpenType Font - development 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 Apr 24 16:53:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 14:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17857] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 17857 http://gar.svn.sourceforge.net/gar/?rev=17857&view=rev Author: dmichelsen Date: 2012-04-24 14:53:30 +0000 (Tue, 24 Apr 2012) Log Message: ----------- libtool/trunk: Raise ISA to pentium_pro even on Solaris 9 due to __sync_fetch_and_add_4 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2012-04-24 14:24:08 UTC (rev 17856) +++ csw/mgar/pkg/libtool/trunk/Makefile 2012-04-24 14:53:30 UTC (rev 17857) @@ -61,6 +61,11 @@ PKGFILES_CSWlibltdl7 += $(PKGFILES_RT) OBSOLETED_BY_CSWlibltdl7 += CSWlibtoolrt +# To get around __sync_fetch_and_add_4 either the buildlevel could be raised to Solaris 10 +# which is not acceptable for libtool or the base ISA could be raised to pentium_pro allowing +# the specific command set. +ISA_DEFAULT_i386-5.9 = pentium_pro + CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 24 17:42:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 15:42:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[17858] csw/mgar/pkg/freeradius/trunk Message-ID: Revision: 17858 http://gar.svn.sourceforge.net/gar/?rev=17858&view=rev Author: dmichelsen Date: 2012-04-24 15:42:16 +0000 (Tue, 24 Apr 2012) Log Message: ----------- freeradius/trunk: Complete rework Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile csw/mgar/pkg/freeradius/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/freeradius/trunk/files/cswusergroup Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-24 14:53:30 UTC (rev 17857) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-24 15:42:16 UTC (rev 17858) @@ -1,52 +1,129 @@ NAME = freeradius -VERSION = 2.1.10 +VERSION = 2.1.12 CATEGORIES = server GARTYPE = v2 DESCRIPTION = A free RADIUS server implementation -define BLURB - A free RADIUS server implementation -endef MASTER_SITES = ftp://ftp.freeradius.org:/pub/freeradius/ -DISTFILES = $(NAME)-server-$(VERSION).tar.gz +DISTFILES += $(NAME)-server-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz DISTFILES += cswfreeradius DISTFILES += server.pem DISTFILES += ca.pem -DISTFILES += cswusergroup DISTNAME = $(NAME)-server-$(VERSION) -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://freeradius.org/ -SPKG_SOURCEURL = http://freeradius.org/ - LICENSE = LICENSE -GARCOMPILER = GCC4 -# Disable USERGROUP until we can work out a way to get PRESERVECONF to play -# nicely with PROTOTYPE_GROUP -#USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup +BUILD_DEP_PKGS += CSWlibgdbm-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWlibreadline-dev -# Stripping libtool breaks the build in versions <=2.1.7 -#STRIP_LIBTOOL = 1 +PACKAGES += CSWfreeradius +SPKG_DESC_CSWfreeradius = A free RADIUS server implementation +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgcc-s1 -## Some of the RLM Submodules don't seem to pick up the include paths without -## setting CFLAGS -EXTRA_CFLAGS = -I/opt/csw/include +# These may be problematic, override for now +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/etc/opt/csw/freeradius/radiusd.conf.CSW +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/dictionary.5 +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/Simultaneous-Use +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/ldap_howto.rst +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/rlm_sqlcounter +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/supervise-radiusd.rst +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/performance-testing +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/sbin/radiusd +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/sbin/checkrad +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/bin/radwho +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/dictionary.5 +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeradius/mssql +CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeradius/ldap_howto.rst + +PACKAGES += CSWfreeradius-krb5 +SPKG_DESC_CSWfreeradius-krb5 = Kerberos 5 Module rlm_krb5 for FreeRADIUS +PKGFILES_CSWfreeradius-krb5 += $(raddbdir)/modules/krb5.CSW +PKGFILES_CSWfreeradius-krb5 += $(docdir)/rlm_krb5 +PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so +PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.1\.[0-9]+\.so +RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius +RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibgcc-s1 + +PACKAGES += CSWfreeradius-ldap +SPKG_DESC_CSWfreeradius-ldap = LDAP Module rlm_ldap for FreeRADIUS +PKGFILES_CSWfreeradius-ldap += $(raddbdir)/ldap\.attrmap\.CSW +PKGFILES_CSWfreeradius-ldap += $(raddbdir)/modules/ldap\.CSW +PKGFILES_CSWfreeradius-ldap += $(docdir)/ldap_howto\.rst +PKGFILES_CSWfreeradius-ldap += $(docdir)/RADIUS-LDAP-eDirectory +PKGFILES_CSWfreeradius-ldap += $(docdir)/rlm_ldap +PKGFILES_CSWfreeradius-ldap += $(docdir)/examples/openldap.schema +PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap\.so +PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so +RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius +RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibgcc-s1 + +## Disabling Perl due to linker issues and weird makefiles +#PACKAGES += CSWfreeradius-perl +SPKG_DESC_CSWfreeradius-perl = Perl Module rlm_perl for FreeRADIUS +RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWperl +RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWfreeradius +PKGFILES_CSWfreeradius-perl += $(raddbdir)/example.pl +rlm_perl_inc = $(shell /opt/csw/bin/perl -e 'use Config; print "$$Config{archlib}\n"')/CORE +# CONFIGURE_ARGS += --with-rlm_perl_include_dir=$(rlm_perl_inc) +CONFIGURE_ARGS += --without-rlm_perl +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/example.pl +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/modules/perl + +## Disabling Postgresql because it's going to take a bunch of weird +## Makefile hackery of these non-automake Makefiles to get the RPATH right +#BUILD_DEP_PKGS += CSWpostgresql +#rlm_pgsql_lib = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --libdir) +#rlm_pgsql_inc = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --includedir) +#CONFIGURE_ARGS += --with-rlm_sql_postgresql_lib_dir=$(rlm_pgsql_lib) +#CONFIGURE_ARGS += --with-rlm_sql_postgresql_include_dir=$(rlm_pgsql_inc) +## Comment out the following lines when building PostgreSQL support +CONFIGURE_ARGS += --without-rlm_sql_postgresql +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql/.* +## End pgsql exclusion lines + +## Disabling MySQL because it's going to take a bunch of weird +## Makefile hackery of these non-automake Makefiles to get the RPATH right +#BUILD_DEP_PKGS += CSWmysql5devel +#CONFIGURE_ARGS += --with-mysql-lib-dir=/opt/csw/mysql5/lib/$(ISA)/mysql +#CONFIGURE_ARGS += --with-mysql-include-dir=/opt/csw/mysql5/include +## Comment out the following lines when building mysql support +CONFIGURE_ARGS += --without-rlm_sql_mysql +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql +EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql/.* +## End mysql exclusion lines +GARCOMPILER = GCC4 + +CSWfreeradius_usergroup = radius:radius:FreeRADIUS:/var/opt/csw/freeradius:/bin/false:: + +# Some of the RLM Submodules don't seem to pick up the include paths from CPPFLAGS +EXTRA_CFLAGS = $(CPPFLAGS) + # Put libraries (including all of the modules) in /opt/csw/lib/freeradius -libdir = $(abspath $(libdir_install)/$(NAME)/$(MM_LIBDIR)) +libdir = $(abspath $(libdir_install)/freeradius/$(MM_LIBDIR)) -# Put the config in the recommended /etc/opt/csw tree -sysconfdir = /etc$(prefix) -raddbdir = $(sysconfdir)/freeradius -# move all of the var stuff to /var/opt/csw -localstatedir = /var$(prefix) +raddbdir = $(sysconfdir)/freeradius # This should match the variable run_dir in radiusd.conf radius_run_dir = $(localstatedir)/run/radius -## Configuration directory +# Configuration directory PRESERVECONF += $(raddbdir)/.*\.conf PRESERVECONF += $(raddbdir)/acct_users PRESERVECONF += $(raddbdir)/attrs.* @@ -81,7 +158,7 @@ EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sites-enabled/control-socket EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sites-enabled/inner-tunnel -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += CC=$(CC) CXX=$(CXX) F77=$(F77) FC=$(FC) CONFIGURE_ARGS += CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" FCFLAGS="$(FCFLAGS)" @@ -103,147 +180,50 @@ CONFIGURE_ARGS += --without-rlm_sql_freetds CONFIGURE_ARGS += --without-rlm_sql_iodbc CONFIGURE_ARGS += --without-rlm_sql_sybase + CONFIGURE_ARGS += --without-rlm_sql_db2 EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mssql EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mssql/.* + CONFIGURE_ARGS += --without-rlm_sql_oracle EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/oracle EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/oracle/.* -## Individual Package definitions start here +# There is no testsuite +TEST_SCRIPTS = -PACKAGES += CSWfreeradius -CATALOGNAME_CSWfreeradius = $(NAME) -SPKG_DESC_CSWfreeradius = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpcap -RUNTIME_DEP_PKGS_CSWfreeradius += CSWosslrt -RUNTIME_DEP_PKGS_CSWfreeradius += CSWgdbm -RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWfreeradius += CSWreadline -RUNTIME_DEP_PKGS_CSWfreeradius += CSWgcc4corert - -## Kerberos -PACKAGES += CSWfreeradius-krb5 -CATALOGNAME_CSWfreeradius-krb5 = freeradius_krb5 -SPKG_DESC_CSWfreeradius-krb5 = Kerberos 5 Module rlm_krb5 for FreeRADIUS -PKGFILES_CSWfreeradius-krb5 += $(raddbdir)/modules/krb5.CSW -PKGFILES_CSWfreeradius-krb5 += $(docdir)/rlm_krb5 -PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so -PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.1\.[0-9]+\.so -RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius -RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWgcc4corert - -## LDAP -PACKAGES += CSWfreeradius-ldap -CATALOGNAME_CSWfreeradius-ldap = freeradius_ldap -SPKG_DESC_CSWfreeradius-ldap = LDAP Module rlm_ldap for FreeRADIUS -PKGFILES_CSWfreeradius-ldap += $(raddbdir)/ldap\.attrmap\.CSW -PKGFILES_CSWfreeradius-ldap += $(raddbdir)/modules/ldap\.CSW -PKGFILES_CSWfreeradius-ldap += $(docdir)/ldap_howto\.rst -PKGFILES_CSWfreeradius-ldap += $(docdir)/RADIUS-LDAP-eDirectory -PKGFILES_CSWfreeradius-ldap += $(docdir)/rlm_ldap -PKGFILES_CSWfreeradius-ldap += $(docdir)/examples/openldap.schema -PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap\.so -PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so -RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWoldaprt -RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius -RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWgcc4corert - -## Perl support -## Disabling Perl due to linker issues and weird makefiles -#PACKAGES += CSWfreeradius-perl -#CATALOGNAME_CSWfreeradius-perl = freeradius-perl -#SPKG_DESC_CSWfreeradius-perl = Perl Module rlm_perl for FreeRADIUS -#RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWperl -#RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWfreeradius -#PKGFILES_CSWfreeradius-perl += $(raddbdir)/example.pl -#rlm_perl_inc = $(shell /opt/csw/bin/perl -e 'use Config; print "$$Config{archlib}\n"')/CORE -#CONFIGURE_ARGS += --with-rlm_perl_include_dir=$(rlm_perl_inc) -## Comment out the following lines when building Perl -CONFIGURE_ARGS += --without-rlm_perl -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/example.pl -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/modules/perl -## End perl exclusion lines - -## PostgreSQL support -## Disabling Postgresql because it's going to take a bunch of weird -## Makefile hackery of these non-automake Makefiles to get the RPATH right -#BUILD_DEP_PKGS += CSWpostgresql -#rlm_pgsql_lib = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --libdir) -#rlm_pgsql_inc = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --includedir) -#CONFIGURE_ARGS += --with-rlm_sql_postgresql_lib_dir=$(rlm_pgsql_lib) -#CONFIGURE_ARGS += --with-rlm_sql_postgresql_include_dir=$(rlm_pgsql_inc) -## Comment out the following lines when building PostgreSQL support -CONFIGURE_ARGS += --without-rlm_sql_postgresql -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql/.* -## End pgsql exclusion lines - -## Disabling MySQL because it's going to take a bunch of weird -## Makefile hackery of these non-automake Makefiles to get the RPATH right -#BUILD_DEP_PKGS += CSWmysql5devel -#CONFIGURE_ARGS += --with-mysql-lib-dir=/opt/csw/mysql5/lib/$(ISA)/mysql -#CONFIGURE_ARGS += --with-mysql-include-dir=/opt/csw/mysql5/include -## Comment out the following lines when building mysql support -CONFIGURE_ARGS += --without-rlm_sql_mysql -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql -EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql/.* -## End mysql exclusion lines - - -# No tests available -TEST_TARGET = - INSTALL_ARGS += R=$(DESTDIR) INITSMF = /etc/opt/csw/init.d/cswfreeradius # Fix permissions on the radiusd rundir (disabled for now) -#PROTOTYPE_MODIFIERS += rundir -#PROTOTYPE_FILES_rundir = $(radius_run_dir) -#PROTOTYPE_USER_rundir = radius -#PROTOTYPE_GROUP_rundir = radius -#PROTOTYPE_CLASS_rundir = ugfiles +PROTOTYPE_MODIFIERS += rundir +PROTOTYPE_FILES_rundir = $(radius_run_dir) +PROTOTYPE_USER_rundir = radius +PROTOTYPE_GROUP_rundir = radius +PROTOTYPE_CLASS_rundir = ugfiles # Fix permissions on the configuration directory -#PROTOTYPE_MODIFIERS += raddb -#PROTOTYPE_FILES_raddb = $(raddbdir) -#PROTOTYPE_FILES_raddb += $(raddbdir)/.* -#PROTOTYPE_USER_raddb = radius -#PROTOTYPE_GROUP_raddb = radius +PROTOTYPE_MODIFIERS += raddb +PROTOTYPE_FILES_raddb = $(raddbdir) +PROTOTYPE_FILES_raddb += $(raddbdir)/.* +PROTOTYPE_USER_raddb = radius +PROTOTYPE_GROUP_raddb = radius +PROTOTYPE_CLASS_raddb = ugfiles include gar/category.mk PATH := /opt/csw/gnu:$(PATH) post-install-modulated: - ### Copy init script @echo "Installing init script..." ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall $(WORKDIR)/cswfreeradius \ - $(DESTDIR)/etc/opt/csw/init.d/cswfreeradius - - # Copy self-signed sample cert + ginstall $(WORKDIR)/cswfreeradius $(DESTDIR)/etc/opt/csw/init.d/cswfreeradius @echo "Installing sample certificate files..." ginstall -m 640 $(FILEDIR)/ca.pem $(DESTDIR)/$(raddbdir)/certs/ ginstall -m 640 $(FILEDIR)/server.pem $(DESTDIR)/$(raddbdir)/certs/ - - # Copy cswusergroup - disabled, see comments near USERGROUP line - #@echo "Installing cswusergroup support file..." - #ginstall -D $(FILEDIR)/cswusergroup \ - # $(DESTDIR)$(sysconfdir)/pkg/CSW$(NAME)/cswusergroup - - # Create PID dir @echo "Creating PID file directory" - ginstall -D $(DESTDIR)$(radius_run_dir) - - # Relax the permissions on the dictionary file since it contains no - # secrets and radclient needs it + ginstall -d $(DESTDIR)$(radius_run_dir) @echo "Relaxing permissions on dictionary file" chmod 644 $(DESTDIR)$(raddbdir)/dictionary - - # Set the Make cookie @$(MAKECOOKIE) - Modified: csw/mgar/pkg/freeradius/trunk/checksums =================================================================== --- csw/mgar/pkg/freeradius/trunk/checksums 2012-04-24 14:53:30 UTC (rev 17857) +++ csw/mgar/pkg/freeradius/trunk/checksums 2012-04-24 15:42:16 UTC (rev 17858) @@ -1 +1 @@ -e552704fc1b46d51176e575afa96dcc6 freeradius-server-2.1.10.tar.gz +dcbaed16df8ccff672ba132a08bf8510 freeradius-server-2.1.12.tar.gz Deleted: csw/mgar/pkg/freeradius/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/freeradius/trunk/files/cswusergroup 2012-04-24 14:53:30 UTC (rev 17857) +++ csw/mgar/pkg/freeradius/trunk/files/cswusergroup 2012-04-24 15:42:16 UTC (rev 17858) @@ -1 +0,0 @@ -radius:radius:FreeRADIUS:/var/opt/csw/freeradius:/bin/false:: 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 Apr 24 21:20:28 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 24 Apr 2012 19:20:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[17859] csw/mgar/pkg/openssl/trunk/checksums Message-ID: Revision: 17859 http://gar.svn.sourceforge.net/gar/?rev=17859&view=rev Author: chninkel Date: 2012-04-24 19:20:27 +0000 (Tue, 24 Apr 2012) Log Message: ----------- openssl/trunk: checksum update Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2012-04-24 15:42:16 UTC (rev 17858) +++ csw/mgar/pkg/openssl/trunk/checksums 2012-04-24 19:20:27 UTC (rev 17859) @@ -1 +1 @@ -51a40a81b3b7abe8a5c33670bd3da0ce openssl-0.9.8v.tar.gz +4ceb7d570e42c094b360cc7b8e848a0b openssl-0.9.8w.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 24 23:39:09 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Apr 2012 21:39:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[17860] csw/mgar/pkg Message-ID: Revision: 17860 http://gar.svn.sourceforge.net/gar/?rev=17860&view=rev Author: dmichelsen Date: 2012-04-24 21:39:09 +0000 (Tue, 24 Apr 2012) Log Message: ----------- mosh/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/mosh/ csw/mgar/pkg/mosh/Makefile csw/mgar/pkg/mosh/branches/ csw/mgar/pkg/mosh/tags/ csw/mgar/pkg/mosh/trunk/ csw/mgar/pkg/mosh/trunk/Makefile csw/mgar/pkg/mosh/trunk/checksums csw/mgar/pkg/mosh/trunk/files/ csw/mgar/pkg/mosh/trunk/files/0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch csw/mgar/pkg/mosh/trunk/files/0002-Various-Solaris-fixes.patch Added: csw/mgar/pkg/mosh/Makefile =================================================================== --- csw/mgar/pkg/mosh/Makefile (rev 0) +++ csw/mgar/pkg/mosh/Makefile 2012-04-24 21:39:09 UTC (rev 17860) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mosh/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mosh/trunk/Makefile =================================================================== --- csw/mgar/pkg/mosh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mosh/trunk/Makefile 2012-04-24 21:39:09 UTC (rev 17860) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mosh +VERSION = 1.1.3 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Mobile shell + +MASTER_SITES = https://github.com/downloads/keithw/mosh/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch +PATCHFILES += 0002-Various-Solaris-fixes.patch + +# Functions betoh64 from http://licq.sourcearchive.com/documentation/1.3.8/licq__byteorder_8h-source.html + +PACKAGES += CSWmosh +SPKG_DESC_CSWmypkg = Mobile shell + +# boost gxx is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# See https://forums.oracle.com/forums/thread.jspa?threadID=2019232 +EXTRA_CPPFLAGS += -D__aligned__=aligned + +GARCOMPILER = GCC4 + +EXTRA_INC += $(prefix)/gxx/include +EXTRA_LIB += $(prefix)/gxx/lib + +include gar/category.mk + +post-patch-modulated: + -cd $(WORKSRC) && /opt/csw/bin/autoreconf -fi + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/mosh/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mosh/trunk/checksums =================================================================== --- csw/mgar/pkg/mosh/trunk/checksums (rev 0) +++ csw/mgar/pkg/mosh/trunk/checksums 2012-04-24 21:39:09 UTC (rev 17860) @@ -0,0 +1 @@ +de507695b6f67523bc81596f97220a9a mosh-1.1.3.tar.gz Added: csw/mgar/pkg/mosh/trunk/files/0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch =================================================================== --- csw/mgar/pkg/mosh/trunk/files/0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch (rev 0) +++ csw/mgar/pkg/mosh/trunk/files/0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch 2012-04-24 21:39:09 UTC (rev 17860) @@ -0,0 +1,26 @@ +From 7bbb71c6ce9873cf1c53f555fd7f7a5726ba1248 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Apr 2012 16:00:42 +0200 +Subject: [PATCH] Test on inttypes.h in addition to stdint.h and don't bail + out + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 528a7a9..2e03605 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,7 +101,7 @@ AS_IF([test x"$with_skalibs" != xno], + AC_SUBST([STDDJB_LDFLAGS], ["$SKALIBS_LDFLAGS -lstddjb"])]) + + # Checks for header files. +-AC_CHECK_HEADERS([arpa/inet.h curses.h fcntl.h langinfo.h limits.h locale.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/resource.h sys/socket.h sys/time.h term.h termios.h unistd.h wchar.h wctype.h], [], [AC_MSG_ERROR([Missing required header file.])]) ++AC_CHECK_HEADERS([arpa/inet.h curses.h fcntl.h langinfo.h limits.h locale.h netinet/in.h stddef.h stdint.h inttypes.h stdlib.h string.h sys/ioctl.h sys/resource.h sys/socket.h sys/time.h term.h termios.h unistd.h wchar.h wctype.h], [], []) + + AC_CHECK_HEADERS([pty.h util.h]) + +-- +1.7.9 + Added: csw/mgar/pkg/mosh/trunk/files/0002-Various-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/mosh/trunk/files/0002-Various-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/mosh/trunk/files/0002-Various-Solaris-fixes.patch 2012-04-24 21:39:09 UTC (rev 17860) @@ -0,0 +1,169 @@ +From a3f705dbf1e546b6564415a8694f975757b3f19e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 Apr 2012 23:27:33 +0200 +Subject: [PATCH] Various Solaris fixes + +--- + configure.ac | 2 +- + src/crypto/base64.h | 2 +- + src/crypto/byteorder.h | 26 ++++++++++++++++++++++++++ + src/crypto/crypto.cc | 3 ++- + src/crypto/crypto.h | 5 +++++ + src/crypto/ocb.cc | 9 ++++++++- + src/crypto/prng.h | 5 +++++ + src/terminal/parser.cc | 3 ++- + 8 files changed, 50 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2e03605..b526d59 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,7 +157,7 @@ AC_CHECK_DECL([htobe64], + [AC_CHECK_DECL([OSSwapHostToBigInt64], + [AC_DEFINE([HAVE_OSX_SWAP], [1], + [Define if OSSwapHostToBigInt64 and friends exist.])], +- [AC_MSG_ERROR([Unable to find byte swapping functions])], ++ [], + [[#include ]])], + [[#include ]]) + +diff --git a/src/crypto/base64.h b/src/crypto/base64.h +index 7593e59..46eab7a 100644 +--- a/src/crypto/base64.h ++++ b/src/crypto/base64.h +@@ -27,7 +27,7 @@ + # include + + /* Get bool. */ +-# include ++/* # include */ + + /* This uses that the expression (n+(k-1))/k means the smallest + integer >= n/k, i.e., the ceiling of n/k. */ +diff --git a/src/crypto/byteorder.h b/src/crypto/byteorder.h +index f0c7f06..14a03de 100644 +--- a/src/crypto/byteorder.h ++++ b/src/crypto/byteorder.h +@@ -31,4 +31,30 @@ + # define be16toh OSSwapBigToHostInt16 + #endif + ++/* Taken from http://licq.sourcearchive.com/documentation/1.3.8/licq__byteorder_8h-source.html */ ++ ++// Solaris header for endian and byte swap ++#if defined(__sun) || defined(sun) ++# include ++ ++// Solaris defines endian by setting _LITTLE_ENDIAN or _BIG_ENDIAN ++# ifdef _BIG_ENDIAN ++# define IS_BIG_ENDIAN ++# endif ++# ifdef _LITTLE_ENDIAN ++# define IS_LITTLE_ENDIAN ++# endif ++ ++// Solaris 10 defines bswap functions: BSWAP_16, BSWAP_32, BSWAP_64 ++// Solaris 10 defines conversion functions: BE_16, BE_32, BE_64, LE_16, LE_32, LE_64 ++// BSD defines conversion functions: betoh16, betoh32, betoh64, letoh16, letoh32, letoh64 ++# define betoh64(x) BE_64(x) ++# define letoh64(x) LE_64(x) ++ ++#define htobe64(x) BE_64(x) ++#define be64toh(x) BE_64(x) ++ ++#endif ++ ++ + #endif +diff --git a/src/crypto/crypto.cc b/src/crypto/crypto.cc +index e4f928f..497c6ea 100644 +--- a/src/crypto/crypto.cc ++++ b/src/crypto/crypto.cc +@@ -263,7 +263,8 @@ Message Session::decrypt( string ciphertext ) + exit( 1 ); + } + +- Nonce __attribute__((__aligned__ (16))) nonce( str, 8 ); ++ /* Nonce __attribute__((__aligned__ (16))) nonce( str, 8 ); */ ++ Nonce nonce( str, 8 ); + char *body = (char *)aligned_alloc( body_len ); + memcpy( body, str + 8, body_len ); + +diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h +index 1a2d897..20a4a76 100644 +--- a/src/crypto/crypto.h ++++ b/src/crypto/crypto.h +@@ -22,7 +22,12 @@ + #include "ae.h" + #include + #include ++ ++#if defined( HAVE_STDINT_H ) + #include ++#elsif defined( HAVE_INTTYPES_H ) ++ #include ++#endif + + using std::string; + +diff --git a/src/crypto/ocb.cc b/src/crypto/ocb.cc +index 8176896..790d96a 100644 +--- a/src/crypto/ocb.cc ++++ b/src/crypto/ocb.cc +@@ -74,6 +74,9 @@ + #include + #include + ++#include "config.h" ++#include ++ + /* Define standard sized integers */ + #if defined(_MSC_VER) && (_MSC_VER < 1600) + typedef unsigned __int8 uint8_t; +@@ -81,7 +84,11 @@ + typedef unsigned __int64 uint64_t; + typedef __int64 int64_t; + #else +- #include ++#if HAVE_STDINT_H ++#include ++#elsif HAVE_INTTYPES_H ++ #include ++#endif + #endif + + /* Compiler-specific intrinsics and fixes: bswap64, ntz */ +diff --git a/src/crypto/prng.h b/src/crypto/prng.h +index fdaf48e..0d89d79 100644 +--- a/src/crypto/prng.h ++++ b/src/crypto/prng.h +@@ -23,7 +23,12 @@ + #include + #include + #include ++ ++#if defined( HAVE_STDINT_H ) + #include ++#elsif defined( HAVE_INTTYPES_H ) ++ #include ++#endif + + #include "crypto.h" + +diff --git a/src/terminal/parser.cc b/src/terminal/parser.cc +index 227763f..0de6ff4 100644 +--- a/src/terminal/parser.cc ++++ b/src/terminal/parser.cc +@@ -20,7 +20,8 @@ + #include + #include + #include +-#include ++/* #include */ ++#include + + #include "parser.h" + +-- +1.7.10 + 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 Apr 25 08:57:49 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Apr 2012 06:57:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[17861] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17861 http://gar.svn.sourceforge.net/gar/?rev=17861&view=rev Author: pfelecan Date: 2012-04-25 06:57:49 +0000 (Wed, 25 Apr 2012) Log Message: ----------- - factorized sub-packages description - unified build dependencies - split runt-time dependencies Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-24 21:39:09 UTC (rev 17860) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-25 06:57:49 UTC (rev 17861) @@ -42,23 +42,28 @@ CSWggettext-dev \ CSWlibthaidevel \ CSWlibotf-dev -RUNTIME_DEP_PKGS = \ - CSWggettext \ - CSWlibthai \ - CSWlibotf + PACKAGES += CSWlibm17n0 -SPKG_DESC_CSWlibm17n0 += A multilingual text processing library for the C language - runtime. +SPKG_DESC_CSWlibm17n0 += $(DESCRIPTION) - runtime. PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n + PACKAGES += CSWlibm17n-dev -SPKG_DESC_CSWlibm17n-dev += A multilingual text processing library for the C language - development. +SPKG_DESC_CSWlibm17n-dev += $(DESCRIPTION) - development. PKGFILES_CSWlibm17n-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibm17n-dev += CSWlibm17n0 +RUNTIME_DEP_PKGS_CSWlibm17n-dev += CSWlibm17n0 \ + CSWggettext \ + CSWlibthai \ + CSWlibotf +OBSOLETED_BY_CSWlibm17n-dev += CSWlibm17ndevel PACKAGES += CSWlibm17n-utils -SPKG_DESC_CSWlibm17n-utils += A multilingual text processing library for the C language - utilities. +SPKG_DESC_CSWlibm17n-utils += $(DESCRIPTION) - utilities. OBSOLETED_BY_CSWlibm17n-utils += CSWlibm17n -RUNTIME_DEP_PKGS_CSWlibm17n-utils += CSWlibm17n0 +RUNTIME_DEP_PKGS_CSWlibm17n-utils += CSWlibm17n0 \ + CSWggettext \ + CSWlibthai \ + CSWlibotf include gar/category.mk 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 Apr 25 09:11:11 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Apr 2012 07:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17862] csw/mgar/pkg/libotf/trunk/Makefile Message-ID: Revision: 17862 http://gar.svn.sourceforge.net/gar/?rev=17862&view=rev Author: pfelecan Date: 2012-04-25 07:11:10 +0000 (Wed, 25 Apr 2012) Log Message: ----------- - factorized sub-packages description Modified Paths: -------------- csw/mgar/pkg/libotf/trunk/Makefile Modified: csw/mgar/pkg/libotf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libotf/trunk/Makefile 2012-04-25 06:57:49 UTC (rev 17861) +++ csw/mgar/pkg/libotf/trunk/Makefile 2012-04-25 07:11:10 UTC (rev 17862) @@ -34,7 +34,7 @@ GARCOMPILER = GNU PACKAGES += CSWlibotf0 -SPKG_DESC_CSWlibotf0 = A Library for handling OpenType Font - runtime +SPKG_DESC_CSWlibotf0 = $(DESCRIPTION) - runtime PKGFILES_CSWlibotf0 += $(call pkgfiles_lib,libotf.so.0.0.0) OBSOLETED_BY_CSWlibotf0 += CSWlibotf RUNTIME_DEP_PKGS_CSWlibotf0 += \ @@ -43,14 +43,14 @@ CSWlibz1 \ CSWlibbz2-1-0 PACKAGES += CSWlibotf-dev -SPKG_DESC_CSWlibotf-dev = A Library for handling OpenType Font - development +SPKG_DESC_CSWlibotf-dev = $(DESCRIPTION) - development PKGFILES_CSWlibotf-dev = $(PKGFILES_DEVEL) CATALOGNAME_CSWlibotf-dev = libotf_dev OBSOLETED_BY_CSWlibotf-dev = CSWlibotfdevel RUNTIME_DEP_PKGS_CSWlibotf-dev += CSWlibotf0 PACKAGES += CSWlibotf-utils -SPKG_DESC_CSWlibotf-utils = A Library for handling OpenType Font - utilities +SPKG_DESC_CSWlibotf-utils = $(DESCRIPTION) - utilities CATALOGNAME_CSWlibotf-utils = libotf_utils OBSOLETED_BY_CSWlibotf-utils += CSWlibotf RUNTIME_DEP_PKGS_CSWlibotf-utils += \ 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 Apr 25 10:03:56 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Apr 2012 08:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17863] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17863 http://gar.svn.sourceforge.net/gar/?rev=17863&view=rev Author: pfelecan Date: 2012-04-25 08:03:56 +0000 (Wed, 25 Apr 2012) Log Message: ----------- new dependencies as suggested bu checkpkg Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-25 07:11:10 UTC (rev 17862) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-25 08:03:56 UTC (rev 17863) @@ -47,23 +47,34 @@ SPKG_DESC_CSWlibm17n0 += $(DESCRIPTION) - runtime. PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n - +RUNTIME_DEP_PKGS_CSWlibm17n-dev += \ + CSWlibotf0 \ + CSWlibthai \ + CSWlibiconv2 \ + CSWlibxml2-2 \ + CSWlibxft2 \ + CSWlibxrender \ + CSWfribidi \ + CSWlibgd2 \ + CSWfconfig PACKAGES += CSWlibm17n-dev SPKG_DESC_CSWlibm17n-dev += $(DESCRIPTION) - development. PKGFILES_CSWlibm17n-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibm17n-dev += CSWlibm17n0 \ +RUNTIME_DEP_PKGS_CSWlibm17n-dev += \ + CSWlibm17n0 \ CSWggettext \ CSWlibthai \ - CSWlibotf + CSWlibotf0 OBSOLETED_BY_CSWlibm17n-dev += CSWlibm17ndevel PACKAGES += CSWlibm17n-utils SPKG_DESC_CSWlibm17n-utils += $(DESCRIPTION) - utilities. OBSOLETED_BY_CSWlibm17n-utils += CSWlibm17n -RUNTIME_DEP_PKGS_CSWlibm17n-utils += CSWlibm17n0 \ +RUNTIME_DEP_PKGS_CSWlibm17n-utils += \ + CSWlibm17n0 \ CSWggettext \ CSWlibthai \ - CSWlibotf + CSWlibotf0 include gar/category.mk 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 Apr 25 10:17:18 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Apr 2012 08:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[17864] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17864 http://gar.svn.sourceforge.net/gar/?rev=17864&view=rev Author: pfelecan Date: 2012-04-25 08:17:18 +0000 (Wed, 25 Apr 2012) Log Message: ----------- corrected runtime dependencies macro-command name Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-25 08:03:56 UTC (rev 17863) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-25 08:17:18 UTC (rev 17864) @@ -47,7 +47,7 @@ SPKG_DESC_CSWlibm17n0 += $(DESCRIPTION) - runtime. PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n -RUNTIME_DEP_PKGS_CSWlibm17n-dev += \ +RUNTIME_DEP_PKGS_CSWlibm17n0 += \ CSWlibotf0 \ CSWlibthai \ CSWlibiconv2 \ 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 Apr 25 11:39:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 09:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17865] csw/mgar/pkg/freeradius/trunk/ Message-ID: Revision: 17865 http://gar.svn.sourceforge.net/gar/?rev=17865&view=rev Author: dmichelsen Date: 2012-04-25 09:39:24 +0000 (Wed, 25 Apr 2012) Log Message: ----------- freeradius/trunk: Remove extra svn ignores Property Changed: ---------------- csw/mgar/pkg/freeradius/trunk/ Property changes on: csw/mgar/pkg/freeradius/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work 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 Apr 25 11:54:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 09:54:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[17866] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 17866 http://gar.svn.sourceforge.net/gar/?rev=17866&view=rev Author: dmichelsen Date: 2012-04-25 09:54:12 +0000 (Wed, 25 Apr 2012) Log Message: ----------- libtool/trunk: Make patch to apply in new default ISA Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2012-04-25 09:39:24 UTC (rev 17865) +++ csw/mgar/pkg/libtool/trunk/Makefile 2012-04-25 09:54:12 UTC (rev 17866) @@ -22,7 +22,7 @@ DISTFILES += README.CSW PATCH_LIBTOOL = 0002-Forward-port-GCC-tags-patch.patch -PATCHFILES_POSTINSTALL_isa-i386-garcompiler-SOS12 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-pentium_pro-garcompiler-SOS12 = $(PATCH_LIBTOOL) PATCHFILES_POSTINSTALL_isa-sparcv8-garcompiler-SOS12 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) 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 Apr 25 13:58:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 11:58:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17867] csw/mgar/pkg/autoconf/trunk Message-ID: Revision: 17867 http://gar.svn.sourceforge.net/gar/?rev=17867&view=rev Author: dmichelsen Date: 2012-04-25 11:58:37 +0000 (Wed, 25 Apr 2012) Log Message: ----------- autoconf/trunk: Update to 2.69 and latest Makefile standards Modified Paths: -------------- csw/mgar/pkg/autoconf/trunk/Makefile csw/mgar/pkg/autoconf/trunk/checksums Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2012-04-25 09:54:12 UTC (rev 17866) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2012-04-25 11:58:37 UTC (rev 17867) @@ -1,7 +1,7 @@ # $Id$ NAME = autoconf -VERSION = 2.68 +VERSION = 2.69 CATEGORIES = devel GARTYPE = v2 @@ -18,26 +18,41 @@ PATCHFILES = 0001-Prefer-CSW-tools.patch -BUILD_DEP_PKGS = CSWhelp2man +VENDOR_URL = http://www.gnu.org/software/autoconf/ +BUILD_DEP_PKGS += CSWhelp2man + # We need the Fortran runtime libs or the Fortran tests with fail BUILD_DEP_PKGS += CSWss12f95rt -RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl +PACKAGES += CSWautoconf +SPKG_DESC_CSWautoconf = GNU auto-configuration tool +# PKGFILES is catchall +ARCHALL_CSWautoconf = 1 +RUNTIME_DEP_PKGS_CSWautoconf += CSWperl +RUNTIME_DEP_PKGS_CSWautoconf += CSWgawk +RUNTIME_DEP_PKGS_CSWautoconf += CSWgm4 +# checkpkg cannot track these +CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgm4 +CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgawk -VENDOR_URL = http://www.gnu.org/software/autoconf/ +# This is just for the emacs style +CHECKPKG_OVERRIDES_CSWautoconf += missing-dependency|CSWemacscommon -CONFIGURE_ARGS = $(DIRPATHS) +# These are just docs +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/INSTALL +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/info/autoconf.info +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/share|root/opt/csw/share/info/autoconf.info -# Tests take a loooooonnng time. -# TEST_SCRIPTS = +# The search pathes also include /usr/local among others +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/autoconf/autoconf.m4f +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/autoconf/functions.m4 +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/autoconf/general.m4 +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/autoconf/fortran.m4 +CHECKPKG_OVERRIDES_CSWautoconf += file-with-bad-content|/usr/local|root/opt/csw/share/autoconf/autoconf/libs.m4 EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info -CHECKPKG_OVERRIDES_CSWautoconf += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgm4 -CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgawk - include gar/category.mk # Package has two bad string which should be ignored: Modified: csw/mgar/pkg/autoconf/trunk/checksums =================================================================== --- csw/mgar/pkg/autoconf/trunk/checksums 2012-04-25 09:54:12 UTC (rev 17866) +++ csw/mgar/pkg/autoconf/trunk/checksums 2012-04-25 11:58:37 UTC (rev 17867) @@ -1 +1 @@ -c3b5247592ce694f7097873aa07d66fe autoconf-2.68.tar.gz +82d05e03b93e45f5a39b828dc9c6c29b autoconf-2.69.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 25 14:09:13 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 12:09:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17868] csw/mgar/pkg/libdatrie/trunk Message-ID: Revision: 17868 http://gar.svn.sourceforge.net/gar/?rev=17868&view=rev Author: dmichelsen Date: 2012-04-25 12:09:13 +0000 (Wed, 25 Apr 2012) Log Message: ----------- libdatrie/trunk: Update to 0.2.5 and new dependencies Modified Paths: -------------- csw/mgar/pkg/libdatrie/trunk/Makefile csw/mgar/pkg/libdatrie/trunk/checksums Modified: csw/mgar/pkg/libdatrie/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdatrie/trunk/Makefile 2012-04-25 11:58:37 UTC (rev 17867) +++ csw/mgar/pkg/libdatrie/trunk/Makefile 2012-04-25 12:09:13 UTC (rev 17868) @@ -1,5 +1,5 @@ NAME = libdatrie -VERSION = 0.2.4 +VERSION = 0.2.5 CATEGORIES = lib GARTYPE = v2 @@ -28,7 +28,7 @@ SPKG_DESC_CSWlibdatrie-utils = Utility programs using libdatrie # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibdatrie1 -RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWiconv +RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibiconv2 BUILD64_LIBS_ONLY = 1 Modified: csw/mgar/pkg/libdatrie/trunk/checksums =================================================================== --- csw/mgar/pkg/libdatrie/trunk/checksums 2012-04-25 11:58:37 UTC (rev 17867) +++ csw/mgar/pkg/libdatrie/trunk/checksums 2012-04-25 12:09:13 UTC (rev 17868) @@ -1 +1 @@ -7f7d592114f98db9e4c7171c3f2befc5 libdatrie-0.2.4.tar.gz +c9b057d07198d66e1ac2eff32937d3d4 libdatrie-0.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 25 14:46:27 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 12:46:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[17869] csw/mgar/pkg/libthai/trunk Message-ID: Revision: 17869 http://gar.svn.sourceforge.net/gar/?rev=17869&view=rev Author: dmichelsen Date: 2012-04-25 12:46:27 +0000 (Wed, 25 Apr 2012) Log Message: ----------- libthai/trunk: Update to 0.1.17 Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile csw/mgar/pkg/libthai/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2012-04-25 12:09:13 UTC (rev 17868) +++ csw/mgar/pkg/libthai/trunk/Makefile 2012-04-25 12:46:27 UTC (rev 17869) @@ -1,5 +1,5 @@ NAME = libthai -VERSION = 0.1.12 +VERSION = 0.1.17 CATEGORIES = lib GARTYPE = v2 @@ -14,31 +14,30 @@ endef MASTER_SITES = http://linux.thai.net/pub/thailinux/software/libthai/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Remove-unknown-compiler-macro.patch +DISTFILES += $(DISTNAME).tar.gz -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=34448 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-Remove-unknown-compiler-macro.patch +PATCHFILES += 0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch -PACKAGES = CSWlibthai CSWlibthaidevel +VENDOR_URL = http://linux.thai.net/projects/libthai/ -CATALOGNAME_CSWlibthai = libthai -CATALOGNAME_CSWlibthaidevel = libthai_devel +BUILD_DEP_PKGS += CSWlibdatrie-dev +BUILD_DEP_PKGS += CSWlibdatrie-utils -SPKG_DESC_CSWlibthai = Thai language support routines -SPKG_DESC_CSWlibthaidevel = Thai language support routines development files +PACKAGES += CSWlibthai0 +SPKG_DESC_CSWlibthai0 = Thai language support routines, libthai.so.0 +PKGFILES_CSWlibthai0 += $(call pkgfiles_lib,libthai.so.0) +PKGFILES_CSWlibthai0 += $(sharedstatedir)/libthai/thbrk.tri +RUNTIME_DEP_PKGS_CSWlibthai0 = CSWlibdatrie1 +OBSOLETED_BY_CSWlibthai0 += CSWlibthai -SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/ +PACKAGES += CSWlibthai-dev +SPKG_DESC_CSWlibthai-dev = Thai language support routines development files +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibthai-dev = CSWlibthai0 +OBSOLETED_BY_CSWlibthai-dev += CSWlibthaidevel +CATALOGNAME_CSWlibthaidevel = libthai_devel_stub -RUNTIME_DEP_PKGS_CSWlibthai = CSWlibdatrie -RUNTIME_DEP_PKGS_CSWlibthaidevel = CSWlibthai -PREREQUISUITE_PKGS = $(RUNTIME_DEP_PKGS_CSWlibthai) - BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibthaidevel += $(docdir)/.* - include gar/category.mk Modified: csw/mgar/pkg/libthai/trunk/checksums =================================================================== --- csw/mgar/pkg/libthai/trunk/checksums 2012-04-25 12:09:13 UTC (rev 17868) +++ csw/mgar/pkg/libthai/trunk/checksums 2012-04-25 12:46:27 UTC (rev 17869) @@ -1,2 +1 @@ -11c46f4c6a8a3525861b750f890fee5e 0001-Remove-unknown-compiler-macro.patch -e206313d5a60ce98bc3be83d60373554 libthai-0.1.12.tar.gz +d94ddbf5e5a09a911c459f0a4ad1c041 libthai-0.1.17.tar.gz Added: csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch =================================================================== --- csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch (rev 0) +++ csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch 2012-04-25 12:46:27 UTC (rev 17869) @@ -0,0 +1,72 @@ +From 09758dc94dd2f70a92120843c7d28754bef85ef2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Apr 2012 14:23:49 +0200 +Subject: [PATCH] Use stdint.h only when available and use limits.h for + SIZE_MAX + +--- + src/thbrk/brk-maximal.c | 6 ++++++ + src/thbrk/thbrk.c | 8 ++++++++ + src/thwbrk/thwbrk.c | 7 +++++++ + 3 files changed, 21 insertions(+) + +diff --git a/src/thbrk/brk-maximal.c b/src/thbrk/brk-maximal.c +index 2ee9842..663013b 100644 +--- a/src/thbrk/brk-maximal.c ++++ b/src/thbrk/brk-maximal.c +@@ -26,7 +26,13 @@ + + #include + #include ++ ++#if defined( HAVE_STDINT_H ) + #include ++#elif defined( HAVE_INTTYPES_H ) ++#include ++#endif ++ + #include + #include + #include +diff --git a/src/thbrk/thbrk.c b/src/thbrk/thbrk.c +index 2fefffa..2b221d5 100644 +--- a/src/thbrk/thbrk.c ++++ b/src/thbrk/thbrk.c +@@ -26,7 +26,15 @@ + + #include + #include ++ ++#if defined( HAVE_STDINT_H ) + #include ++#elif defined( HAVE_INTTYPES_H ) ++#include ++#endif ++ ++#include ++ + #include + #include + #include +diff --git a/src/thwbrk/thwbrk.c b/src/thwbrk/thwbrk.c +index 8543df9..2ef8173 100644 +--- a/src/thwbrk/thwbrk.c ++++ b/src/thwbrk/thwbrk.c +@@ -26,7 +26,14 @@ + + #include + #include ++ ++#if defined( HAVE_STDINT_H ) + #include ++#elif defined( HAVE_INTTYPES_H ) ++#include ++#endif ++ ++#include + #include + + #include +-- +1.7.10 + 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 Apr 25 14:56:35 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 25 Apr 2012 12:56:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[17870] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17870 http://gar.svn.sourceforge.net/gar/?rev=17870&view=rev Author: cgrzemba Date: 2012-04-25 12:56:35 +0000 (Wed, 25 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDFLAGS for build python extension Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netsnmp/trunk/files/setup-py.patch Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-25 12:46:27 UTC (rev 17869) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-25 12:56:35 UTC (rev 17870) @@ -26,18 +26,22 @@ PATCHFILES = perl_makefiles.diff # Patch for python module PATCHFILES += Makefile.in.diff +PATCHFILES += setup-py.patch VENDOR_URL = http://www.net-snmp.org/ BUILD_DEP_PKGS = CSWpysetuptools -# RUNTIME_DEP_PKGS_CSWnetsnmp += CSWpython -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl PACKAGES += CSWnetsnmp-dev CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev SPKG_DESC_CSWnetsnmp-dev += $(DESCRIPTION), development files PKGFILES_CSWnetsnmp-dev += $(PKGFILES_DEVEL) +CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmphelpers25 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpmibs25 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd25 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent25 PACKAGES += CSWlibnetsnmp25 CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 @@ -48,6 +52,7 @@ CATALOGNAME_CSWlibnetsnmpagent25 = libnetsnmpagent25 SPKG_DESC_CSWlibnetsnmpagent25 += $(DESCRIPTION), libsnmpagent.so.25 PKGFILES_CSWlibnetsnmpagent25 += $(call baseisadirs,$(libdir),libnetsnmpagent\.so\.25(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmpagent25 += CSWlibnetsnmp25 PACKAGES += CSWlibnetsnmphelpers25 CATALOGNAME_CSWlibnetsnmphelpers25 = libnetsnmphelpers25 @@ -58,22 +63,54 @@ CATALOGNAME_CSWlibnetsnmpmibs25 = libnetsnmpmibs25 SPKG_DESC_CSWlibnetsnmpmibs25 += $(DESCRIPTION), libsnmpmibs.so.25 PKGFILES_CSWlibnetsnmpmibs25 += $(call baseisadirs,$(libdir),libnetsnmpmibs\.so\.25(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmpagent25 PACKAGES += CSWlibnetsnmptrapd25 CATALOGNAME_CSWlibnetsnmptrapd25 = libnetsnmptrapd25 SPKG_DESC_CSWlibnetsnmptrapd25 += $(DESCRIPTION), libsnmptrapd.so.25 PKGFILES_CSWlibnetsnmptrapd25 += $(call baseisadirs,$(libdir),libnetsnmptrapd\.so\.25(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpmibs25 +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpagent25 +EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod PACKAGES += CSWpmnetsnmp SPKG_DESC_CSWpmnetsnmp+= $(DESCRIPTION), Perl binding -PKGFILES_CSWpmnetsnmp += $(libdir)/perl +PKGFILES_CSWpmnetsnmp += $(libdir)/perl.* +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWperl +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpmibs25 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd25 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 -PACKAGES += CSWpynetsnmp -SPKG_DESC_CSWpynetsnmp += $(DESCRIPTION), Python binding -PKGFILES_CSWpynetsnmp = $(libdir)/python.* +CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm +EXTRA_MERGE_EXCLUDE_FILES = .*/*.pyc +PACKAGES += CSWpy-netsnmp +OBSOLETED_BY_CSWpy-netsnmp = CSWnetsnmp-py +SPKG_DESC_CSWpy-netsnmp += $(DESCRIPTION), Python binding +PKGFILES_CSWpy-netsnmp = $(libdir)/python.* +RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWpython +RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibnetsnmp25 + PACKAGES += CSWnetsnmp SPKG_DESC_CSWnetsnmp += $(DESCRIPTION), Base +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpmibs25 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmptrapd25 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpagent25 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m +CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert # BUILD64 = 1 @@ -125,21 +162,10 @@ INSTALL_OVERRIDE_VARS += SHELL INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash -EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod # Overriding specific libs is not possible right now. Refine when finished. # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert # override bad-rpath-entry becasue of /opt/csw/lib/ in perl module libs CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry @@ -153,6 +179,8 @@ # if find the header in /opt/csw/include first use the old header from # installed older version, thats why remove /opt/csw/include CFLAGS := $(filter-out -I/opt/csw/include,$(CFLAGS)) +LDFLAGS := $(filter-out -R/opt/csw/lib% -L/opt/csw/lib,$(LDFLAGS)) +# LDFLAGS := $(filter-out -L/opt/csw/lib,$(LDFLAGS)) #post-install-isa-sparcv8: # ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) Added: csw/mgar/pkg/netsnmp/trunk/files/setup-py.patch =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/setup-py.patch (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/files/setup-py.patch 2012-04-25 12:56:35 UTC (rev 17870) @@ -0,0 +1,11 @@ +--- a/python/setup.py ++++ b/python/setup.py +@@ -41,6 +41,7 @@ setup( + Extension("netsnmp.client_intf", ["netsnmp/client_intf.c"], + library_dirs=libdirs, + include_dirs=incdirs, +- libraries=libs ) ++ libraries=libs, ++ extra_link_args = ["-R/opt/csw/lib/$ISALIST","-R/opt/csw/lib"] ) + ] + ) 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 Apr 25 15:33:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 13:33:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17871] csw/mgar/pkg/freeradius/trunk/Makefile Message-ID: Revision: 17871 http://gar.svn.sourceforge.net/gar/?rev=17871&view=rev Author: dmichelsen Date: 2012-04-25 13:33:41 +0000 (Wed, 25 Apr 2012) Log Message: ----------- freeradius/trunk: Compile with Sun Studio (works OOTB) Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-25 12:56:35 UTC (rev 17870) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-25 13:33:41 UTC (rev 17871) @@ -29,7 +29,6 @@ RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgcc-s1 # These may be problematic, override for now CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/etc/opt/csw/freeradius/radiusd.conf.CSW @@ -57,7 +56,6 @@ RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius -RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibgcc-s1 PACKAGES += CSWfreeradius-ldap SPKG_DESC_CSWfreeradius-ldap = LDAP Module rlm_ldap for FreeRADIUS @@ -71,7 +69,6 @@ PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius -RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibgcc-s1 ## Disabling Perl due to linker issues and weird makefiles #PACKAGES += CSWfreeradius-perl @@ -108,8 +105,9 @@ EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql/.* ## End mysql exclusion lines -GARCOMPILER = GCC4 +# GARCOMPILER = GCC4 + CSWfreeradius_usergroup = radius:radius:FreeRADIUS:/var/opt/csw/freeradius:/bin/false:: # Some of the RLM Submodules don't seem to pick up the include paths from CPPFLAGS 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 Apr 25 15:37:37 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 25 Apr 2012 13:37:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[17872] csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles. diff Message-ID: Revision: 17872 http://gar.svn.sourceforge.net/gar/?rev=17872&view=rev Author: cgrzemba Date: 2012-04-25 13:37:37 +0000 (Wed, 25 Apr 2012) Log Message: ----------- netsnmp/trunk: fix LDDLFLAGS for deafult_store.so Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-25 13:33:41 UTC (rev 17871) +++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2012-04-25 13:37:37 UTC (rev 17872) @@ -70,7 +70,7 @@ } else { $opts = NetSNMPGetOpts("../../"); -+ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs $Config{lddlflags}"; ++ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`; $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`; chomp($Params{'LIBS'}); $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`; 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 Apr 25 20:17:13 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Apr 2012 18:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17873] csw/mgar/pkg/libtorrent/trunk Message-ID: Revision: 17873 http://gar.svn.sourceforge.net/gar/?rev=17873&view=rev Author: dmichelsen Date: 2012-04-25 18:17:13 +0000 (Wed, 25 Apr 2012) Log Message: ----------- libtorrent/trunk: Rework regarding libtorrent-rasterbar Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libtorrent/trunk/files/0001-More-Solaris-fixes.patch Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-25 13:37:37 UTC (rev 17872) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-25 18:17:13 UTC (rev 17873) @@ -28,44 +28,52 @@ #PATCHFILES += 0003-Fix-the-signature-instead-of-using-sig_t.patch +PATCHFILES += 0001-More-Solaris-fixes.patch + # As we have patches autoconf we need to autotools bootstrap and that requires # cppunit (although it is optional for afterwards building we need it now for the # AC macros). BUILD_DEP_PKGS += CSWcppunit-gxx-dev -PACKAGES += CSWlibtorrent -CATALOGNAME_CSWlibtorrent = libtorrent -SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix -RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++ +PACKAGES += CSWlibtorrent-rasterbar6 +SPKG_DESC_CSWlibtorrent-rasterbar6 = BitTorrent library written in C++, libtorrent-rasterbar.so.6 +PKGFILES_CSWlibtorrent-rasterbar6 += $(call pkgfiles_lib,libtorrent-rasterbar.so.6) +RUNTIME_DEP_PKGS_CSWlibtorrent-rasterbar6 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibtorrent-rasterbar6 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtorrent-rasterbar6 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibtorrent-rasterbar6 += CSWlibboost-system1-49-0-gxx -PACKAGES += CSWlibtorrentdevel -CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel -SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent -RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent -PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibtorrentdevel += $(docdir)/.* -PKGFILES_CSWlibtorrentdevel += .*\.h -PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.* +PACKAGES += CSWlibtorrent-rasterbar-gxx-dev +SPKG_DESC_CSWlibtorrent-rasterbar-gxx-dev = Development files for libtorrent-rasterbar.so.6 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibtorrent-rasterbar-gxx-dev += CSWlibtorrent-rasterbar6 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 prefix = $(BUILD_PREFIX)/gxx GARCOMPILER = GNU BUILD64_LIBS_ONLY = 1 + +# This is neeed to enable Posix threads in boost gxx +# XXX: Can alternatively -pthreads be set? +EXTRA_CXXFLAGS += -D_PTHREADS + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --disable-libtool-lock CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --with-boost-libdir=$(libdir) + # The testsuite has a linker error with mangled C++ symbols, skip for now -SKIPTEST ?= 1 +# SKIPTEST ?= 1 include gar/category.mk -post-patch-modulated: - -cd $(WORKSRC) && ./autogen.sh - @$(MAKECOOKIE) +#post-patch-modulated: +# -cd $(WORKSRC) && ./autogen.sh +# @$(MAKECOOKIE) #pre-configure-modulated: ## cd $(WORKSRC) && aclocal-1.10 -I./scripts -I. && autoheader \ Added: csw/mgar/pkg/libtorrent/trunk/files/0001-More-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0001-More-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/libtorrent/trunk/files/0001-More-Solaris-fixes.patch 2012-04-25 18:17:13 UTC (rev 17873) @@ -0,0 +1,166 @@ +From e2eecb5db07a5b453cf65ca1169201721c3af2f0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Apr 2012 17:23:11 +0200 +Subject: [PATCH] More Solaris fixes + +--- + include/libtorrent/config.hpp | 1 + + src/enum_net.cpp | 48 ++++++++++++++++++++--------------------- + src/escape_string.cpp | 2 +- + 3 files changed, 26 insertions(+), 25 deletions(-) + +diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp +index bea1e2f..bf60162 100644 +--- a/include/libtorrent/config.hpp ++++ b/include/libtorrent/config.hpp +@@ -211,6 +211,7 @@ POSSIBILITY OF SUCH DAMAGE. + #define TORRENT_COMPLETE_TYPES_REQUIRED 1 + #define TORRENT_USE_IFCONF 1 + #define TORRENT_HAS_SALEN 0 ++#define TORRENT_HAS_FALLOCATE 0 + + // ==== BEOS === + #elif defined __BEOS__ || defined __HAIKU__ +diff --git a/src/enum_net.cpp b/src/enum_net.cpp +index bab1b11..b0a0a7a 100644 +--- a/src/enum_net.cpp ++++ b/src/enum_net.cpp +@@ -207,14 +207,14 @@ namespace libtorrent { namespace + } + + if_indextoname(if_index, rt_info->name); +- ifreq req; ++ lifreq req; + memset(&req, 0, sizeof(req)); +- if_indextoname(if_index, req.ifr_name); ++ if_indextoname(if_index, req.lifr_name); + ioctl(s, SIOCGIFMTU, &req); +- rt_info->mtu = req.ifr_mtu; ++ rt_info->mtu = req.lifr_mtu; + // obviously this doesn't work correctly. How do you get the netmask for a route? + // if (ioctl(s, SIOCGIFNETMASK, &req) == 0) { +-// rt_info->netmask = sockaddr_to_address(&req.ifr_addr, req.ifr_addr.sa_family); ++// rt_info->netmask = sockaddr_to_address(&req.lifr_addr, req.lifr_addr.sa_family); + // } + return true; + } +@@ -260,11 +260,11 @@ namespace libtorrent { namespace + , rt_info->destination.is_v4() ? AF_INET : AF_INET6); + if_indextoname(rtm->rtm_index, rt_info->name); + +- ifreq req; ++ lifreq req; + memset(&req, 0, sizeof(req)); +- if_indextoname(rtm->rtm_index, req.ifr_name); ++ if_indextoname(rtm->rtm_index, req.lifr_name); + if (ioctl(s, SIOCGIFMTU, &req) < 0) return false; +- rt_info->mtu = req.ifr_mtu; ++ rt_info->mtu = req.lifr_mtu; + + return true; + } +@@ -420,15 +420,15 @@ namespace libtorrent + ip_interface iface; + if (iface_from_ifaddrs(ifa, iface, ec)) + { +- ifreq req; ++ lifreq req; + memset(&req, 0, sizeof(req)); + // -1 to leave a null terminator +- strncpy(req.ifr_name, iface.name, IF_NAMESIZE - 1); ++ strncpy(req.lifr_name, iface.name, IF_NAMESIZE - 1); + if (ioctl(s, SIOCGIFMTU, &req) < 0) + { + continue; + } +- iface.mtu = req.ifr_mtu; ++ iface.mtu = req.lifr_mtu; + ret.push_back(iface); + } + } +@@ -454,37 +454,37 @@ namespace libtorrent + return ret; + } + +- char *ifr = (char*)ifc.ifc_req; ++ char *lifr = (char*)ifc.ifc_req; + int remaining = ifc.ifc_len; + + while (remaining) + { +- ifreq const& item = *reinterpret_cast(ifr); ++ lifreq const& item = *reinterpret_cast(lifr); + +- if (item.ifr_addr.sa_family == AF_INET ++ if (item.lifr_addr.ss_family == AF_INET + #if TORRENT_USE_IPV6 +- || item.ifr_addr.sa_family == AF_INET6 ++ || item.lifr_addr.ss_family == AF_INET6 + #endif + ) + { + ip_interface iface; +- iface.interface_address = sockaddr_to_address(&item.ifr_addr); +- strcpy(iface.name, item.ifr_name); ++ iface.interface_address = sockaddr_to_address( (const sockaddr*) &item.lifr_addr ); ++ strcpy(iface.name, item.lifr_name); + +- ifreq req; ++ lifreq req; + memset(&req, 0, sizeof(req)); + // -1 to leave a null terminator +- strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1); ++ strncpy(req.lifr_name, item.lifr_name, IF_NAMESIZE - 1); + if (ioctl(s, SIOCGIFMTU, &req) < 0) + { + ec = error_code(errno, asio::error::system_category); + close(s); + return ret; + } +- iface.mtu = req.ifr_mtu; ++ iface.mtu = req.lifr_mtu; + + memset(&req, 0, sizeof(req)); +- strncpy(req.ifr_name, item.ifr_name, IF_NAMESIZE - 1); ++ strncpy(req.lifr_name, item.lifr_name, IF_NAMESIZE - 1); + if (ioctl(s, SIOCGIFNETMASK, &req) < 0) + { + #if TORRENT_USE_IPV6 +@@ -503,17 +503,17 @@ namespace libtorrent + } + else + { +- iface.netmask = sockaddr_to_address(&req.ifr_addr, item.ifr_addr.sa_family); ++ iface.netmask = sockaddr_to_address( (const sockaddr*) &req.lifr_addr, item.lifr_addr.ss_family); + } + ret.push_back(iface); + } + + #if defined TORRENT_BSD +- int current_size = item.ifr_addr.sa_len + IFNAMSIZ; ++ int current_size = item.lifr_addr.sa_len + IFNAMSIZ; + #else +- int current_size = sizeof(ifreq); ++ int current_size = sizeof(lifreq); + #endif +- ifr += current_size; ++ lifr += current_size; + remaining -= current_size; + } + close(s); +diff --git a/src/escape_string.cpp b/src/escape_string.cpp +index 021e6c7..d2f1b8e 100644 +--- a/src/escape_string.cpp ++++ b/src/escape_string.cpp +@@ -624,7 +624,7 @@ namespace libtorrent + // posix has a weird iconv signature. implementations + // differ on what this signature should be, so we use + // a macro to let config.hpp determine it +- size_t retval = iconv(h, TORRENT_ICONV_ARG &in, &insize, ++ size_t retval = iconv(h, (const char**) TORRENT_ICONV_ARG &in, &insize, + &out, &outsize); + if (retval == (size_t)-1) return s; + // if this string has an invalid utf-8 sequence in it, don't touch it +-- +1.7.10 + 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 Apr 26 11:05:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 09:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17874] csw/mgar/pkg/libtorrent/trunk Message-ID: Revision: 17874 http://gar.svn.sourceforge.net/gar/?rev=17874&view=rev Author: dmichelsen Date: 2012-04-26 09:05:30 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libtorrent/trunk: Remove old patches, general cleanup Modified Paths: -------------- csw/mgar/pkg/libtorrent/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff Property Changed: ---------------- csw/mgar/pkg/libtorrent/trunk/ Property changes on: csw/mgar/pkg/libtorrent/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work Modified: csw/mgar/pkg/libtorrent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/Makefile 2012-04-26 09:05:30 UTC (rev 17874) @@ -11,30 +11,11 @@ the speed of the official client. endef -#MASTER_SITES = http://libtorrent.rakshasa.no/downloads/ MASTER_SITES += $(GOOGLE_MIRROR) DISTNAME = libtorrent-rasterbar-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz - -# Patches from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/ -#PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff -#PATCHFILES += rlibtorrent-05-tracker-usable.diff - -#PATCHFILES += 0001-Ignore-__UNUSED.patch - -#PATCHFILES += 0001-Use-correct-m4-quoting-for-code-in-autoconf.patch - -#PATCHFILES += 0002-Use-posix_memalign-only-when-available.patch - -#PATCHFILES += 0003-Fix-the-signature-instead-of-using-sig_t.patch - +DISTFILES += $(DISTNAME).tar.gz PATCHFILES += 0001-More-Solaris-fixes.patch -# As we have patches autoconf we need to autotools bootstrap and that requires -# cppunit (although it is optional for afterwards building we need it now for the -# AC macros). -BUILD_DEP_PKGS += CSWcppunit-gxx-dev - PACKAGES += CSWlibtorrent-rasterbar6 SPKG_DESC_CSWlibtorrent-rasterbar6 = BitTorrent library written in C++, libtorrent-rasterbar.so.6 PKGFILES_CSWlibtorrent-rasterbar6 += $(call pkgfiles_lib,libtorrent-rasterbar.so.6) @@ -55,8 +36,7 @@ BUILD64_LIBS_ONLY = 1 # This is neeed to enable Posix threads in boost gxx -# XXX: Can alternatively -pthreads be set? -EXTRA_CXXFLAGS += -D_PTHREADS +EXTRA_CXXFLAGS += -pthreads CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-shared @@ -66,24 +46,4 @@ CONFIGURE_ARGS += --with-boost-libdir=$(libdir) -# The testsuite has a linker error with mangled C++ symbols, skip for now -# SKIPTEST ?= 1 - include gar/category.mk - -#post-patch-modulated: -# -cd $(WORKSRC) && ./autogen.sh -# @$(MAKECOOKIE) - -#pre-configure-modulated: -## cd $(WORKSRC) && aclocal-1.10 -I./scripts -I. && autoheader \ -## && libtoolize --automake --copy --force && automake-1.10 && autoconf -# cd $(WORKSRC) && aclocal-1.10 -I scripts && \ -# automake-1.10 --gnu && autoconf -# -# $(MAKECOOKIE) - - -#post-configure-modulated: -# perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool -# @$(MAKECOOKIE) Deleted: csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,67 +0,0 @@ -From 6772f16c668c4e8567087d4c5fe2a4c9433a733e Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 26 May 2010 15:37:18 +0200 -Subject: [PATCH] Ignore __UNUSED - ---- - rak/string_manip.h | 2 ++ - src/download/chunk_selector.cc | 2 ++ - src/torrent/poll_kqueue.cc | 2 ++ - src/torrent/resume.cc | 2 ++ - 4 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/rak/string_manip.h b/rak/string_manip.h -index 4fb2554..9d66e96 100644 ---- a/rak/string_manip.h -+++ b/rak/string_manip.h -@@ -43,6 +43,8 @@ - #include - #include - -+#define __UNUSED -+ - namespace rak { - - // Use these trim functions until n1872 is widely supported. -diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc -index d3c956b..7f2df87 100644 ---- a/src/download/chunk_selector.cc -+++ b/src/download/chunk_selector.cc -@@ -46,6 +46,8 @@ - #include "chunk_selector.h" - #include "chunk_statistics.h" - -+#define __UNUSED -+ - namespace torrent { - - // Consider making statistics a part of selector. -diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc -index 0375b91..1ade627 100644 ---- a/src/torrent/poll_kqueue.cc -+++ b/src/torrent/poll_kqueue.cc -@@ -56,6 +56,8 @@ - - #include - -+#define __UNUSED -+ - namespace torrent { - - #ifdef USE_KQUEUE -diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc -index a728830..59c7cf6 100644 ---- a/src/torrent/resume.cc -+++ b/src/torrent/resume.cc -@@ -58,6 +58,8 @@ - - #include "resume.h" - -+#define __UNUSED -+ - namespace torrent { - - void --- -1.7.0 - Deleted: csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/0001-Use-correct-m4-quoting-for-code-in-autoconf.patch 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,133 +0,0 @@ -From 5a847a7488e2ea452503765cd74ebcddda2388af Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 17 Apr 2012 15:26:39 +0200 -Subject: [PATCH] Use correct m4 quoting for code in autoconf - -This is documented in the autoconf manual in the section - AC_LANG_SOURCE ---- - scripts/common.m4 | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/scripts/common.m4 b/scripts/common.m4 -index 3d7e864..e0730bb 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -99,11 +99,11 @@ AC_DEFUN([TORRENT_OTFD], [ - AC_LANG_PUSH(C++) - AC_MSG_CHECKING(for proper overloaded template function disambiguation) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - template void f(T&) {} - template void f(T*) {} - int main() { int *i = 0; f(*i); f(i); } -- ])], -+ ]])], - [ - AC_MSG_RESULT(yes) - ], [ -@@ -119,24 +119,24 @@ AC_DEFUN([TORRENT_MINCORE_SIGNEDNESS], [ - AC_LANG_PUSH(C++) - AC_MSG_CHECKING(signedness of mincore parameter) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - void f() { mincore((char*)0, 0, (unsigned char*)0); } -- ])], -+ ]])], - [ - AC_DEFINE(USE_MINCORE, 1, Use mincore) - AC_DEFINE(USE_MINCORE_UNSIGNED, 1, use unsigned char* in mincore) - AC_MSG_RESULT(unsigned) - ], - [ -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - void f() { mincore((char*)0, 0, (char*)0); } -- ])], -+ ]])], - [ - AC_DEFINE(USE_MINCORE, 1, Use mincore) - AC_DEFINE(USE_MINCORE_UNSIGNED, 0, use char* in mincore) -@@ -168,11 +168,11 @@ AC_DEFUN([TORRENT_MINCORE], [ - AC_DEFUN([TORRENT_CHECK_MADVISE], [ - AC_MSG_CHECKING(for madvise) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include - void f() { static char test[1024]; madvise((void *)test, sizeof(test), MADV_NORMAL); } -- ])], -+ ]])], - [ - AC_MSG_RESULT(yes) - AC_DEFINE(USE_MADVISE, 1, Use madvise) -@@ -184,9 +184,9 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ - AC_DEFUN([TORRENT_CHECK_POPCOUNT], [ - AC_MSG_CHECKING(for __builtin_popcount) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - int f() { return __builtin_popcount(0); } -- ])], -+ ]])], - [ - AC_MSG_RESULT(yes) - AC_DEFINE(USE_BUILTIN_POPCOUNT, 1, Use __builtin_popcount.) -@@ -198,12 +198,12 @@ AC_DEFUN([TORRENT_CHECK_POPCOUNT], [ - AC_DEFUN([TORRENT_CHECK_CACHELINE], [ - AC_MSG_CHECKING(for cacheline) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include - void* vptr __cacheline_aligned; - void f() { posix_memalign(&vptr, SMP_CACHE_BYTES, 42); } -- ])], -+ ]])], - [ - AC_MSG_RESULT(found builtin) - dnl AC_DEFINE(LT_SMP_CACHE_BYTES, SMP_CACHE_BYTES, Largest L1 cache size we know of, should work on all archs.) -@@ -223,10 +223,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -+ ]])], - [ - AC_MSG_RESULT(yes) - AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - int main() { - char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; -@@ -247,7 +247,7 @@ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - if (*(uint32_t*)(buf + i) == 0) return -1; - return 0; - } -- ])], -+ ]])], - [ - AC_MSG_RESULT(none needed) - ], [ --- -1.7.10 - Deleted: csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/0002-Use-posix_memalign-only-when-available.patch 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,26 +0,0 @@ -From ba65af2026be2372d6d3d1c7a85f518892479221 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 17 Apr 2012 17:09:07 +0200 -Subject: [PATCH] Use posix_memalign only when available - ---- - rak/allocators.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/rak/allocators.h b/rak/allocators.h -index 0a1b711..cfbd090 100644 ---- a/rak/allocators.h -+++ b/rak/allocators.h -@@ -77,7 +77,9 @@ public: - - static pointer alloc_size(size_type size) { - pointer ptr = NULL; -+#ifdef HAVE_POSIX_MEMALIGN - int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); -+#endif - - return ptr; - } --- -1.7.10 - Deleted: csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/0003-Fix-the-signature-instead-of-using-sig_t.patch 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,54 +0,0 @@ -From 3f3dd168d995127193a1043e8fd15f1258458f69 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 17 Apr 2012 18:52:22 +0200 -Subject: [PATCH] Fix the signature instead of using sig_t - ---- - test/data/hash_check_queue_test.cc | 4 ++-- - test/data/hash_queue_test.cc | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/test/data/hash_check_queue_test.cc b/test/data/hash_check_queue_test.cc -index 59b8522..87daf06 100644 ---- a/test/data/hash_check_queue_test.cc -+++ b/test/data/hash_check_queue_test.cc -@@ -67,13 +67,13 @@ verify_hash(const done_chunks_type* done_chunks, int index, const torrent::HashS - - static torrent::Poll* create_select_poll() { return torrent::PollSelect::create(256); } - --static void do_nothing() {} -+static void do_nothing(int s) {} - - void - HashCheckQueueTest::setUp() { - torrent::Poll::slot_create_poll() = tr1::bind(&create_select_poll); - -- signal(SIGUSR1, (sig_t)&do_nothing); -+ signal(SIGUSR1, &do_nothing); - } - - void -diff --git a/test/data/hash_queue_test.cc b/test/data/hash_queue_test.cc -index f31b5f3..f5fc88c 100644 ---- a/test/data/hash_queue_test.cc -+++ b/test/data/hash_queue_test.cc -@@ -38,14 +38,14 @@ check_for_chunk_done(torrent::HashQueue* hash_queue, done_chunks_type* done_chun - - static torrent::Poll* create_select_poll() { return torrent::PollSelect::create(256); } - --static void do_nothing() {} -+static void do_nothing(int s) {} - - void - HashQueueTest::setUp() { - CPPUNIT_ASSERT(torrent::taskScheduler.empty()); - - torrent::Poll::slot_create_poll() = tr1::bind(&create_select_poll); -- signal(SIGUSR1, (sig_t)&do_nothing); -+ signal(SIGUSR1, &do_nothing); - } - - void --- -1.7.10 - Deleted: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-01-madvise.diff 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,30 +0,0 @@ ---- libtorrent-0.12.2.orig/src/data/memory_chunk.cc (revision 1060) -+++ libtorrent-0.12.2/src/data/memory_chunk.cc (working copy) -@@ -41,6 +41,16 @@ - #include - #include - #include -+#if defined(__sun) && defined(__SVR4) -+/* Ugly hack to make this compile on Solaris with g++. See -+ * http://www.opensolaris.org/jive/thread.jspa?threadID=21035&tstart=0 -+ */ -+#if (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) -+extern "C" { -+extern int madvise(caddr_t, size_t, int); -+} -+#endif -+#endif - #include - - #include "torrent/exceptions.h" ---- libtorrent-0.12.2.orig/scripts/common.m4 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/scripts/common.m4 2008-06-23 17:04:24.567475080 -0400 -@@ -170,7 +170,7 @@ - AC_COMPILE_IFELSE( - [[#include - #include -- void f() { static char test[1024]; madvise((void *)test, sizeof(test), MADV_NORMAL); } -+ void f() { static char test[1024]; madvise((char *)test, sizeof(test), MADV_NORMAL); } - ]], - [ - AC_MSG_RESULT(yes) Deleted: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-03-dh-generate.diff 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,93 +0,0 @@ ---- libtorrent-0.12.2.orig/src/utils/diffie_hellman.cc Wed May 7 12:19:12 2008 -+++ libtorrent-0.12.2/src/utils/diffie_hellman.cc Sun Jun 15 10:51:31 2008 -@@ -47,6 +47,80 @@ - - namespace torrent { - -+static int generate_key(DH *dh) -+ { -+ int ok=0; -+ int generate_new_key=0; -+ unsigned l; -+ BN_CTX *ctx; -+ BN_MONT_CTX *mont=NULL; -+ BIGNUM *pub_key=NULL,*priv_key=NULL; -+ -+ ctx = BN_CTX_new(); -+ if (ctx == NULL) goto err; -+ -+ if (dh->priv_key == NULL) -+ { -+ priv_key=BN_new(); -+ if (priv_key == NULL) goto err; -+ generate_new_key=1; -+ } -+ else -+ priv_key=dh->priv_key; -+ -+ if (dh->pub_key == NULL) -+ { -+ pub_key=BN_new(); -+ if (pub_key == NULL) goto err; -+ } -+ else -+ pub_key=dh->pub_key; -+ -+ -+ if (dh->flags & DH_FLAG_CACHE_MONT_P) -+ { -+ mont = BN_MONT_CTX_set_locked((BN_MONT_CTX **)(&dh->method_mont_p), -+ CRYPTO_LOCK_DH, dh->p, ctx); -+ if (!mont) -+ goto err; -+ } -+ -+ if (generate_new_key) -+ { -+ l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */ -+ if (!BN_rand(priv_key, l, 0, 0)) -+ if (!BN_pseudo_rand(priv_key, l, 0, 0)) goto err; -+ } -+ -+ { -+ BIGNUM local_prk; -+ BIGNUM *prk; -+ -+ if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) -+ { -+ BN_init(&local_prk); -+ prk = &local_prk; -+ BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME); -+ } -+ else -+ prk = priv_key; -+ -+ if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont)) goto err; -+ } -+ -+ dh->pub_key=pub_key; -+ dh->priv_key=priv_key; -+ ok=1; -+err: -+ if (ok != 1) { -+ } -+ -+ if ((pub_key != NULL) && (dh->pub_key == NULL)) BN_free(pub_key); -+ if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key); -+ BN_CTX_free(ctx); -+ return(ok); -+} -+ - DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength, - const unsigned char *generator, int generatorLength) : - m_secret(NULL) { -@@ -56,7 +130,8 @@ - m_dh->p = BN_bin2bn(prime, primeLength, NULL); - m_dh->g = BN_bin2bn(generator, generatorLength, NULL); - -- DH_generate_key(m_dh); -+ if (!generate_key(m_dh)) -+ throw internal_error("Unable to generate encryption key."); - #else - throw internal_error("Compiled without encryption support."); - #endif Deleted: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-04-sunpro.diff 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,887 +0,0 @@ ---- rtorrent-0.8.2.orig/rak/string_manip.h 2008-05-07 08:19:12.000000000 -0400 -+++ rtorrent-0.8.2/rak/string_manip.h 2008-06-25 02:14:10.028329996 -0400 -@@ -62,7 +62,7 @@ - - template - Sequence trim_end(const Sequence& seq) { -- if (seq.empty() || !std::isspace(*(--seq.end()))) -+ if (seq.empty() || !std::isspace(*(seq.end()-1))) - return seq; - - typename Sequence::size_type pos = seq.size(); -@@ -93,7 +93,7 @@ - - template - Sequence trim_end_classic(const Sequence& seq) { -- if (seq.empty() || !std::isspace(*(--seq.end()), std::locale::classic())) -+ if (seq.empty() || !std::isspace(*(seq.end()-1), std::locale::classic())) - return seq; - - typename Sequence::size_type pos = seq.size(); ---- libtorrent-0.12.2.orig/rak/path.h 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/rak/path.h 2008-06-25 01:57:52.656513911 -0400 -@@ -42,6 +42,7 @@ - - #include - #include -+#include - - namespace rak { - -@@ -91,7 +92,7 @@ - if (home == NULL) - return first; - -- first += strlcpy(first, home, std::distance(first, last)); -+ first += strlcpy(first, home, last-first); - - if (first > last) - return last; -@@ -99,7 +100,7 @@ - src++; - } - -- return std::max(first + strlcpy(first, src, std::distance(first, last)), last); -+ return std::max(first + strlcpy(first, src, last-first), last); - } - - } ---- rtorrent-0.8.2.orig/rak/unordered_vector.h 2008-05-07 08:19:12.000000000 -0400 -+++ rtorrent-0.8.2/rak/unordered_vector.h 2008-06-25 02:29:35.381434005 -0400 -@@ -90,7 +90,7 @@ - unordered_vector<_Tp>::insert(iterator position, const value_type& x) { - Base::push_back(x); - -- return --end(); -+ return end()-1; - } - - template ---- rtorrent-0.8.2.orig/rak/socket_address.h 2008-05-07 08:19:12.000000000 -0400 -+++ rtorrent-0.8.2/rak/socket_address.h 2008-06-25 01:58:48.126132462 -0400 -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- rtorrent-0.8.2.orig/rak/regex.h 2008-05-07 08:19:12.000000000 -0400 -+++ rtorrent-0.8.2/rak/regex.h 2008-06-25 02:10:05.332867456 -0400 -@@ -75,7 +75,7 @@ - std::list paths; - paths.push_front(0); - -- for (std::string::const_iterator itrText = ++text.begin(), lastText = text.end(); itrText != lastText; ++itrText) { -+ for (std::string::const_iterator itrText = text.begin()+1, lastText = text.end(); itrText != lastText; ++itrText) { - - for (std::list::iterator itrPaths = paths.begin(), lastPaths = paths.end(); itrPaths != lastPaths; ) { - ---- rtorrent-0.8.2.orig/rak/algorithm.h 2008-05-07 08:19:12.000000000 -0400 -+++ rtorrent-0.8.2/rak/algorithm.h 2008-06-25 17:27:39.728352000 -0400 -@@ -40,6 +40,63 @@ - #include - #include - -+#ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC -+namespace std { -+ template struct iterator_traits -+ { -+ typedef typename Iterator::value_type value_type; -+ typedef typename Iterator::difference_type difference_type; -+ typedef typename Iterator::pointer pointer; -+ typedef typename Iterator::reference reference; -+ typedef typename Iterator::iterator_category iterator_category; -+ }; -+ template struct iterator_traits -+ { -+ typedef T value_type; -+ typedef ptrdiff_t difference_type; -+ typedef T* pointer; -+ typedef T& reference; -+ typedef random_access_iterator_tag iterator_category; -+ }; -+ template struct iterator_traits -+ { -+ typedef T value_type; -+ typedef ptrdiff_t difference_type; -+ typedef const T* pointer; -+ typedef const T& reference; -+ typedef random_access_iterator_tag iterator_category; -+ }; -+ -+ template -+ inline typename iterator_traits::difference_type -+ distance (ForwardIterator first, ForwardIterator last) -+ { -+ typename iterator_traits::difference_type n = 0; -+ __distance(first, last, n, -+ iterator_traits::iterator_category()); -+ return n; -+ } -+ -+ template -+ inline typename iterator_traits::difference_type -+ count (InputIterator first, InputIterator last, const T& value) -+ { -+ typename iterator_traits::difference_type n = 0; -+ count(first, last, value, n); -+ return n; -+ } -+ -+ template -+ inline typename iterator_traits::difference_type -+ count_if (InputIterator first, InputIterator last, Predicate pred) -+ { -+ typename iterator_traits::difference_type n = 0; -+ count_if(first, last, pred, n); -+ return n; -+ } -+} -+#endif -+ - namespace rak { - - template ---- libtorrent-0.12.2.orig/src/download/choke_manager.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/download/choke_manager.cc 2008-06-24 13:40:32.322166472 -0400 -@@ -41,8 +41,10 @@ - #include - #include - -+#include "rak/algorithm.h" - #include "protocol/peer_connection_base.h" - #include "torrent/peer/connection_list.h" -+#include "resource_manager.h" - - #include "choke_manager.h" - #include "choke_manager_node.h" -@@ -261,7 +263,7 @@ - rak::less(i * ChokeManager::order_base + (ChokeManager::order_base - 1), - rak::mem_ref(&ChokeManager::value_type::second))); - -- if (std::distance(target[i].second, target[i + 1].second) != 0) -+ if (target[i].second != target[i + 1].second) - weightTotal += weights[i]; - } - ---- libtorrent-0.12.2.orig/src/download/delegator.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/download/delegator.cc 2008-06-24 13:42:52.016431294 -0400 -@@ -46,7 +46,9 @@ - #include "torrent/data/block.h" - #include "torrent/data/block_list.h" - #include "torrent/data/block_transfer.h" -+#include "torrent/data/file_list.h" - #include "protocol/peer_chunks.h" -+#include "download/chunk_selector.h" - - #include "delegator.h" - ---- libtorrent-0.12.2.orig/src/download/download_constructor.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/download/download_constructor.cc 2008-06-24 14:56:59.728556042 -0400 -@@ -317,7 +317,7 @@ - Path p; - p.set_encoding(enc); - -- std::transform(plist.begin(), plist.end(), std::back_inserter(p), std::mem_fun_ref(&Object::as_string)); -+ std::transform(((Object::list_type&)plist).begin(), ((Object::list_type&)plist).end(), std::back_inserter(p), std::mem_fun_ref(&Object::as_string)); - - return p; - } ---- libtorrent-0.12.2.orig/src/download/download_info.h 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/download/download_info.h 2008-06-28 00:07:50.060545422 -0400 -@@ -186,10 +186,13 @@ - }; - - // Move somewhere else. -+#if defined(__APPLE__) || defined(__SUNPRO_CC) -+#pragma pack(1) -+#endif - struct SocketAddressCompact { -- SocketAddressCompact() {} -- SocketAddressCompact(uint32_t a, uint16_t p) : addr(a), port(p) {} -- SocketAddressCompact(const rak::socket_address_inet* sa) : addr(sa->address_n()), port(sa->port_n()) {} -+ //SocketAddressCompact() {} -+ //SocketAddressCompact(uint32_t a, uint16_t p) : addr(a), port(p) {} -+ //SocketAddressCompact(const rak::socket_address_inet* sa) : addr(sa->address_n()), port(sa->port_n()) {} - - operator rak::socket_address () const { - rak::socket_address sa; -@@ -205,6 +208,9 @@ - - const char* c_str() const { return reinterpret_cast(this); } - } __attribute__ ((packed)); -+#if defined(__APPLE__) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - } - ---- libtorrent-0.12.2.orig/src/download/download_main.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/download/download_main.cc 2008-06-28 16:05:20.725211632 -0400 -@@ -356,8 +356,13 @@ - PeerConnectionBase* pcb = (*itr)->m_ptr(); - const rak::socket_address* sa = rak::socket_address::cast_from(pcb->peer_info()->socket_address()); - -- if (pcb->peer_info()->listen_port() != 0 && sa->family() == rak::socket_address::af_inet) -- current.push_back(SocketAddressCompact(sa->sa_inet()->address_n(), pcb->peer_info()->listen_port())); -+ if (pcb->peer_info()->listen_port() != 0 && sa->family() == rak::socket_address::af_inet) { -+ SocketAddressCompact s = { -+ sa->sa_inet()->address_n(), -+ pcb->peer_info()->listen_port() -+ }; -+ current.push_back(s); -+ } - - if (!pcb->extensions()->is_remote_supported(ProtocolExtension::UT_PEX)) - continue; ---- libtorrent-0.12.2.orig/src/dht/dht_router.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_router.cc 2008-06-24 13:22:15.691370259 -0400 -@@ -88,7 +88,7 @@ - } - - set_bucket(new DhtBucket(zero_id, ones_id)); -- m_routingTable.insert(std::make_pair(bucket()->id_range_end(), bucket())); -+ m_routingTable.insert(DhtBucketList::value_type(bucket()->id_range_end(), bucket())); - - if (cache.has_key("nodes")) { - const Object::map_type& nodes = cache.get_key_map("nodes"); -@@ -163,12 +163,12 @@ - if (!create) - return NULL; - -- std::pair res = m_trackers.insert(std::make_pair(hash, new DhtTracker())); -+ std::pair res = m_trackers.insert(std::make_pair(hash, new DhtTracker())); - - if (!res.second) - throw internal_error("DhtRouter::get_tracker did not actually insert tracker."); - -- return res.first.tracker(); -+ return (*res.first).second; - } - - bool -@@ -552,7 +552,7 @@ - throw internal_error("DhtRouter::split_bucket router ID ended up in wrong bucket."); - - // Insert new bucket with iterator hint = just before current bucket. -- DhtBucketList::iterator other = m_routingTable.insert(itr, std::make_pair(newBucket->id_range_end(), newBucket)); -+ DhtBucketList::iterator other = m_routingTable.insert(itr, DhtBucketList::value_type(newBucket->id_range_end(), newBucket)); - - // Check that the bucket we're not adding the node to isn't empty. - if (other->second->is_in_range(node->id())) { ---- libtorrent-0.12.2.orig/src/dht/dht_router.h 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_router.h 2008-06-24 13:05:12.790210488 -0400 -@@ -137,7 +137,7 @@ - // Maximum number of potential contacts to keep until bootstrap complete. - static const unsigned int num_bootstrap_contacts = 64; - -- typedef std::map DhtBucketList; -+ typedef std::map DhtBucketList; - - DhtBucketList::iterator find_bucket(const HashString& id); - ---- libtorrent-0.12.2.orig/src/dht/dht_server.h 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_server.h 2008-06-28 00:08:34.254158759 -0400 -@@ -108,6 +108,9 @@ - - typedef std::deque packet_queue; - -+#if defined(__APPLE__) || defined(__SUNPRO_CC) -+#pragma pack(1) -+#endif - struct compact_node_info { - char _id[20]; - SocketAddressCompact _addr; -@@ -115,6 +118,9 @@ - HashString& id() { return *HashString::cast_from(_id); } - rak::socket_address address() { return rak::socket_address(_addr); } - } __attribute__ ((packed)); -+#if defined(__APPLE__) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - typedef std::list node_info_list; - - // Pending transactions. ---- libtorrent-0.12.2.orig/src/dht/dht_transaction.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_transaction.cc 2008-06-24 13:33:28.590473835 -0400 -@@ -68,7 +68,7 @@ - if (m_concurrency != 3) - throw internal_error("DhtSearch::~DhtSearch with invalid concurrency limit."); - -- for (accessor itr = begin(); itr != end(); ++itr) -+ for (accessor itr = begin(); static_cast(itr) != end(); ++itr) - delete itr.node(); - } - -@@ -141,7 +141,7 @@ - // We're done if we can't find any more nodes to contact. - m_next = end(); - -- for (accessor itr = base_type::begin(); itr != end(); ) { -+ for (accessor itr = base_type::begin(); static_cast(itr) != end(); ) { - // If we have all we need, delete current node unless it is - // currently being contacted. - if (!itr.node()->is_active() && needClosest <= 0 && (!itr.node()->is_good() || needGood <= 0)) { -@@ -264,7 +264,7 @@ - void - DhtTransactionPacket::build_buffer(const Object& data) { - char buffer[1500]; // If the message would exceed an Ethernet frame, something went very wrong. -- object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &data); -+ object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair((char*)buffer, buffer + sizeof(buffer)), &data); - - m_length = result.second - buffer; - m_data = new char[m_length]; ---- libtorrent-0.12.2.orig/src/dht/dht_bucket.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_bucket.cc 2008-06-24 02:41:04.089051646 -0400 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include "rak/algorithm.h" - #include "torrent/exceptions.h" - - #include "dht_bucket.h" ---- libtorrent-0.12.2.orig/src/dht/dht_node.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_node.cc 2008-06-28 15:57:24.639449987 -0400 -@@ -77,7 +77,10 @@ - DhtNode::store_compact(char* buffer) const { - HashString::cast_from(buffer)->assign(data()); - -- SocketAddressCompact sa(address()->sa_inet()); -+ SocketAddressCompact sa = { -+ m_socketAddress.sa_inet()->address_n(), -+ m_socketAddress.sa_inet()->port_n() -+ }; - std::memcpy(buffer + 20, sa.c_str(), 6); - - return buffer + 26; ---- libtorrent-0.12.2.orig/src/dht/dht_server.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_server.cc 2008-06-24 13:24:40.374916857 -0400 -@@ -582,7 +582,7 @@ - } - - // We know where to insert it, so pass that as hint. -- insertItr = m_transactions.insert(insertItr, std::make_pair(transaction->key(id), transaction)); -+ insertItr = m_transactions.insert(insertItr, transaction_map::value_type(transaction->key(id), transaction)); - - create_query(insertItr, id, transaction->address(), priority); - ---- libtorrent-0.12.2.orig/src/dht/dht_tracker.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/dht/dht_tracker.cc 2008-06-28 16:03:29.929469325 -0400 -@@ -47,7 +47,7 @@ - if (port == 0) - return; - -- SocketAddressCompact compact(addr, port); -+ SocketAddressCompact compact = { addr, port }; - - unsigned int oldest = 0; - uint32_t minSeen = ~uint32_t(); ---- libtorrent-0.12.2.orig/src/protocol/extensions.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/protocol/extensions.cc 2008-06-24 15:01:20.887800483 -0400 -@@ -119,7 +119,7 @@ - message.insert_key("reqq", 2048); // maximum request queue size - - char buffer[1024]; -- object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &message); -+ object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair((char*)buffer, buffer + sizeof(buffer)), &message); - - int length = result.second - buffer; - char* copy = new char[length]; ---- libtorrent-0.12.2.orig/src/protocol/peer_connection_leech.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/protocol/peer_connection_leech.cc 2008-06-24 15:19:28.492038823 -0400 -@@ -697,7 +697,9 @@ - } - } - -+#ifndef __SUNPRO_CC - template<> -+#endif - void - PeerConnection::offer_chunk() { - // If bytes left to send in this chunk minus bytes about to be sent is zero, -@@ -718,7 +720,9 @@ - m_data.bytesLeft = m_download->file_list()->chunk_index_size(index); - } - -+#ifndef __SUNPRO_CC - template<> -+#endif - bool - PeerConnection::should_upload() { - // For initial seeding, check if chunk is well seeded now, and if so ---- libtorrent-0.12.2.orig/src/protocol/handshake_manager.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/protocol/handshake_manager.cc 2008-06-24 15:11:50.179786185 -0400 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include -+#include - - #include "torrent/exceptions.h" - #include "torrent/error.h" ---- libtorrent-0.12.2.orig/src/protocol/handshake.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/protocol/handshake.cc 2008-06-24 15:05:32.683533289 -0400 -@@ -36,8 +36,10 @@ - - #include "config.h" - -+#include "rak/algorithm.h" - #include "download/download_info.h" - #include "download/download_main.h" -+#include "download/download_manager.h" - #include "net/throttle_list.h" - #include "torrent/dht_manager.h" - #include "torrent/exceptions.h" -@@ -324,14 +326,16 @@ - return false; - } - -+ uint32_t len = std::distance(m_readBuffer.position(), itr); -+ - if (m_incoming) { - // We've found HASH('req1' + S), skip that and go on reading the - // SKEY hash. -- m_readBuffer.consume(std::distance(m_readBuffer.position(), itr) + 20); -+ m_readBuffer.consume(len + 20); - m_state = READ_ENC_SKEY; - - } else { -- m_readBuffer.consume(std::distance(m_readBuffer.position(), itr)); -+ m_readBuffer.consume(len); - m_state = READ_ENC_NEGOT; - } - -@@ -935,10 +939,12 @@ - m_writeBuffer.move_end(96); - - int length = random() % enc_pad_size; -- char pad[length]; -+ char* pad = new char[length]; - - std::generate_n(pad, length, &::random); - m_writeBuffer.write_len(pad, length); -+ -+ delete pad; - } - - void ---- libtorrent-0.12.2.orig/src/data/memory_chunk.h 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/data/memory_chunk.h 2008-06-25 21:14:31.067671826 -0400 -@@ -47,28 +47,30 @@ - // Consider information about whetever the memory maps to a file or - // not, since mincore etc can only be called on files. - -- static const int prot_exec = PROT_EXEC; -- static const int prot_read = PROT_READ; -- static const int prot_write = PROT_WRITE; -- static const int prot_none = PROT_NONE; -- static const int map_shared = MAP_SHARED; -+ enum { -+ prot_exec = PROT_EXEC, -+ prot_read = PROT_READ, -+ prot_write = PROT_WRITE, -+ prot_none = PROT_NONE, -+ map_shared = MAP_SHARED, - - #ifdef USE_MADVISE -- static const int advice_normal = MADV_NORMAL; -- static const int advice_random = MADV_RANDOM; -- static const int advice_sequential = MADV_SEQUENTIAL; -- static const int advice_willneed = MADV_WILLNEED; -- static const int advice_dontneed = MADV_DONTNEED; -+ advice_normal = MADV_NORMAL, -+ advice_random = MADV_RANDOM, -+ advice_sequential = MADV_SEQUENTIAL, -+ advice_willneed = MADV_WILLNEED, -+ advice_dontneed = MADV_DONTNEED, - #else -- static const int advice_normal = 0; -- static const int advice_random = 1; -- static const int advice_sequential = 2; -- static const int advice_willneed = 3; -- static const int advice_dontneed = 4; -+ advice_normal = 0, -+ advice_random = 1, -+ advice_sequential = 2, -+ advice_willneed = 3, -+ advice_dontneed = 4, - #endif -- static const int sync_sync = MS_SYNC; -- static const int sync_async = MS_ASYNC; -- static const int sync_invalidate = MS_INVALIDATE; -+ sync_sync = MS_SYNC, -+ sync_async = MS_ASYNC, -+ sync_invalidate = MS_INVALIDATE, -+ }; - - MemoryChunk() { clear(); } - ~MemoryChunk() { clear(); } ---- libtorrent-0.12.2.orig/src/data/chunk_list.cc 2008-06-25 01:44:37.768468000 -0400 -+++ libtorrent-0.12.2/src/data/chunk_list.cc 2008-06-25 23:55:12.466495173 -0400 -@@ -301,27 +301,18 @@ - - std::pair - ChunkList::sync_options(ChunkListNode* node, int flags) { -- // Using if statements since some linkers have problem with static -- // const int members inside the ?: operators. The compiler should -- // be optimizing this anyway. -+ int sync = MemoryChunk::sync_async; -+ bool end = true; - -- if (flags & sync_force) { -+ if (flags & sync_safe) { - -- if (flags & sync_safe) -- return std::make_pair(MemoryChunk::sync_sync, true); -+ if (flags & sync_force || node->sync_triggered()) -+ sync = MemoryChunk::sync_sync; - else -- return std::make_pair(MemoryChunk::sync_async, true); -- -- } else if (flags & sync_safe) { -- -- if (node->sync_triggered()) -- return std::make_pair(MemoryChunk::sync_sync, true); -- else -- return std::make_pair(MemoryChunk::sync_async, false); -- -- } else { -- return std::make_pair(MemoryChunk::sync_async, true); -+ end = false; - } -+ -+ return std::make_pair(sync, end); - } - - // Using a rather simple algorithm for now. This should really be more ---- libtorrent-0.12.2.orig/src/data/memory_chunk.cc 2008-06-23 17:08:43.395684068 -0400 -+++ libtorrent-0.12.2/src/data/memory_chunk.cc 2008-06-24 02:39:28.399927218 -0400 -@@ -152,11 +152,15 @@ - bool - MemoryChunk::is_incore(uint32_t offset, uint32_t length) { - uint32_t size = pages_touched(offset, length); -- char buf[size]; -+ char* buf = new char[size]; - - incore(buf, offset, length); - -- return std::find(buf, buf + size, 0) == buf + size; -+ bool ret = (std::find(buf, buf + size, 0) == buf + size); -+ -+ delete buf; -+ -+ return ret; - } - - } ---- libtorrent-0.12.2.orig/src/data/hash_torrent.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/data/hash_torrent.cc 2008-06-24 02:36:22.017033961 -0400 -@@ -38,6 +38,7 @@ - - #include "data/chunk_list.h" - #include "torrent/exceptions.h" -+#include "download/download_wrapper.h" - - #include "hash_torrent.h" - #include "hash_queue.h" ---- libtorrent-0.12.2.orig/src/data/hash_queue.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/data/hash_queue.cc 2008-06-23 19:17:24.270411715 -0400 -@@ -39,6 +39,7 @@ - #include - - #include "torrent/exceptions.h" -+#include "download/download_wrapper.h" - - #include "hash_queue.h" - #include "hash_chunk.h" ---- libtorrent-0.12.2.orig/src/data/chunk_part.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/data/chunk_part.cc 2008-06-23 19:16:19.997055043 -0400 -@@ -39,6 +39,7 @@ - #include - #include - -+#include "rak/algorithm.h" - #include "torrent/exceptions.h" - #include "chunk_part.h" - -@@ -70,11 +71,13 @@ - - int length = size() - pos; - int touched = m_chunk.pages_touched(pos, length); -- char buf[touched]; -+ char* buf = new char[touched]; - - m_chunk.incore(buf, pos, length); - - int dist = std::distance(buf, std::find(buf, buf + touched, 0)); -+ -+ delete buf; - - return std::min(dist ? (dist * m_chunk.page_size() - m_chunk.page_align()) : 0, - size() - pos); ---- libtorrent-0.12.2.orig/src/data/chunk_list.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/data/chunk_list.cc 2008-06-23 19:14:40.468978454 -0400 -@@ -38,6 +38,8 @@ - - #include "torrent/exceptions.h" - #include "torrent/chunk_manager.h" -+#include "torrent/data/file_utils.h" -+#include "download/download_wrapper.h" - - #include "chunk_list.h" - #include "chunk.h" -@@ -349,16 +351,18 @@ - bool required = std::find_if(itr, range, std::bind1st(std::mem_fun(&ChunkList::check_node), this)) != range; - dontSkip = dontSkip || required; - -- if (!required && std::distance(itr, range) < maxDistance) { -+ unsigned int l = range - itr; -+ -+ if (!required && l < maxDistance) { - // Don't sync this range. -- unsigned int l = std::min(range - itr, itr - first); -+ l = std::min(l, (unsigned int)(itr - first)); - std::swap_ranges(first, first + l, range - l); - - first += l; - - } else { - // This probably increases too fast. -- weight -= std::distance(itr, range) * std::distance(itr, range); -+ weight -= l * l; - } - - itr = range; ---- libtorrent-0.12.2.orig/src/utils/sha1.h 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/utils/sha1.h 2008-06-24 02:34:12.101392402 -0400 -@@ -37,11 +37,10 @@ - #ifndef LIBTORRENT_HASH_COMPUTE_H - #define LIBTORRENT_HASH_COMPUTE_H - --#include -- - #if defined USE_NSS_SHA - #include "sha_fast.h" - #elif defined USE_OPENSSL_SHA -+#include - #include - #else - #error "No SHA1 implementation selected, choose between Mozilla's NSS and OpenSSL." ---- libtorrent-0.12.2.orig/src/tracker/tracker_http.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/tracker/tracker_http.cc 2008-06-24 15:21:07.562782258 -0400 -@@ -48,6 +48,7 @@ - #include "torrent/http.h" - #include "torrent/object_stream.h" - #include "torrent/tracker_list.h" -+#include "torrent/data/file_list.h" - - #include "tracker_http.h" - ---- libtorrent-0.12.2.orig/src/tracker/tracker_manager.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/tracker/tracker_manager.cc 2008-06-24 15:23:58.547482693 -0400 -@@ -36,7 +36,9 @@ - - #include "config.h" - -+#include "rak/algorithm.h" - #include "download/download_info.h" -+#include "download/download_wrapper.h" - #include "torrent/exceptions.h" - #include "torrent/tracker.h" - #include "torrent/tracker_list.h" ---- libtorrent-0.12.2.orig/src/tracker/tracker_udp.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/tracker/tracker_udp.cc 2008-06-24 15:35:31.207275209 -0400 -@@ -45,6 +45,7 @@ - #include "torrent/connection_manager.h" - #include "torrent/poll.h" - #include "torrent/tracker_list.h" -+#include "torrent/data/file_list.h" - - #include "tracker_udp.h" - #include "manager.h" -@@ -325,7 +326,7 @@ - m_readBuffer->read_32() != m_transactionId) - return false; - -- receive_failed("Received error message: " + std::string(m_readBuffer->position(), m_readBuffer->end())); -+ receive_failed("Received error message: " + std::string((char*)m_readBuffer->position(), m_readBuffer->remaining())); - return true; - } - ---- libtorrent-0.12.2.orig/src/torrent/chunk_manager.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/chunk_manager.cc 2008-06-23 18:46:12.474491305 -0400 -@@ -112,7 +112,7 @@ - if (itr == base_type::end()) - throw internal_error("ChunkManager::erase(...) itr == base_type::end()."); - -- std::iter_swap(itr, --base_type::end()); -+ std::iter_swap(itr, base_type::end()-1); - base_type::pop_back(); - - chunkList->set_manager(NULL); ---- libtorrent-0.12.2.orig/src/torrent/peer/connection_list.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/peer/connection_list.cc 2008-06-23 18:42:38.710410872 -0400 -@@ -141,7 +141,7 @@ - // Need to do it one connection at the time to ensure that when the - // signal is emited everything is in a valid state. - while (pos != end()) -- erase(--end(), flags); -+ erase(end()-1, flags); - - m_download->info()->set_accepting_new_peers(size() < m_maxSize); - } ---- libtorrent-0.12.2.orig/src/torrent/object_stream.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/object_stream.cc 2008-06-23 22:07:52.705714634 -0400 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #include "utils/sha1.h" - -@@ -233,7 +234,7 @@ - src /= 10; - } - -- object_write_bencode_c_string(output, first, 20 - std::distance(buffer, first)); -+ object_write_bencode_c_string(output, first, 20 - (first - buffer)); - } - - void ---- libtorrent-0.12.2.orig/src/torrent/download.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/download.cc 2008-06-23 18:56:21.847160292 -0400 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - #include - #include ---- libtorrent-0.12.2.orig/src/torrent/data/file_list.cc 2008-06-23 18:17:42.415878000 -0400 -+++ libtorrent-0.12.2/src/torrent/data/file_list.cc 2008-06-23 18:21:51.029221269 -0400 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- libtorrent-0.12.2.orig/src/torrent/data/file_utils.cc 2008-06-23 18:25:06.488832000 -0400 -+++ libtorrent-0.12.2/src/torrent/data/file_utils.cc 2008-06-23 18:25:31.066012126 -0400 -@@ -60,7 +60,7 @@ - FileList::split_type* splitItr = splitList; - - unsigned int nameSize = srcPath->back().size() + suffix.size(); -- char name[nameSize + 4]; -+ char* name = new char[nameSize + 4]; - - std::memcpy(name, srcPath->back().c_str(), srcPath->back().size()); - std::memcpy(name + srcPath->back().size(), suffix.c_str(), suffix.size()); -@@ -80,6 +80,8 @@ - splitItr->second.back() = name; - } - -+ delete name; -+ - return fileList->split(position, splitList, splitItr).second; - } - ---- libtorrent-0.12.2.orig/src/torrent/data/block.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/data/block.cc 2008-06-23 17:24:05.346918013 -0400 -@@ -38,6 +38,7 @@ - - #include - #include -+#include - #include - - #include "peer/peer_info.h" ---- libtorrent-0.12.2.orig/src/torrent/data/transfer_list.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/data/transfer_list.cc 2008-06-24 15:09:29.809436919 -0400 -@@ -39,9 +39,12 @@ - #include - #include - #include -+#include - #include - - #include "data/chunk.h" -+#include "download/download_main.h" -+#include "download/chunk_selector.h" - #include "peer/peer_info.h" - - #include "block_failed.h" ---- libtorrent-0.12.2.orig/src/torrent/poll_select.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/poll_select.cc 2008-06-23 19:06:09.911597997 -0400 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include -+#include - - #include - #include ---- libtorrent-0.12.2.orig/src/torrent/hash_string.h 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/hash_string.h 2008-06-23 17:11:39.337687346 -0400 -@@ -56,8 +56,16 @@ - typedef const value_type* const_iterator; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; -+#ifndef __SUNPRO_CC - typedef std::reverse_iterator reverse_iterator; - typedef std::reverse_iterator const_reverse_iterator; -+#else -+ typedef std::reverse_iterator reverse_iterator; -+ -+ typedef std::reverse_iterator const_reverse_iterator; -+#endif /* SIGC_HAVE_SUN_REVERSE_ITERATOR */ - - static const size_type size_data = 20; - ---- libtorrent-0.12.2.orig/src/torrent/resume.cc 2008-05-07 08:19:13.000000000 -0400 -+++ libtorrent-0.12.2/src/torrent/resume.cc 2008-06-28 15:58:08.634117091 -0400 -@@ -310,8 +310,13 @@ - - const rak::socket_address* sa = rak::socket_address::cast_from(itr->second->socket_address()); - -- if (sa->family() == rak::socket_address::af_inet) -- peer.insert_key("inet", std::string(SocketAddressCompact(sa->sa_inet()->address_n(), htons(itr->second->listen_port())).c_str(), sizeof(SocketAddressCompact))); -+ if (sa->family() == rak::socket_address::af_inet) { -+ SocketAddressCompact s = { -+ sa->sa_inet()->address_n(), -+ htons(itr->second->listen_port()) -+ }; -+ peer.insert_key("inet", std::string(s.c_str(), sizeof(SocketAddressCompact))); -+ } - - peer.insert_key("failed", itr->second->failed_counter()); - peer.insert_key("last", itr->second->is_connected() ? cachedTime.seconds() : itr->second->last_connection()); ---- libtorrent-0.12.2.orig/src/net/throttle_list.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/net/throttle_list.cc 2008-06-24 15:00:32.453025557 -0400 -@@ -40,6 +40,8 @@ - #include - #include - -+#include "socket_base.h" -+ - #include "throttle_list.h" - #include "throttle_node.h" - ---- libtorrent-0.12.2.orig/src/net/listen.cc 2008-05-07 08:19:12.000000000 -0400 -+++ libtorrent-0.12.2/src/net/listen.cc 2008-06-24 14:59:01.383033240 -0400 -@@ -45,6 +45,7 @@ - #include "torrent/exceptions.h" - #include "torrent/connection_manager.h" - #include "torrent/poll.h" -+#include "protocol/handshake_manager.h" - - #include "listen.h" - #include "manager.h" Deleted: csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff =================================================================== --- csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff 2012-04-25 18:17:13 UTC (rev 17873) +++ csw/mgar/pkg/libtorrent/trunk/files/rlibtorrent-05-tracker-usable.diff 2012-04-26 09:05:30 UTC (rev 17874) @@ -1,48 +0,0 @@ ---- libtorrent-0.12.2.orig/src/torrent/tracker_list.cc 2008-07-01 22:21:49.641937000 -0400 -+++ libtorrent-0.12.2/src/torrent/tracker_list.cc 2008-07-01 22:22:08.525804085 -0400 -@@ -66,14 +66,9 @@ - return m_itr != end() && (*m_itr)->is_busy(); - } - --// Need a custom predicate because the is_usable function is virtual. --struct tracker_usable_t : public std::unary_function { -- bool operator () (const TrackerList::value_type& value) const { return value->is_usable(); } --}; -- - bool - TrackerList::has_usable() const { -- return std::find_if(begin(), end(), tracker_usable_t()) != end(); -+ return find_usable(begin()) != end(); - } - - void -@@ -90,6 +85,8 @@ - - set_state(s); - m_itr = find_usable(m_itr); -+ if (m_itr == end()) -+ m_itr = find_usable(begin()); - - if (m_itr != end()) - (*m_itr)->send_state(state()); -@@ -134,18 +131,12 @@ - - TrackerList::iterator - TrackerList::find_usable(iterator itr) { -- while (itr != end() && !tracker_usable_t()(*itr)) -- ++itr; -- -- return itr; -+ return std::find_if(itr, end(), std::mem_fun(&Tracker::is_usable)); - } - - TrackerList::const_iterator - TrackerList::find_usable(const_iterator itr) const { -- while (itr != end() && !tracker_usable_t()(*itr)) -- ++itr; -- -- return itr; -+ return std::find_if(itr, end(), std::mem_fun(&Tracker::is_usable)); - } - - TrackerList::iterator 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 Apr 26 11:25:32 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 09:25:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17875] csw/mgar/pkg Message-ID: Revision: 17875 http://gar.svn.sourceforge.net/gar/?rev=17875&view=rev Author: dmichelsen Date: 2012-04-26 09:25:32 +0000 (Thu, 26 Apr 2012) Log Message: ----------- deluge/trunk: Initial commit, does not compile yet due to mix of Sun Studio for Python and GCC for boost etc. Added Paths: ----------- csw/mgar/pkg/deluge/ csw/mgar/pkg/deluge/Makefile csw/mgar/pkg/deluge/branches/ csw/mgar/pkg/deluge/tags/ csw/mgar/pkg/deluge/trunk/ csw/mgar/pkg/deluge/trunk/Makefile csw/mgar/pkg/deluge/trunk/checksums csw/mgar/pkg/deluge/trunk/files/ Added: csw/mgar/pkg/deluge/Makefile =================================================================== --- csw/mgar/pkg/deluge/Makefile (rev 0) +++ csw/mgar/pkg/deluge/Makefile 2012-04-26 09:25:32 UTC (rev 17875) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/deluge/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/deluge/trunk/Makefile =================================================================== --- csw/mgar/pkg/deluge/trunk/Makefile (rev 0) +++ csw/mgar/pkg/deluge/trunk/Makefile 2012-04-26 09:25:32 UTC (rev 17875) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = deluge +VERSION = 1.3.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Full-features BitTorrent client + +MASTER_SITES = http://download.deluge-torrent.org/source/ +DISTFILES = $(DISTNAME).tar.lzma + +# boost gxx is only available for Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +LICENSE = LICENSE + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +GARCOMPILER = GCC4 +EXTRA_INC += /opt/csw/gxx/include +EXTRA_LIB += /opt/csw/gxx/lib + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/deluge/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/deluge/trunk/checksums =================================================================== --- csw/mgar/pkg/deluge/trunk/checksums (rev 0) +++ csw/mgar/pkg/deluge/trunk/checksums 2012-04-26 09:25:32 UTC (rev 17875) @@ -0,0 +1 @@ +872b45d200bbe16e49352fdf4586da1d deluge-1.3.5.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 26 13:31:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 11:31:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[17876] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 17876 http://gar.svn.sourceforge.net/gar/?rev=17876&view=rev Author: dmichelsen Date: 2012-04-26 11:31:48 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libtool/trunk: Allow overriding of LTCFLAGS, inherit from CFLAGS otherwise Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2012-04-26 09:25:32 UTC (rev 17875) +++ csw/mgar/pkg/libtool/trunk/Makefile 2012-04-26 11:31:48 UTC (rev 17876) @@ -86,19 +86,27 @@ post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) ginstall -d $(DESTDIR)$(docdir)/libtool ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/libtool/README.CSW + @$(MAKECOOKIE) patch-libtool: - cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) + -cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch --forward -p1) # Remove arch-specific flags from the libtool-compilation so they don't spoil the target build - perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool - @$(MAKECOOKIE) + # Instead we inherit from CFLAGS as removing the arch specified leads to the default arch which + # may very well be wrong (especially on sparc default is v8+ instead of the requested default v8 + # thus resulting in a different binary being generated). + perl -pi -e 's/^LTCFLAGS=.*/if [ -z "\$$LTCFLAGS" ]; then \ + if [ -z "\$$CFLAGS" ]; then \ + LTCFLAGS="-O" \ + else \ + LTCFLAGS="\$$CFLAGS" \ + fi \ +fi/' $(DESTDIR)$(bindir)/libtool install-libtool-%: perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.conf perl -ane '$$p = 1 if( /^# ### BEGIN LIBTOOL TAG CONFIG/ ); print if( $$p ); if( /^# ### END LIBTOOL TAG CONFIG/ ) { $$p = 0; print "\n"; }' \ <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags - @$(MAKECOOKIE) merge-copy-tags: $(PKGROOT) $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ 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 Apr 26 14:19:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:19:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[17877] csw/mgar/pkg/libogg/trunk Message-ID: Revision: 17877 http://gar.svn.sourceforge.net/gar/?rev=17877&view=rev Author: dmichelsen Date: 2012-04-26 12:19:59 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libogg/trunk: Update to 1.3.0 Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile csw/mgar/pkg/libogg/trunk/checksums Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2012-04-26 11:31:48 UTC (rev 17876) +++ csw/mgar/pkg/libogg/trunk/Makefile 2012-04-26 12:19:59 UTC (rev 17877) @@ -1,5 +1,5 @@ NAME = libogg -VERSION = 1.2.2 +VERSION = 1.3.0 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libogg/trunk/checksums =================================================================== --- csw/mgar/pkg/libogg/trunk/checksums 2012-04-26 11:31:48 UTC (rev 17876) +++ csw/mgar/pkg/libogg/trunk/checksums 2012-04-26 12:19:59 UTC (rev 17877) @@ -1 +1 @@ -203c28a1d356b641253c960365e4cc48 libogg-1.2.2.tar.xz +84a35715170f2cd4c77a4448772b95d5 libogg-1.3.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 26 14:20:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:20:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17878] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 17878 http://gar.svn.sourceforge.net/gar/?rev=17878&view=rev Author: dmichelsen Date: 2012-04-26 12:20:31 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libcurl4/trunk: Make libcurl4_feature require libcurl4 just in case someones tries to install it manually Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2012-04-26 12:19:59 UTC (rev 17877) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2012-04-26 12:20:31 UTC (rev 17878) @@ -46,6 +46,10 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 +# Without the base lib the feature lib is not pulled in +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcurl4 +# There is no dependency from feature to base as feature is an optional dependency +CHECKPKG_OVERRIDES_CSWlibcurl4-feature += surplus-dependency|CSWlibcurl4 # These are artifacts of the feature lib being a regular one. # As it is never linked against the soname doesn't matter here and the package name 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 Apr 26 14:27:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:27:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[17879] csw/mgar/pkg/libogg/trunk/ Message-ID: Revision: 17879 http://gar.svn.sourceforge.net/gar/?rev=17879&view=rev Author: dmichelsen Date: 2012-04-26 12:27:42 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libogg/trunk: Update svn:ignores Property Changed: ---------------- csw/mgar/pkg/libogg/trunk/ Property changes on: csw/mgar/pkg/libogg/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work 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 Apr 26 14:45:52 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:45:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17880] csw/mgar/pkg/libexplain/trunk Message-ID: Revision: 17880 http://gar.svn.sourceforge.net/gar/?rev=17880&view=rev Author: dmichelsen Date: 2012-04-26 12:45:51 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libexplain/trunk: Update to 0.52.D002 Modified Paths: -------------- csw/mgar/pkg/libexplain/trunk/Makefile csw/mgar/pkg/libexplain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch Modified: csw/mgar/pkg/libexplain/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexplain/trunk/Makefile 2012-04-26 12:27:42 UTC (rev 17879) +++ csw/mgar/pkg/libexplain/trunk/Makefile 2012-04-26 12:45:51 UTC (rev 17880) @@ -4,7 +4,7 @@ # * inspect failed tests from the testsuite NAME = libexplain -VERSION = 0.46.D001 +VERSION = 0.52.D002 GARTYPE = v2 CATEGORIES = lib @@ -15,6 +15,8 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Solaris-fixes.patch + LICENSE = LICENSE PACKAGES += CSWexplain Modified: csw/mgar/pkg/libexplain/trunk/checksums =================================================================== --- csw/mgar/pkg/libexplain/trunk/checksums 2012-04-26 12:27:42 UTC (rev 17879) +++ csw/mgar/pkg/libexplain/trunk/checksums 2012-04-26 12:45:51 UTC (rev 17880) @@ -1 +1 @@ -f8f7d4ce12c34ad211c9763d08cdcfeb libexplain-0.46.D001.tar.gz +80f33a99ca4ac0326b8de87602c52f11 libexplain-0.52.D002.tar.gz Added: csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0001-Solaris-fixes.patch 2012-04-26 12:45:51 UTC (rev 17880) @@ -0,0 +1,116 @@ +From d46d1fd0a78f99a172aba96b2f5ee16583720e1d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Apr 2012 14:01:23 +0200 +Subject: [PATCH] Solaris fixes + +--- + libexplain/buffer/errno/shmat.c | 2 ++ + libexplain/buffer/ipc_perm.c | 8 ++++---- + libexplain/buffer/shm_info.c | 2 +- + libexplain/buffer/shminfo.c | 4 ++++ + test_shmctl/main.c | 2 ++ + 5 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/libexplain/buffer/errno/shmat.c b/libexplain/buffer/errno/shmat.c +index 41bb26f..ce147f8 100644 +--- a/libexplain/buffer/errno/shmat.c ++++ b/libexplain/buffer/errno/shmat.c +@@ -153,11 +153,13 @@ explain_buffer_errno_shmat_explanation(explain_string_buffer_t *sb, int errnum, + break; + + case EINVAL: ++#ifdef SHM_REMAP + if ((shmflg & SHM_REMAP) && !shmaddr) + { + explain_buffer_is_the_null_pointer(sb, "shmaddr"); + return; + } ++#endif + /* use shmctl to find this out */ + if (!shmid_exists(shmid)) + { +diff --git a/libexplain/buffer/ipc_perm.c b/libexplain/buffer/ipc_perm.c +index 94305dc..ba2912c 100644 +--- a/libexplain/buffer/ipc_perm.c ++++ b/libexplain/buffer/ipc_perm.c +@@ -96,8 +96,8 @@ explain_buffer_ipc_perm(explain_string_buffer_t *sb, + explain_string_buffer_puts(sb, "{ "); + if (extra) + { +- explain_string_buffer_puts(sb, "__key = "); +- explain_buffer_int(sb, data->__key); ++ explain_string_buffer_puts(sb, "key = "); ++ explain_buffer_int(sb, data->key); + explain_string_buffer_puts(sb, ", "); + } + explain_string_buffer_puts(sb, "uid = "); +@@ -115,8 +115,8 @@ explain_buffer_ipc_perm(explain_string_buffer_t *sb, + explain_buffer_ipc_perm_mode(sb, data->mode); + if (extra) + { +- explain_string_buffer_puts(sb, ", __seq = "); +- explain_buffer_ushort(sb, data->__seq); ++ explain_string_buffer_puts(sb, ", seq = "); ++ explain_buffer_ushort(sb, data->seq); + } + explain_string_buffer_puts(sb, " }"); + #else +diff --git a/libexplain/buffer/shm_info.c b/libexplain/buffer/shm_info.c +index 56aecda..20c5c02 100644 +--- a/libexplain/buffer/shm_info.c ++++ b/libexplain/buffer/shm_info.c +@@ -29,7 +29,7 @@ void + explain_buffer_shm_info(explain_string_buffer_t *sb, + const struct shm_info *data) + { +-#ifdef HAVE_SYS_SHM_H ++#if 0 + if (explain_is_efault_pointer(data, sizeof(*data))) + { + explain_buffer_pointer(sb, data); +diff --git a/libexplain/buffer/shminfo.c b/libexplain/buffer/shminfo.c +index 01aab9f..050a096 100644 +--- a/libexplain/buffer/shminfo.c ++++ b/libexplain/buffer/shminfo.c +@@ -38,14 +38,18 @@ explain_buffer_shminfo(explain_string_buffer_t *sb, + explain_string_buffer_puts(sb, "{ shmmax = "); + explain_buffer_ulong(sb, data->shmmax); + explain_string_buffer_puts(sb, ", shmmin = "); ++#if 0 + explain_buffer_ulong(sb, data->shmmin); + explain_string_buffer_puts(sb, ", shmmni = "); ++#endif + explain_buffer_ulong(sb, data->shmmni); + explain_string_buffer_puts(sb, ", shmseg = "); ++#if 0 + explain_buffer_ulong(sb, data->shmseg); + explain_string_buffer_puts(sb, ", shmall = "); + explain_buffer_ulong(sb, data->shmall); + explain_string_buffer_puts(sb, " }"); ++#endif + #else + explain_buffer_pointer(sb, data); + #endif +diff --git a/test_shmctl/main.c b/test_shmctl/main.c +index 98b4be7..9f9ce2c 100644 +--- a/test_shmctl/main.c ++++ b/test_shmctl/main.c +@@ -84,6 +84,7 @@ print_shmid_ds(int shmid, const struct shmid_ds *data) + static void + list(void) + { ++#if defined SHM_INFO + struct shminfo shminfo; + struct shm_info shm_info; + int maxid; +@@ -113,6 +114,7 @@ list(void) + } + print_shmid_ds(shmid, &shmseg); + } ++#endif + } + + +-- +1.7.10 + 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 Apr 26 14:52:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[17881] csw/mgar/pkg/libvorbis/trunk Message-ID: Revision: 17881 http://gar.svn.sourceforge.net/gar/?rev=17881&view=rev Author: dmichelsen Date: 2012-04-26 12:52:46 +0000 (Thu, 26 Apr 2012) Log Message: ----------- libvorbis/trunk: Update to 1.3.3, adjust catalog name and conform to latest standards Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libvorbis/trunk/ Property changes on: csw/mgar/pkg/libvorbis/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + work Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2012-04-26 12:45:51 UTC (rev 17880) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2012-04-26 12:52:46 UTC (rev 17881) @@ -1,5 +1,5 @@ NAME = libvorbis -VERSION = 1.3.2 +VERSION = 1.3.3 CATEGORIES = lib GARTYPE = v2 @@ -11,11 +11,9 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/vorbis/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.xz -# This is obsoleted -PACKAGES += CSWvorbis -CATALOGNAME_CSWvorbis = libvorbis +VENDOR_URL = http://www.vorbis.com/ PACKAGES += CSWlibvorbis0 CATALOGNAME_CSWlibvorbis0 = libvorbis0 @@ -24,6 +22,7 @@ RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath OBSOLETED_BY_CSWlibvorbis0 = CSWvorbis +CATALOGNAME_CSWvorbis = libvorbis_stub PACKAGES += CSWlibvorbisenc2 CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2 @@ -51,8 +50,6 @@ RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisfile3 RUNTIME_DEP_PKGS_CSWlibvorbis-dev += CSWlibvorbisenc2 -VENDOR_URL = http://www.vorbis.com/ - BUILD64_LIBS_ONLY = 1 EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm Modified: csw/mgar/pkg/libvorbis/trunk/checksums =================================================================== --- csw/mgar/pkg/libvorbis/trunk/checksums 2012-04-26 12:45:51 UTC (rev 17880) +++ csw/mgar/pkg/libvorbis/trunk/checksums 2012-04-26 12:52:46 UTC (rev 17881) @@ -1 +1 @@ -c870b9bd5858a0ecb5275c14486d9554 libvorbis-1.3.2.tar.gz +71b649d3e08e63ece16649df906ce8b9 libvorbis-1.3.3.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 Thu Apr 26 14:55:30 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Apr 2012 12:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[17882] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17882 http://gar.svn.sourceforge.net/gar/?rev=17882&view=rev Author: pfelecan Date: 2012-04-26 12:55:30 +0000 (Thu, 26 Apr 2012) Log Message: ----------- - declared strict run-time dependencies using transitivity - completed the build dependencies Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 12:52:46 UTC (rev 17881) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 12:55:30 UTC (rev 17882) @@ -23,15 +23,6 @@ DISTNAME = $(NAME)-lib-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU EXTRA_LINKER_FLAGS = -lintl @@ -39,42 +30,53 @@ --without-included-gettext \ --with-libintl-prefix=/opt/csw BUILD_DEP_PKGS = \ - CSWggettext-dev \ + CSWfconfig \ + CSWfribidi \ + CSWlibbz2-dev \ + CSWlibdatrie-dev \ + CSWlibexpat-dev \ + CSWlibfreetype-dev \ + CSWlibiconv-dev \ CSWlibthaidevel \ - CSWlibotf-dev + CSWlibotf-dev \ + CSWlibxft2devel \ + CSWlibxml2-dev \ + CSWlibxrenderdevel \ + CSWlibz-dev PACKAGES += CSWlibm17n0 SPKG_DESC_CSWlibm17n0 += $(DESCRIPTION) - runtime. PKGFILES_CSWlibm17n0 += $(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so) OBSOLETED_BY_CSWlibm17n0 += CSWlibm17n RUNTIME_DEP_PKGS_CSWlibm17n0 += \ + CSWfconfig \ + CSWfribidi \ + CSWlibbz2-1-0 \ + CSWlibdatrie1 \ + CSWlibexpat1 \ + CSWlibfreetype6 \ + CSWlibgcc-s1 \ + CSWlibiconv2 \ + CSWlibintl8 \ CSWlibotf0 \ CSWlibthai \ - CSWlibiconv2 \ + CSWlibxft2 \ CSWlibxml2-2 \ - CSWlibxft2 \ CSWlibxrender \ - CSWfribidi \ - CSWlibgd2 \ - CSWfconfig + CSWlibz1 + PACKAGES += CSWlibm17n-dev SPKG_DESC_CSWlibm17n-dev += $(DESCRIPTION) - development. PKGFILES_CSWlibm17n-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibm17n-dev += \ - CSWlibm17n0 \ - CSWggettext \ - CSWlibthai \ - CSWlibotf0 + CSWlibm17n0 OBSOLETED_BY_CSWlibm17n-dev += CSWlibm17ndevel PACKAGES += CSWlibm17n-utils SPKG_DESC_CSWlibm17n-utils += $(DESCRIPTION) - utilities. OBSOLETED_BY_CSWlibm17n-utils += CSWlibm17n RUNTIME_DEP_PKGS_CSWlibm17n-utils += \ - CSWlibm17n0 \ - CSWggettext \ - CSWlibthai \ - CSWlibotf0 + CSWlibm17n0 include gar/category.mk 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 Apr 26 15:41:25 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Apr 2012 13:41:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[17883] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17883 http://gar.svn.sourceforge.net/gar/?rev=17883&view=rev Author: pfelecan Date: 2012-04-26 13:41:25 +0000 (Thu, 26 Apr 2012) Log Message: ----------- - used some reasonable overrides - used some unreasonable overrides, especially given the incoherencies of determining the dependencies - the development package is architecture neutral Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 12:55:30 UTC (rev 17882) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 13:41:25 UTC (rev 17883) @@ -64,6 +64,17 @@ CSWlibxml2-2 \ CSWlibxrender \ CSWlibz1 +# added this overrides because checkpkg evaluates them incorrectly, +# e.g. libthai0 doesn't exist and how the heck it determines that it +# depends on libgs2? +CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibm17n-utils \ + missing-dependency|CSWlibgd2 \ + missing-dependency|CSWlibotf-utils \ + missing-dependency|CSWlibthai0 \ + surplus-dependency|CSWlibdatrie1 \ + surplus-dependency|CSWlibexpat1 \ + surplus-dependency|CSWlibthai \ + surplus-dependency|CSWlibotf0 PACKAGES += CSWlibm17n-dev SPKG_DESC_CSWlibm17n-dev += $(DESCRIPTION) - development. @@ -71,6 +82,8 @@ RUNTIME_DEP_PKGS_CSWlibm17n-dev += \ CSWlibm17n0 OBSOLETED_BY_CSWlibm17n-dev += CSWlibm17ndevel +CHECKPKG_OVERRIDES_CSWlibm17n-dev += file-with-bad-content|/usr/local|root/opt/csw/bin/m17n-config +ARCHALL_CSWlibm17n-dev = 1 PACKAGES += CSWlibm17n-utils SPKG_DESC_CSWlibm17n-utils += $(DESCRIPTION) - utilities. @@ -78,5 +91,19 @@ RUNTIME_DEP_PKGS_CSWlibm17n-utils += \ CSWlibm17n0 +# added this overrides because checkpkg evaluates them incorrectly, +# i.e., doesn't use transitivity: +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWfribidi \ + missing-dependency|CSWlibthai0 \ + missing-dependency|CSWlibbz2-1-0 \ + missing-dependency|CSWlibiconv2 \ + missing-dependency|CSWlibotf-utils \ + missing-dependency|CSWlibz1 \ + missing-dependency|CSWlibintl8 \ + missing-dependency|CSWlibfreetype6 \ + missing-dependency|CSWlibgd2 \ + missing-dependency|CSWlibxml2-2 \ + missing-dependency|CSWfconfig + include gar/category.mk 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 Apr 26 16:03:07 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Apr 2012 14:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[17884] csw/mgar/pkg/m17n/trunk/Makefile Message-ID: Revision: 17884 http://gar.svn.sourceforge.net/gar/?rev=17884&view=rev Author: pfelecan Date: 2012-04-26 14:03:07 +0000 (Thu, 26 Apr 2012) Log Message: ----------- just trying to alleviate checkpkg's idiosyncrasies: - no support for multi-line macro-commands - ignores architectural specification Modified Paths: -------------- csw/mgar/pkg/m17n/trunk/Makefile Modified: csw/mgar/pkg/m17n/trunk/Makefile =================================================================== --- csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 13:41:25 UTC (rev 17883) +++ csw/mgar/pkg/m17n/trunk/Makefile 2012-04-26 14:03:07 UTC (rev 17884) @@ -67,14 +67,15 @@ # added this overrides because checkpkg evaluates them incorrectly, # e.g. libthai0 doesn't exist and how the heck it determines that it # depends on libgs2? -CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibm17n-utils \ - missing-dependency|CSWlibgd2 \ - missing-dependency|CSWlibotf-utils \ - missing-dependency|CSWlibthai0 \ - surplus-dependency|CSWlibdatrie1 \ - surplus-dependency|CSWlibexpat1 \ - surplus-dependency|CSWlibthai \ - surplus-dependency|CSWlibotf0 +# Remark: checkpkg doesn't support multi-line macro-commands... +CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibm17n-utils +CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibgd2 +CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibotf-utils +CHECKPKG_OVERRIDES_CSWlibm17n0 += missing-dependency|CSWlibthai0 +CHECKPKG_OVERRIDES_CSWlibm17n0 += surplus-dependency|CSWlibdatrie1 +CHECKPKG_OVERRIDES_CSWlibm17n0 += surplus-dependency|CSWlibexpat1 +CHECKPKG_OVERRIDES_CSWlibm17n0 += surplus-dependency|CSWlibthai +CHECKPKG_OVERRIDES_CSWlibm17n0 += surplus-dependency|CSWlibotf0 PACKAGES += CSWlibm17n-dev SPKG_DESC_CSWlibm17n-dev += $(DESCRIPTION) - development. @@ -83,6 +84,8 @@ CSWlibm17n0 OBSOLETED_BY_CSWlibm17n-dev += CSWlibm17ndevel CHECKPKG_OVERRIDES_CSWlibm17n-dev += file-with-bad-content|/usr/local|root/opt/csw/bin/m17n-config +# why this? especially when the package is declared architecture neutral +CHECKPKG_OVERRIDES_CSWlibm17n-dev += archall-devel-package ARCHALL_CSWlibm17n-dev = 1 PACKAGES += CSWlibm17n-utils @@ -93,17 +96,18 @@ # added this overrides because checkpkg evaluates them incorrectly, # i.e., doesn't use transitivity: -CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWfribidi \ - missing-dependency|CSWlibthai0 \ - missing-dependency|CSWlibbz2-1-0 \ - missing-dependency|CSWlibiconv2 \ - missing-dependency|CSWlibotf-utils \ - missing-dependency|CSWlibz1 \ - missing-dependency|CSWlibintl8 \ - missing-dependency|CSWlibfreetype6 \ - missing-dependency|CSWlibgd2 \ - missing-dependency|CSWlibxml2-2 \ - missing-dependency|CSWfconfig +# Remark: checkpkg doesn't support multi-line macro-commands... +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWfribidi +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibthai0 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibotf-utils +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibgd2 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWlibm17n-utils += missing-dependency|CSWfconfig 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 Thu Apr 26 16:36:34 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 26 Apr 2012 14:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17885] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 17885 http://gar.svn.sourceforge.net/gar/?rev=17885&view=rev Author: cgrzemba Date: 2012-04-26 14:36:34 +0000 (Thu, 26 Apr 2012) Log Message: ----------- netsnmp/trunk: unset LDFLAGS for python module build Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-26 14:03:07 UTC (rev 17884) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-26 14:36:34 UTC (rev 17885) @@ -36,12 +36,12 @@ CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev SPKG_DESC_CSWnetsnmp-dev += $(DESCRIPTION), development files PKGFILES_CSWnetsnmp-dev += $(PKGFILES_DEVEL) -CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmphelpers25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpmibs25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent25 +CHECKPKG_OVERRIDES_CSWpmnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm PACKAGES += CSWlibnetsnmp25 CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 @@ -74,7 +74,7 @@ RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpagent25 -EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod PACKAGES += CSWpmnetsnmp SPKG_DESC_CSWpmnetsnmp+= $(DESCRIPTION), Perl binding PKGFILES_CSWpmnetsnmp += $(libdir)/perl.* @@ -84,9 +84,8 @@ RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 -CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm -EXTRA_MERGE_EXCLUDE_FILES = .*/*.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc PACKAGES += CSWpy-netsnmp OBSOLETED_BY_CSWpy-netsnmp = CSWnetsnmp-py SPKG_DESC_CSWpy-netsnmp += $(DESCRIPTION), Python binding @@ -106,13 +105,13 @@ CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert # BUILD64 = 1 +NOISALIST = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite CPPFLAGS = @@ -166,8 +165,6 @@ # Overriding specific libs is not possible right now. Refine when finished. # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found -# override bad-rpath-entry becasue of /opt/csw/lib/ in perl module libs -CHECKPKG_OVERRIDES_CSWnetsnmp += bad-rpath-entry include gar/category.mk @@ -179,8 +176,7 @@ # if find the header in /opt/csw/include first use the old header from # installed older version, thats why remove /opt/csw/include CFLAGS := $(filter-out -I/opt/csw/include,$(CFLAGS)) -LDFLAGS := $(filter-out -R/opt/csw/lib% -L/opt/csw/lib,$(LDFLAGS)) -# LDFLAGS := $(filter-out -L/opt/csw/lib,$(LDFLAGS)) +# LDFLAGS := $(filter-out -R/opt/csw/lib% -L/opt/csw/lib,$(LDFLAGS)) #post-install-isa-sparcv8: # ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) Modified: csw/mgar/pkg/netsnmp/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/netsnmp/trunk/files/Makefile.in.diff 2012-04-26 14:03:07 UTC (rev 17884) +++ csw/mgar/pkg/netsnmp/trunk/files/Makefile.in.diff 2012-04-26 14:36:34 UTC (rev 17885) @@ -1,6 +1,13 @@ ---- ../build-global/net-snmp-5.4.2.1/Makefile.in 2007-06-08 22:32:56.000000000 +0200 -+++ net-snmp-5.4.2.1/Makefile.in 2009-03-26 10:14:41.623488796 +0100 -@@ -207,7 +207,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -198,13 +198,13 @@ perlrealclean: + # + PYMAKE=$(PYTHON) setup.py $(PYTHONARGS) + pythonmodules: subdirs +- @(dir=`pwd`; cd python; $(PYMAKE) build --basedir=$$dir) ; \ ++ @(dir=`pwd`; cd python; LDFLAGS= $(PYMAKE) build --basedir=$$dir) ; \ + if test $$? != 0 ; then \ + exit 1 ; \ fi pythoninstall: 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 Apr 26 16:47:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 26 Apr 2012 14:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[17886] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 17886 http://gar.svn.sourceforge.net/gar/?rev=17886&view=rev Author: cgrzemba Date: 2012-04-26 14:47:52 +0000 (Thu, 26 Apr 2012) Log Message: ----------- netsnmp/trunk: refine CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-26 14:36:34 UTC (rev 17885) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-04-26 14:47:52 UTC (rev 17886) @@ -41,7 +41,7 @@ RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent25 -CHECKPKG_OVERRIDES_CSWpmnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm +CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl PACKAGES += CSWlibnetsnmp25 CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 @@ -83,8 +83,8 @@ RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 +CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm - EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc PACKAGES += CSWpy-netsnmp OBSOLETED_BY_CSWpy-netsnmp = CSWnetsnmp-py 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 Apr 26 17:56:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2012 15:56:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17887] csw/mgar/pkg/fribidi/trunk/Makefile Message-ID: Revision: 17887 http://gar.svn.sourceforge.net/gar/?rev=17887&view=rev Author: dmichelsen Date: 2012-04-26 15:56:38 +0000 (Thu, 26 Apr 2012) Log Message: ----------- fribidi/trunk: Package split, update to latest standards Modified Paths: -------------- csw/mgar/pkg/fribidi/trunk/Makefile Modified: csw/mgar/pkg/fribidi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fribidi/trunk/Makefile 2012-04-26 14:47:52 UTC (rev 17886) +++ csw/mgar/pkg/fribidi/trunk/Makefile 2012-04-26 15:56:38 UTC (rev 17887) @@ -4,19 +4,25 @@ GARTYPE = v2 DESCRIPTION = An implementation of the Unicode Bidirectional Algorithm (bidi) -define BLURB -endef MASTER_SITES = http://fribidi.org/download/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.fribidi.org/ -SPKG_SOURCEURL = http://www.fribidi.org/ +PACKAGES += CSWlibfribidi0 +SPKG_DESC_CSWlibfribidi0 = An implementation of the Unicode Bidirectional Algorithm (bidi), libfribidi.so.0 +PKGFILES_CSWlibfribidi0 += $(call pkgfiles_lib,libfribidi.so.0) +OBSOLETED_BY_CSWlibfribidi0 += CSWfribidi +PACKAGES += CSWlibfribidi-dev +SPKG_DESC_CSWlibfribidi-dev = Development files for libfribidi.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibfribidi-dev += CSWlibfribidi0 + BUILD64_LIBS_ONLY = 1 -NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) +TEST_OVERRIDE_VARS += TESTS_ENVIRONMENT +TEST_OVERRIDE_VAR_TESTS_ENVIRONMENT = /opt/csw/bin/bash + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 27 10:58:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Apr 2012 08:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[17888] csw/mgar/gar/v2 Message-ID: Revision: 17888 http://gar.svn.sourceforge.net/gar/?rev=17888&view=rev Author: dmichelsen Date: 2012-04-27 08:58:11 +0000 (Fri, 27 Apr 2012) Log Message: ----------- Deprecate admfiles, allow expansion of obsoleted package contents Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2012-04-26 15:56:38 UTC (rev 17887) +++ csw/mgar/gar/v2/gar.lib.mk 2012-04-27 08:58:11 UTC (rev 17888) @@ -48,8 +48,10 @@ # 1) we have to strip the colon from the URLs # 2) the download is very costly with bigger Makefiles as they will be # re-evaluated for every URL (nested gmake invocation, room for improvement) +$(DOWNLOADDIR)/%: _FLIST=$(filter %/$*,$(URLS)) $(DOWNLOADDIR)/%: - @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ + $(if $(_FLIST),,$(error INTERNAL ERROR: The file $* is requested but not in the list of generated URLs)) + if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ echo " ==> Grabbing $@"; \ ( for i in $(filter %/$*,$(URLS)); do \ echo " ==> Trying $$i"; \ Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-04-26 15:56:38 UTC (rev 17887) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-04-27 08:58:11 UTC (rev 17888) @@ -74,8 +74,8 @@ # the string is cut (no longer on word boundaries). SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,0,96) . " ..."/e') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) -PKGFILES_$(1) = NOFILES -ARCHALL_$(1) = 1 +PKGFILES_$(1) ?= NOFILES +ARCHALL_$(1) ?= 1 # For legacy packages we know that the dependency is correct because we deliberately set it # A legacy dependency from another package may not have been released # The catalog name may not match for legacy packages @@ -318,7 +318,10 @@ # Canned command for generating admin file names # Usage: $(call admfiles,SUNWpackage,depend copyright) # pkg.gspec is added by default. -admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM))) +#admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM))) +# The problem is that with the new ruleset the expansion of admfiles is too late leading to +# files not be in the list of generated download URLs, deprecate use +admfiles = $(error The use of admfiles is deprecated. Please use a manual list of files) # Standard sets of admin files for use with admfiles ADMSTANDARD = prototype depend 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 Apr 27 13:04:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Apr 2012 11:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[17889] csw/mgar/pkg/lame/trunk Message-ID: Revision: 17889 http://gar.svn.sourceforge.net/gar/?rev=17889&view=rev Author: dmichelsen Date: 2012-04-27 11:04:39 +0000 (Fri, 27 Apr 2012) Log Message: ----------- lame/trunk: Update to 3.99.5 Modified Paths: -------------- csw/mgar/pkg/lame/trunk/Makefile csw/mgar/pkg/lame/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lame/trunk/files/0001-Use-intrinsics-only-when-usable.patch Modified: csw/mgar/pkg/lame/trunk/Makefile =================================================================== --- csw/mgar/pkg/lame/trunk/Makefile 2012-04-27 08:58:11 UTC (rev 17888) +++ csw/mgar/pkg/lame/trunk/Makefile 2012-04-27 11:04:39 UTC (rev 17889) @@ -1,5 +1,5 @@ NAME = lame -VERSION = 3.99.1 +VERSION = 3.99.5 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/lame/trunk/checksums =================================================================== --- csw/mgar/pkg/lame/trunk/checksums 2012-04-27 08:58:11 UTC (rev 17888) +++ csw/mgar/pkg/lame/trunk/checksums 2012-04-27 11:04:39 UTC (rev 17889) @@ -1 +1 @@ -2576a7368b5c90a87adc9de6b9f0628c lame-3.99.1.tar.gz +84835b313d4a8b68f5349816d33e07ce lame-3.99.5.tar.gz Added: csw/mgar/pkg/lame/trunk/files/0001-Use-intrinsics-only-when-usable.patch =================================================================== --- csw/mgar/pkg/lame/trunk/files/0001-Use-intrinsics-only-when-usable.patch (rev 0) +++ csw/mgar/pkg/lame/trunk/files/0001-Use-intrinsics-only-when-usable.patch 2012-04-27 11:04:39 UTC (rev 17889) @@ -0,0 +1,50 @@ +From 618d62f4c4c859a5b9683f7a78cd85fa2e2cc80b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Apr 2012 11:23:11 +0200 +Subject: [PATCH] Use intrinsics only when usable + +--- + configure.in | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 2f8fa66..dd5b03f 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,9 +96,14 @@ AC_CHECK_HEADERS( \ + sys/soundcard.h \ + sys/time.h \ + unistd.h \ +- xmmintrin.h \ + linux/soundcard.h) + ++dnl Checks if xmmintrin.h is there and actually usable ++dnl It may not be usable if the requested architecture is too old for intrinsics, but the os contains the headers ++AC_MSG_CHECKING(whether xmmintrin.h is usable) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]],[[float f=1.0f;volatile __m128 vec_fabs_mask = _mm_loadu_ps(&f);]])],[XMMINTRIN_H=yes],[XMMINTRIN_H=no]) ++AC_MSG_RESULT(${XMMINTRIN_H}) ++ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_C_INLINE +@@ -635,7 +640,7 @@ WITH_VECTOR=no + case $host_cpu in + x86_64|amd64) + CPUTYPE="no" +- if test $ac_cv_header_xmmintrin_h = yes ; then ++ if test $XMMINTRIN_H = yes ; then + WITH_XMM=yes + WITH_VECTOR=yes + fi +@@ -646,7 +651,7 @@ h precission) + ;; + *86) + CPUTYPE="i386" +- if test $ac_cv_header_xmmintrin_h = yes ; then ++ if test $XMMINTRIN_H = yes ; then + WITH_XMM=yes + WITH_VECTOR=yes + fi +-- +1.7.10 + 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 Apr 27 14:14:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Apr 2012 12:14:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[17890] csw/mgar/pkg/p11-kit/trunk Message-ID: Revision: 17890 http://gar.svn.sourceforge.net/gar/?rev=17890&view=rev Author: dmichelsen Date: 2012-04-27 12:14:26 +0000 (Fri, 27 Apr 2012) Log Message: ----------- p11-kit/trunk: Update to 0.12 Modified Paths: -------------- csw/mgar/pkg/p11-kit/trunk/Makefile csw/mgar/pkg/p11-kit/trunk/checksums Added Paths: ----------- csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch Removed Paths: ------------- csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch Modified: csw/mgar/pkg/p11-kit/trunk/Makefile =================================================================== --- csw/mgar/pkg/p11-kit/trunk/Makefile 2012-04-27 11:04:39 UTC (rev 17889) +++ csw/mgar/pkg/p11-kit/trunk/Makefile 2012-04-27 12:14:26 UTC (rev 17890) @@ -2,18 +2,18 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = p11-kit -VERSION = 0.8 +VERSION = 0.12 GARTYPE = v2 CATEGORIES = lib DESCRIPTION = Load and enumerate PKCS#11 modules -define BLURB -endef MASTER_SITES = http://p11-glue.freedesktop.org/releases/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-Hack-around-missing-__argv.patch +# Use patch until this has been fixed: +# http://bugs.freedesktop.org/show_bug.cgi?id=49218 +PATCHFILES += 0001-Use-getexecname-instead-of-directly-accessing-__argv.patch VENDOR_URL = http://p11-glue.freedesktop.org/p11-kit.html Modified: csw/mgar/pkg/p11-kit/trunk/checksums =================================================================== --- csw/mgar/pkg/p11-kit/trunk/checksums 2012-04-27 11:04:39 UTC (rev 17889) +++ csw/mgar/pkg/p11-kit/trunk/checksums 2012-04-27 12:14:26 UTC (rev 17890) @@ -1 +1 @@ -0928ab06acbdeda48645df4791f4d28d p11-kit-0.8.tar.gz +66baf7ddde982d1b7294d3bd63be7446 p11-kit-0.12.tar.gz Deleted: csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch =================================================================== --- csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch 2012-04-27 11:04:39 UTC (rev 17889) +++ csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch 2012-04-27 12:14:26 UTC (rev 17890) @@ -1,52 +0,0 @@ -From 8dbe61abe2af6ce7633337a2d1005b8ddfcf5610 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 25 Oct 2011 17:55:17 +0200 -Subject: [PATCH] Hack around missing __argv - ---- - tools/compat.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tools/compat.c b/tools/compat.c -index 93ba77c..a708ac5 100644 ---- a/tools/compat.c -+++ b/tools/compat.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - static const char * - calc_prog_name (void) -@@ -51,19 +52,22 @@ calc_prog_name (void) - - if(!prepared) - { -- const char* beg = strrchr(__argv[0], '\\'); -- const char* temp = strrchr(__argv[0], '/'); -+ strcpy( prognamebuf, "" ); -+/* -+ const char* beg = strrchr(argv[0], '\\'); -+ const char* temp = strrchr(argv[0], '/'); - beg = (beg > temp) ? beg : temp; -- beg = (beg) ? beg + 1 : __argv[0]; -+ beg = (beg) ? beg + 1 : argv[0]; - -- temp = strrchr(__argv[0], '.'); -- temp = (temp > beg) ? temp : __argv[0] + strlen(__argv[0]); -+ temp = strrchr(argv[0], '.'); -+ temp = (temp > beg) ? temp : argv[0] + strlen(argv[0]); - - if((temp - beg) > 255) - temp = beg + 255; - - strncpy(prognamebuf, beg, temp - beg); - prognamebuf[temp - beg] = 0; -+*/ - prepared = 1; - } - --- -1.7.6.1 - Added: csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch =================================================================== --- csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch (rev 0) +++ csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch 2012-04-27 12:14:26 UTC (rev 17890) @@ -0,0 +1,34 @@ +From 2826e9f33625e56ae9c44f7441c3b65882822b60 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Apr 2012 14:00:32 +0200 +Subject: [PATCH] Use getexecname() instead of directly accessing __argv + +--- + tools/compat.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tools/compat.c b/tools/compat.c +index 93ba77c..fd596a2 100644 +--- a/tools/compat.c ++++ b/tools/compat.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + static const char * + calc_prog_name (void) +@@ -51,6 +52,9 @@ calc_prog_name (void) + + if(!prepared) + { ++ const char *__argv[1]; ++ ++ __argv[0] = getexecname(); + const char* beg = strrchr(__argv[0], '\\'); + const char* temp = strrchr(__argv[0], '/'); + beg = (beg > temp) ? beg : temp; +-- +1.7.10 + 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 Apr 27 14:27:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Apr 2012 12:27:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17891] csw/mgar/pkg/xscreensaver Message-ID: Revision: 17891 http://gar.svn.sourceforge.net/gar/?rev=17891&view=rev Author: dmichelsen Date: 2012-04-27 12:27:08 +0000 (Fri, 27 Apr 2012) Log Message: ----------- xscreensaver: Move old build recipe aside Added Paths: ----------- csw/mgar/pkg/xscreensaver/tags/legacy/ csw/mgar/pkg/xscreensaver/trunk/ Removed Paths: ------------- csw/mgar/pkg/xscreensaver/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Apr 27 15:02:13 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 27 Apr 2012 13:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[17892] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 17892 http://gar.svn.sourceforge.net/gar/?rev=17892&view=rev Author: chninkel Date: 2012-04-27 13:02:13 +0000 (Fri, 27 Apr 2012) Log Message: ----------- openssl/trunk: temporary made a big rpath-entry checkpkg override to workaround a gar problem Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2012-04-27 12:27:08 UTC (rev 17891) +++ csw/mgar/pkg/openssl/trunk/Makefile 2012-04-27 13:02:13 UTC (rev 17892) @@ -71,8 +71,9 @@ # we will not recompile old 0.9.7 version for now ifeq ($(shell /usr/bin/uname -p),sparc) -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7 +#CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis +#CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += bad-rpath-entry else CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libssl.so.0.9.7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 27 16:13:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Apr 2012 14:13:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[17893] csw/mgar/pkg/xscreensaver/trunk Message-ID: Revision: 17893 http://gar.svn.sourceforge.net/gar/?rev=17893&view=rev Author: dmichelsen Date: 2012-04-27 14:13:31 +0000 (Fri, 27 Apr 2012) Log Message: ----------- xscreensaver/trunk: Ported to GAR Added Paths: ----------- csw/mgar/pkg/xscreensaver/trunk/Makefile csw/mgar/pkg/xscreensaver/trunk/checksums csw/mgar/pkg/xscreensaver/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/xscreensaver/trunk/ Property changes on: csw/mgar/pkg/xscreensaver/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/xscreensaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/Makefile 2012-04-27 14:13:31 UTC (rev 17893) @@ -0,0 +1,81 @@ +# $Id: Makefile 17867 2012-04-25 11:58:37Z dmichelsen $ + +NAME = xscreensaver +VERSION = 5.15 +CATEGORIES = utils +GARTYPE = v2 + +DESCRIPTION = The ultimate screensaver collection + +MASTER_SITES = http://www.jwz.org/xscreensaver/ +DISTFILES = $(DISTNAME).tar.gz + +# sqrtf is not in Solaris 9 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +LICENSE = README + +PACKAGES += CSWxscreensaver +SPKG_DESC_CSWxscreensaver = The ultimate screensaver collection +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWxpm +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWpango +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWmesa +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgdk-pixbuf-xlib2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWfconfig +RUNTIME_DEP_PKGS_CSWxscreensaver += CSWlibgio2-0-0 +OBSOLETED_BY_CSWxscreensaver += CSWxsave +CATALOGNAME_CSWxsave = xscreensaver_stub + +# These are just docs +CHECKPKG_OVERRIDES_CSWxscreensaver += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/xscreensaver.1 +CHECKPKG_OVERRIDES_CSWxscreensaver += file-with-bad-content|/usr/share|root/opt/csw/share/man/man6/webcollage.6 +CHECKPKG_OVERRIDES_CSWxscreensaver += file-with-bad-content|/usr/share|root/opt/csw/share/man/man6/glsnake.6 + +# This is to find words +CHECKPKG_OVERRIDES_CSWxscreensaver += file-with-bad-content|/usr/share|root/opt/csw/libexec/xscreensaver/webcollage + +# I mean... it is just the *license* :-) +CHECKPKG_OVERRIDES_CSWxscreensaver += file-with-bad-content|/usr/share|root/opt/csw/share/doc/xscreensaver/license +CHECKPKG_OVERRIDES_CSWxsave += file-with-bad-content|/usr/share|root/opt/csw/share/doc/xscreensaver_stub/license + +EXTRA_LINKER_FLAGS += -lintl + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-pam +CONFIGURE_ARGS += --with-gl +CONFIGURE_ARGS += --with-x-app-defaults=/opt/csw/lib/X11/app-defaults + +# Kerberos bindings are for v4, we would need compat mode which is not +# in our v5 ATM. +# CONFIGURE_ARGS += --with-kerberos + +# There is no testsuite +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS += install_prefix +INSTALL_OVERRIDE_VAR_install_prefix = $(DESTDIR) +INSTALL_OVERRIDE_VARS += PAM_CONF +INSTALL_OVERRIDE_VAR_PAM_CONF = $(DESTDIR)/opt/csw/share/doc/xscreensaver/pam.conf.additions + +# This is needed to verify against shadow password +PROTOTYPE_MODIFIERS += suid +PROTOTYPE_FILES_suid += $(bindir)/xscreensaver +PROTOTYPE_PERMS_suid = 4755 + +include gar/category.mk + Added: csw/mgar/pkg/xscreensaver/trunk/checksums =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/checksums (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/checksums 2012-04-27 14:13:31 UTC (rev 17893) @@ -0,0 +1 @@ +c0b8b2c817a9a7371f51a82e80602d10 xscreensaver-5.15.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 Sat Apr 28 23:30:00 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 28 Apr 2012 21:30:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[17894] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 17894 http://gar.svn.sourceforge.net/gar/?rev=17894&view=rev Author: chninkel Date: 2012-04-28 21:29:59 +0000 (Sat, 28 Apr 2012) Log Message: ----------- openssl1/trunk: updated to 1.0.1b Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-27 14:13:31 UTC (rev 17893) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-28 21:29:59 UTC (rev 17894) @@ -10,10 +10,12 @@ # software causes damage. ##################################################################### +PKCS11 = 1 + ###### Package information ####### NAME = openssl -VERSION = 1.0.0e +VERSION = 1.0.1b CATEGORIES = lib GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') @@ -112,6 +114,15 @@ # (patchs taken from Debian Package) PATCHFILES += block_bad_certificates.patch +# support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine +ifdef PKCS11 + PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +ifneq ($(shell /usr/bin/uname -r),5.9) + PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 + CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) +endif +endif + LICENSE = LICENSE ##### Build and installation information ##### Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2012-04-27 14:13:31 UTC (rev 17893) +++ csw/mgar/pkg/openssl1/trunk/checksums 2012-04-28 21:29:59 UTC (rev 17894) @@ -1 +1 @@ -7040b89c4c58c7a1016c0dfa6e821c86 openssl-1.0.0e.tar.gz +a1da58ce63baef3812004714fa302c47 openssl-1.0.1b.tar.gz Added: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 2012-04-28 21:29:59 UTC (rev 17894) @@ -0,0 +1,12221 @@ +diff -uNr openssl-0.9.8o.orig//Configure openssl-0.9.8o//Configure +--- openssl-0.9.8o.orig//Configure 2010-09-04 00:11:46.000000000 +0200 ++++ openssl-0.9.8o//Configure 2010-09-04 00:21:50.864850050 +0200 +@@ -12,7 +12,7 @@ + + # see INSTALL for instructions. + +-my $usage="Usage: Configure [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; ++my $usage="Usage: Configure --pk11-libname=PK11_LIB_LOCATION [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; + + # Options: + # +@@ -21,6 +21,9 @@ + # --prefix prefix for the OpenSSL include, lib and bin directories + # (Default: the OPENSSLDIR directory) + # ++# --pk11-libname PKCS#11 library name. ++# (Default: none) ++# + # --install_prefix Additional prefix for package builders (empty by + # default). This needn't be set in advance, you can + # just as well use "make INSTALL_PREFIX=/whatever install". +@@ -591,6 +594,9 @@ + my $idx_ranlib = $idx++; + my $idx_arflags = $idx++; + ++# PKCS#11 engine patch ++my $pk11_libname=""; ++ + my $prefix=""; + my $libdir=""; + my $openssldir=""; +@@ -829,6 +835,10 @@ + { + $flags.=$_." "; + } ++ elsif (/^--pk11-libname=(.*)$/) ++ { ++ $pk11_libname=$1; ++ } + elsif (/^--prefix=(.*)$/) + { + $prefix=$1; +@@ -964,6 +974,13 @@ + exit 0; + } + ++if (! $pk11_libname) ++ { ++ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; ++ print STDERR "See README.pkcs11 for more information.\n"; ++ exit 1; ++ } ++ + if ($target =~ m/^CygWin32(-.*)$/) { + $target = "Cygwin".$1; + } +@@ -1130,6 +1147,8 @@ + if ($flags ne "") { $cflags="$flags$cflags"; } + else { $no_user_cflags=1; } + ++$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; ++ + # Kerberos settings. The flavor must be provided from outside, either through + # the script "config" or manually. + if (!$no_krb5) +@@ -1493,6 +1512,7 @@ + s/^VERSION=.*/VERSION=$version/; + s/^MAJOR=.*/MAJOR=$major/; + s/^MINOR=.*/MINOR=$minor/; ++ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; + s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; + s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; + s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; +diff -uNr openssl-0.9.8o.orig//Makefile.org openssl-0.9.8o//Makefile.org +--- openssl-0.9.8o.orig//Makefile.org 2010-01-27 17:06:36.000000000 +0100 ++++ openssl-0.9.8o//Makefile.org 2010-09-04 00:22:02.057767099 +0200 +@@ -26,6 +26,9 @@ + INSTALL_PREFIX= + INSTALLTOP=/usr/local/ssl + ++# You must set this through --pk11-libname configure option. ++PK11_LIB_LOCATION= ++ + # Do not edit this manually. Use Configure --openssldir=DIR do change this! + OPENSSLDIR=/usr/local/ssl + +diff -uNr openssl-0.9.8o.orig//crypto/engine/Makefile openssl-0.9.8o//crypto/engine/Makefile +--- openssl-0.9.8o.orig//crypto/engine/Makefile 2009-09-27 16:04:32.000000000 +0200 ++++ openssl-0.9.8o//crypto/engine/Makefile 2010-09-04 00:22:06.443813644 +0200 +@@ -21,12 +21,14 @@ + eng_table.c eng_pkey.c eng_fat.c eng_all.c \ + tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ + tb_cipher.c tb_digest.c \ +- eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c ++ eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \ ++ hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c + LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ + eng_table.o eng_pkey.o eng_fat.o eng_all.o \ + tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ + tb_cipher.o tb_digest.o \ +- eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o ++ eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \ ++ hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o + + SRC= $(LIBSRC) + +@@ -288,6 +290,61 @@ + eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h + eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h + eng_table.o: eng_table.c ++hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h ++hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h ++hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h ++hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ++hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h ++hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h ++hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h ++hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h ++hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h ++hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h ++hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h ++hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h ++hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h ++hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h ++hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h ++hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h ++hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h ++hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h ++hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h ++hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h ++hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h ++hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h ++hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h ++hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c ++hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h ++hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h ++hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h ++hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ++hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h ++hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h ++hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h ++hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h ++hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h ++hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h ++hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h ++hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h ++hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h ++hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h ++hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h ++hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h ++hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h ++hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h ++hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h ++hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h ++hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h ++hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h ++hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h ++hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c ++hw_pk11_uri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ++hw_pk11_uri.o: ../../include/openssl/opensslconf.h ++hw_pk11_uri.o: ../../include/openssl/opensslv.h ++hw_pk11_uri.o: ../../include/openssl/ossl_typ.h ++hw_pk11_uri.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h ++hw_pk11_uri.o: ../../include/openssl/symhacks.h hw_pk11.h hw_pk11_err.h ++hw_pk11_uri.o: hw_pk11_uri.c hw_pk11_uri.h pkcs11f.h pkcs11t.h + tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h + tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h + tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +diff -uNr openssl-0.9.8o.orig//crypto/engine/cryptoki.h openssl-0.9.8o//crypto/engine/cryptoki.h +--- openssl-0.9.8o.orig//crypto/engine/cryptoki.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-0.9.8o//crypto/engine/cryptoki.h 2010-09-04 00:22:06.460757086 +0200 +@@ -0,0 +1,103 @@ ++/* ++ * CDDL HEADER START ++ * ++ * The contents of this file are subject to the terms of the ++ * Common Development and Distribution License, Version 1.0 only ++ * (the "License"). You may not use this file except in compliance ++ * with the License. ++ * ++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE ++ * or http://www.opensolaris.org/os/licensing. ++ * See the License for the specific language governing permissions ++ * and limitations under the License. ++ * ++ * When distributing Covered Code, include this CDDL HEADER in each ++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. ++ * If applicable, add the following below this CDDL HEADER, with the ++ * fields enclosed by brackets "[]" replaced with your own identifying ++ * information: Portions Copyright [yyyy] [name of copyright owner] ++ * ++ * CDDL HEADER END ++ */ ++/* ++ * Copyright 2003 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++ ++#ifndef _CRYPTOKI_H ++#define _CRYPTOKI_H ++ ++#pragma ident "@(#)cryptoki.h 1.2 05/06/08 SMI" ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#ifndef CK_PTR ++#define CK_PTR * ++#endif ++ ++#ifndef CK_DEFINE_FUNCTION ++#define CK_DEFINE_FUNCTION(returnType, name) returnType name ++#endif ++ ++#ifndef CK_DECLARE_FUNCTION ++#define CK_DECLARE_FUNCTION(returnType, name) returnType name ++#endif ++ ++#ifndef CK_DECLARE_FUNCTION_POINTER ++#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) ++#endif ++ ++#ifndef CK_CALLBACK_FUNCTION ++#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) ++#endif ++ ++#ifndef NULL_PTR ++#include /* For NULL */ ++#define NULL_PTR NULL ++#endif ++ ++/* ++ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint ++ */ ++#ifndef CK_DISABLE_TRUE_FALSE ++#define CK_DISABLE_TRUE_FALSE ++#ifndef TRUE ++#define TRUE 1 ++#endif /* TRUE */ ++#ifndef FALSE ++#define FALSE 0 ++#endif /* FALSE */ ++#endif /* CK_DISABLE_TRUE_FALSE */ ++ ++#undef CK_PKCS11_FUNCTION_INFO ++ ++#include "pkcs11.h" ++ ++/* Solaris specific functions */ ++ ++#include ++ ++/* ++ * SUNW_C_GetMechSession will initialize the framework and do all ++ * the necessary PKCS#11 calls to create a session capable of ++ * providing operations on the requested mechanism ++ */ ++CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech, ++ CK_SESSION_HANDLE_PTR hSession); ++ ++/* ++ * SUNW_C_KeyToObject will create a secret key object for the given ++ * mechanism from the rawkey data. ++ */ ++CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, ++ CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len, ++ CK_OBJECT_HANDLE_PTR obj); ++ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _CRYPTOKI_H */ +diff -uNr openssl-0.9.8o.orig//crypto/engine/eng_all.c openssl-0.9.8o//crypto/engine/eng_all.c +--- openssl-0.9.8o.orig//crypto/engine/eng_all.c 2010-03-01 01:30:11.000000000 +0100 ++++ openssl-0.9.8o//crypto/engine/eng_all.c 2010-09-04 00:22:06.503582943 +0200 +@@ -110,6 +110,9 @@ + #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) + ENGINE_load_capi(); + #endif ++#ifndef OPENSSL_NO_HW_PKCS11 ++ ENGINE_load_pk11(); ++#endif + #endif + } + +diff -uNr openssl-0.9.8o.orig//crypto/engine/engine.h openssl-0.9.8o//crypto/engine/engine.h +--- openssl-0.9.8o.orig//crypto/engine/engine.h 2010-02-09 15:18:15.000000000 +0100 ++++ openssl-0.9.8o//crypto/engine/engine.h 2010-09-04 00:22:06.528927372 +0200 +@@ -337,6 +337,7 @@ + void ENGINE_load_ubsec(void); + #endif + void ENGINE_load_cryptodev(void); ++void ENGINE_load_pk11(void); + void ENGINE_load_padlock(void); + void ENGINE_load_builtin_engines(void); + #ifdef OPENSSL_SYS_WIN32 +diff -uNr openssl-0.9.8o.orig//crypto/engine/hw_pk11.c openssl-0.9.8o//crypto/engine/hw_pk11.c +--- openssl-0.9.8o.orig//crypto/engine/hw_pk11.c 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-0.9.8o//crypto/engine/hw_pk11.c 2010-09-04 00:22:06.552558696 +0200 +@@ -0,0 +1,3813 @@ ++/* ++ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. ++ * Use is subject to license terms. ++ */ ++ ++/* crypto/engine/hw_pk11.c */ ++/* ++ * This product includes software developed by the OpenSSL Project for ++ * use in the OpenSSL Toolkit (http://www.openssl.org/). ++ * ++ * This project also referenced hw_pkcs11-0.9.7b.patch written by ++ * Afchine Madjlessi. ++ */ ++/* ++ * ==================================================================== ++ * Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. All advertising materials mentioning features or use of this ++ * software must display the following acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" ++ * ++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For written permission, please contact ++ * licensing at OpenSSL.org. ++ * ++ * 5. Products derived from this software may not be called "OpenSSL" ++ * nor may "OpenSSL" appear in their names without prior written ++ * permission of the OpenSSL Project. ++ * ++ * 6. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by the OpenSSL Project ++ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY ++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ==================================================================== ++ * ++ * This product includes cryptographic software written by Eric Young ++ * (eay at cryptsoft.com). This product includes software written by Tim ++ * Hudson (tjh at cryptsoft.com). ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifndef OPENSSL_NO_RSA ++#include ++#endif ++#ifndef OPENSSL_NO_DSA ++#include ++#endif ++#ifndef OPENSSL_NO_DH ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef OPENSSL_NO_HW ++#ifndef OPENSSL_NO_HW_PK11 ++ ++/* label for debug messages printed on stderr */ ++#define PK11_DBG "PKCS#11 ENGINE DEBUG" ++/* prints a lot of debug messages on stderr about slot selection process */ ++#undef DEBUG_SLOT_SELECTION ++/* ++ * Solaris specific code. See comment at check_hw_mechanisms() for more ++ * information. ++ */ ++#if defined(__SVR4) && defined(__sun) ++#define SOLARIS_HW_SLOT_SELECTION ++#endif ++ ++/* ++ * AES counter mode is not supported in the OpenSSL EVP API yet and neither ++ * there are official OIDs for mechanisms based on this mode. With our changes, ++ * an application can define its own EVP calls for AES counter mode and then ++ * it can make use of hardware acceleration through this engine. However, it's ++ * better if we keep AES CTR support code under ifdef's. ++ */ ++#define SOLARIS_AES_CTR ++ ++#include "cryptoki.h" ++#include "pkcs11.h" ++#include "hw_pk11.h" ++#include "hw_pk11_uri.h" ++#include "hw_pk11_err.c" ++ ++#ifdef SOLARIS_AES_CTR ++/* ++ * NIDs for AES counter mode that will be defined during the engine ++ * initialization. ++ */ ++int NID_aes_128_ctr = NID_undef; ++int NID_aes_192_ctr = NID_undef; ++int NID_aes_256_ctr = NID_undef; ++#endif /* SOLARIS_AES_CTR */ ++ ++/* ++ * We use this lock to prevent multiple C_Login()s, guard getpassphrase(), ++ * uri_struct manipulation, and static token info. All of that is used by the ++ * RSA keys by reference feature. ++ */ ++pthread_mutex_t *uri_lock; ++ ++#ifdef SOLARIS_HW_SLOT_SELECTION ++/* ++ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel ++ * library. See comment at check_hw_mechanisms() for more information. ++ */ ++int *hw_cnids; ++int *hw_dnids; ++#endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++/* PKCS#11 session caches and their locks for all operation types */ ++static PK11_CACHE session_cache[OP_MAX]; ++ ++/* ++ * We cache the flags so that we do not have to run C_GetTokenInfo() again when ++ * logging into the token. ++ */ ++CK_FLAGS pubkey_token_flags; ++ ++/* ++ * As stated in v2.20, 11.7 Object Management Function, in section for ++ * C_FindObjectsInit(), at most one search operation may be active at a given ++ * time in a given session. Therefore, C_Find{,Init,Final}Objects() should be ++ * grouped together to form one atomic search operation. This is already ++ * ensured by the property of unique PKCS#11 session handle used for each ++ * PK11_SESSION object. ++ * ++ * This is however not the biggest concern - maintaining consistency of the ++ * underlying object store is more important. The same section of the spec also ++ * says that one thread can be in the middle of a search operation while another ++ * thread destroys the object matching the search template which would result in ++ * invalid handle returned from the search operation. ++ * ++ * Hence, the following locks are used for both protection of the object stores. ++ * They are also used for active list protection. ++ */ ++pthread_mutex_t *find_lock[OP_MAX] = { NULL }; ++ ++/* ++ * lists of asymmetric key handles which are active (referenced by at least one ++ * PK11_SESSION structure, either held by a thread or present in free_session ++ * list) for given algorithm type ++ */ ++PK11_active *active_list[OP_MAX] = { NULL }; ++ ++/* ++ * Create all secret key objects in a global session so that they are available ++ * to use for other sessions. These other sessions may be opened or closed ++ * without losing the secret key objects. ++ */ ++static CK_SESSION_HANDLE global_session = CK_INVALID_HANDLE; ++ ++/* ENGINE level stuff */ ++static int pk11_init(ENGINE *e); ++static int pk11_library_init(ENGINE *e); ++static int pk11_finish(ENGINE *e); ++static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); ++static int pk11_destroy(ENGINE *e); ++ ++/* RAND stuff */ ++static void pk11_rand_seed(const void *buf, int num); ++static void pk11_rand_add(const void *buf, int num, double add_entropy); ++static void pk11_rand_cleanup(void); ++static int pk11_rand_bytes(unsigned char *buf, int num); ++static int pk11_rand_status(void); ++ ++/* These functions are also used in other files */ ++PK11_SESSION *pk11_get_session(PK11_OPTYPE optype); ++void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype); ++ ++/* active list manipulation functions used in this file */ ++extern int pk11_active_delete(CK_OBJECT_HANDLE h, PK11_OPTYPE type); ++extern void pk11_free_active_list(PK11_OPTYPE type); ++ ++#ifndef OPENSSL_NO_RSA ++int pk11_destroy_rsa_key_objects(PK11_SESSION *session); ++int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); ++int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); ++#endif ++#ifndef OPENSSL_NO_DSA ++int pk11_destroy_dsa_key_objects(PK11_SESSION *session); ++int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); ++int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); ++#endif ++#ifndef OPENSSL_NO_DH ++int pk11_destroy_dh_key_objects(PK11_SESSION *session); ++int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock); ++#endif ++ ++/* Local helper functions */ ++static int pk11_free_all_sessions(void); ++static int pk11_free_session_list(PK11_OPTYPE optype); ++static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype); ++static int pk11_destroy_cipher_key_objects(PK11_SESSION *session); ++static int pk11_destroy_object(CK_SESSION_HANDLE handle, CK_OBJECT_HANDLE oh, ++ CK_BBOOL persistent); ++static const char *get_PK11_LIBNAME(void); ++static void free_PK11_LIBNAME(void); ++static long set_PK11_LIBNAME(const char *name); ++ ++/* Symmetric cipher and digest support functions */ ++static int cipher_nid_to_pk11(int nid); ++#ifdef SOLARIS_AES_CTR ++static int pk11_add_NID(char *sn, char *ln); ++static int pk11_add_aes_ctr_NIDs(void); ++#endif /* SOLARIS_AES_CTR */ ++static int pk11_usable_ciphers(const int **nids); ++static int pk11_usable_digests(const int **nids); ++static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, ++ const unsigned char *iv, int enc); ++static int pk11_cipher_final(PK11_SESSION *sp); ++static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, ++ const unsigned char *in, unsigned int inl); ++static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx); ++static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, ++ const int **nids, int nid); ++static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest, ++ const int **nids, int nid); ++static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, ++ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp); ++static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, ++ int key_len); ++static int md_nid_to_pk11(int nid); ++static int pk11_digest_init(EVP_MD_CTX *ctx); ++static int pk11_digest_update(EVP_MD_CTX *ctx, const void *data, ++ size_t count); ++static int pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md); ++static int pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from); ++static int pk11_digest_cleanup(EVP_MD_CTX *ctx); ++ ++static int pk11_choose_slots(int *any_slot_found); ++static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist, ++ CK_SLOT_ID current_slot, int *current_slot_n_cipher, ++ int *local_cipher_nids); ++static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist, ++ CK_SLOT_ID current_slot, int *current_slot_n_digest, ++ int *local_digest_nids); ++static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id, ++ CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids, ++ int id); ++static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id, ++ CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids, ++ int id); ++ ++static int pk11_init_all_locks(void); ++static void pk11_free_all_locks(void); ++ ++#ifdef SOLARIS_HW_SLOT_SELECTION ++static int check_hw_mechanisms(void); ++static int nid_in_table(int nid, int *nid_table); ++#endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++/* Index for the supported ciphers */ ++enum pk11_cipher_id { ++ PK11_DES_CBC, ++ PK11_DES3_CBC, ++ PK11_DES_ECB, ++ PK11_DES3_ECB, ++ PK11_RC4, ++ PK11_AES_128_CBC, ++ PK11_AES_192_CBC, ++ PK11_AES_256_CBC, ++ PK11_AES_128_ECB, ++ PK11_AES_192_ECB, ++ PK11_AES_256_ECB, ++ PK11_BLOWFISH_CBC, ++#ifdef SOLARIS_AES_CTR ++ PK11_AES_128_CTR, ++ PK11_AES_192_CTR, ++ PK11_AES_256_CTR, ++#endif /* SOLARIS_AES_CTR */ ++ PK11_CIPHER_MAX ++}; ++ ++/* Index for the supported digests */ ++enum pk11_digest_id { ++ PK11_MD5, ++ PK11_SHA1, ++ PK11_SHA224, ++ PK11_SHA256, ++ PK11_SHA384, ++ PK11_SHA512, ++ PK11_DIGEST_MAX ++}; ++ ++#define TRY_OBJ_DESTROY(sp, obj_hdl, retval, uselock, alg_type) \ ++ { \ ++ if (uselock) \ ++ LOCK_OBJSTORE(alg_type); \ ++ if (pk11_active_delete(obj_hdl, alg_type) == 1) \ ++ { \ ++ retval = pk11_destroy_object(sp->session, obj_hdl, \ ++ sp->persistent); \ ++ } \ ++ if (uselock) \ ++ UNLOCK_OBJSTORE(alg_type); \ ++ } ++ ++static int cipher_nids[PK11_CIPHER_MAX]; ++static int digest_nids[PK11_DIGEST_MAX]; ++static int cipher_count = 0; ++static int digest_count = 0; ++static CK_BBOOL pk11_have_rsa = CK_FALSE; ++static CK_BBOOL pk11_have_dsa = CK_FALSE; ++static CK_BBOOL pk11_have_dh = CK_FALSE; ++static CK_BBOOL pk11_have_random = CK_FALSE; ++ ++typedef struct PK11_CIPHER_st ++ { ++ enum pk11_cipher_id id; ++ int nid; ++ int iv_len; ++ int min_key_len; ++ int max_key_len; ++ CK_KEY_TYPE key_type; ++ CK_MECHANISM_TYPE mech_type; ++ } PK11_CIPHER; ++ ++static PK11_CIPHER ciphers[] = ++ { ++ { PK11_DES_CBC, NID_des_cbc, 8, 8, 8, ++ CKK_DES, CKM_DES_CBC, }, ++ { PK11_DES3_CBC, NID_des_ede3_cbc, 8, 24, 24, ++ CKK_DES3, CKM_DES3_CBC, }, ++ { PK11_DES_ECB, NID_des_ecb, 0, 8, 8, ++ CKK_DES, CKM_DES_ECB, }, ++ { PK11_DES3_ECB, NID_des_ede3_ecb, 0, 24, 24, ++ CKK_DES3, CKM_DES3_ECB, }, ++ { PK11_RC4, NID_rc4, 0, 16, 256, ++ CKK_RC4, CKM_RC4, }, ++ { PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, 16, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, 24, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, 32, ++ CKK_AES, CKM_AES_CBC, }, ++ { PK11_AES_128_ECB, NID_aes_128_ecb, 0, 16, 16, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_AES_192_ECB, NID_aes_192_ecb, 0, 24, 24, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_AES_256_ECB, NID_aes_256_ecb, 0, 32, 32, ++ CKK_AES, CKM_AES_ECB, }, ++ { PK11_BLOWFISH_CBC, NID_bf_cbc, 8, 16, 16, ++ CKK_BLOWFISH, CKM_BLOWFISH_CBC, }, ++#ifdef SOLARIS_AES_CTR ++ /* we don't know the correct NIDs until the engine is initialized */ ++ { PK11_AES_128_CTR, NID_undef, 16, 16, 16, ++ CKK_AES, CKM_AES_CTR, }, ++ { PK11_AES_192_CTR, NID_undef, 16, 24, 24, ++ CKK_AES, CKM_AES_CTR, }, ++ { PK11_AES_256_CTR, NID_undef, 16, 32, 32, ++ CKK_AES, CKM_AES_CTR, }, ++#endif /* SOLARIS_AES_CTR */ ++ }; ++ ++typedef struct PK11_DIGEST_st ++ { ++ enum pk11_digest_id id; ++ int nid; ++ CK_MECHANISM_TYPE mech_type; ++ } PK11_DIGEST; ++ ++static PK11_DIGEST digests[] = ++ { ++ {PK11_MD5, NID_md5, CKM_MD5, }, ++ {PK11_SHA1, NID_sha1, CKM_SHA_1, }, ++ {PK11_SHA224, NID_sha224, CKM_SHA224, }, ++ {PK11_SHA256, NID_sha256, CKM_SHA256, }, ++ {PK11_SHA384, NID_sha384, CKM_SHA384, }, ++ {PK11_SHA512, NID_sha512, CKM_SHA512, }, ++ {0, NID_undef, 0xFFFF, }, ++ }; ++ ++/* ++ * Structure to be used for the cipher_data/md_data in ++ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same pk11 ++ * session in multiple cipher_update calls ++ */ ++typedef struct PK11_CIPHER_STATE_st ++ { ++ PK11_SESSION *sp; ++ } PK11_CIPHER_STATE; ++ ++ ++/* ++ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets ++ * called when libcrypto requests a cipher NID. ++ * ++ * Note how the PK11_CIPHER_STATE is used here. ++ */ ++ ++/* DES CBC EVP */ ++static const EVP_CIPHER pk11_des_cbc = ++ { ++ NID_des_cbc, ++ 8, 8, 8, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++/* 3DES CBC EVP */ ++static const EVP_CIPHER pk11_3des_cbc = ++ { ++ NID_des_ede3_cbc, ++ 8, 24, 8, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++/* ++ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and ++ * get_asn1_parameters fields are set to NULL. ++ */ ++static const EVP_CIPHER pk11_des_ecb = ++ { ++ NID_des_ecb, ++ 8, 8, 8, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_3des_ecb = ++ { ++ NID_des_ede3_ecb, ++ 8, 24, 8, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++ ++static const EVP_CIPHER pk11_aes_128_cbc = ++ { ++ NID_aes_128_cbc, ++ 16, 16, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_aes_192_cbc = ++ { ++ NID_aes_192_cbc, ++ 16, 24, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_aes_256_cbc = ++ { ++ NID_aes_256_cbc, ++ 16, 32, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++/* ++ * ECB modes don't use IV so that's why set_asn1_parameters and ++ * get_asn1_parameters are set to NULL. ++ */ ++static const EVP_CIPHER pk11_aes_128_ecb = ++ { ++ NID_aes_128_ecb, ++ 16, 16, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_aes_192_ecb = ++ { ++ NID_aes_192_ecb, ++ 16, 24, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_aes_256_ecb = ++ { ++ NID_aes_256_ecb, ++ 16, 32, 0, ++ EVP_CIPH_ECB_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++#ifdef SOLARIS_AES_CTR ++/* ++ * NID_undef's will be changed to the AES counter mode NIDs as soon they are ++ * created in pk11_library_init(). Note that the need to change these structures ++ * is the reason why we don't define them with the const keyword. ++ */ ++static EVP_CIPHER pk11_aes_128_ctr = ++ { ++ NID_undef, ++ 16, 16, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++static EVP_CIPHER pk11_aes_192_ctr = ++ { ++ NID_undef, ++ 16, 24, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++static EVP_CIPHER pk11_aes_256_ctr = ++ { ++ NID_undef, ++ 16, 32, 16, ++ EVP_CIPH_CBC_MODE, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++#endif /* SOLARIS_AES_CTR */ ++ ++static const EVP_CIPHER pk11_bf_cbc = ++ { ++ NID_bf_cbc, ++ 8, 16, 8, ++ EVP_CIPH_VARIABLE_LENGTH, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ EVP_CIPHER_set_asn1_iv, ++ EVP_CIPHER_get_asn1_iv, ++ NULL ++ }; ++ ++static const EVP_CIPHER pk11_rc4 = ++ { ++ NID_rc4, ++ 1, 16, 0, ++ EVP_CIPH_VARIABLE_LENGTH, ++ pk11_cipher_init, ++ pk11_cipher_do_cipher, ++ pk11_cipher_cleanup, ++ sizeof (PK11_CIPHER_STATE), ++ NULL, ++ NULL, ++ NULL ++ }; ++ ++static const EVP_MD pk11_md5 = ++ { ++ NID_md5, ++ NID_md5WithRSAEncryption, ++ MD5_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ MD5_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++static const EVP_MD pk11_sha1 = ++ { ++ NID_sha1, ++ NID_sha1WithRSAEncryption, ++ SHA_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++static const EVP_MD pk11_sha224 = ++ { ++ NID_sha224, ++ NID_sha224WithRSAEncryption, ++ SHA224_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ /* SHA-224 uses the same cblock size as SHA-256 */ ++ SHA256_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++static const EVP_MD pk11_sha256 = ++ { ++ NID_sha256, ++ NID_sha256WithRSAEncryption, ++ SHA256_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA256_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++static const EVP_MD pk11_sha384 = ++ { ++ NID_sha384, ++ NID_sha384WithRSAEncryption, ++ SHA384_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ /* SHA-384 uses the same cblock size as SHA-512 */ ++ SHA512_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++static const EVP_MD pk11_sha512 = ++ { ++ NID_sha512, ++ NID_sha512WithRSAEncryption, ++ SHA512_DIGEST_LENGTH, ++ 0, ++ pk11_digest_init, ++ pk11_digest_update, ++ pk11_digest_final, ++ pk11_digest_copy, ++ pk11_digest_cleanup, ++ EVP_PKEY_RSA_method, ++ SHA512_CBLOCK, ++ sizeof (PK11_CIPHER_STATE), ++ }; ++ ++/* ++ * Initialization function. Sets up various PKCS#11 library components. ++ * The definitions for control commands specific to this engine ++ */ ++#define PK11_CMD_SO_PATH ENGINE_CMD_BASE ++static const ENGINE_CMD_DEFN pk11_cmd_defns[] = ++ { ++ { ++ PK11_CMD_SO_PATH, ++ "SO_PATH", ++ "Specifies the path to the 'pkcs#11' shared library", ++ ENGINE_CMD_FLAG_STRING ++ }, ++ {0, NULL, NULL, 0} ++ }; ++ ++ ++static RAND_METHOD pk11_random = ++ { ++ pk11_rand_seed, ++ pk11_rand_bytes, ++ pk11_rand_cleanup, ++ pk11_rand_add, ++ pk11_rand_bytes, ++ pk11_rand_status ++ }; ++ ++ ++/* Constants used when creating the ENGINE */ ++static const char *engine_pk11_id = "pkcs11"; ++static const char *engine_pk11_name = "PKCS #11 engine support"; ++ ++CK_FUNCTION_LIST_PTR pFuncList = NULL; ++static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList"; ++ ++/* ++ * This is a static string constant for the DSO file name and the function ++ * symbol names to bind to. We set it in the Configure script based on whether ++ * this is 32 or 64 bit build. ++ */ ++static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION; ++ ++static CK_BBOOL true = TRUE; ++static CK_BBOOL false = FALSE; ++/* Needed in hw_pk11_pub.c as well so that's why it is not static. */ ++CK_SLOT_ID pubkey_SLOTID = 0; ++static CK_SLOT_ID rand_SLOTID = 0; ++static CK_SLOT_ID SLOTID = 0; ++static CK_BBOOL pk11_library_initialized = FALSE; ++static CK_BBOOL pk11_atfork_initialized = FALSE; ++static int pk11_pid = 0; ++ ++static DSO *pk11_dso = NULL; ++ ++/* allocate and initialize all locks used by the engine itself */ ++static int pk11_init_all_locks(void) ++ { ++ int type; ++ ++#ifndef OPENSSL_NO_RSA ++ find_lock[OP_RSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_RSA] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_RSA], NULL); ++#endif /* OPENSSL_NO_RSA */ ++ ++ if ((uri_lock = OPENSSL_malloc(sizeof (pthread_mutex_t))) == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(uri_lock, NULL); ++ ++#ifndef OPENSSL_NO_DSA ++ find_lock[OP_DSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_DSA] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_DSA], NULL); ++#endif /* OPENSSL_NO_DSA */ ++ ++#ifndef OPENSSL_NO_DH ++ find_lock[OP_DH] = OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (find_lock[OP_DH] == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(find_lock[OP_DH], NULL); ++#endif /* OPENSSL_NO_DH */ ++ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ session_cache[type].lock = ++ OPENSSL_malloc(sizeof (pthread_mutex_t)); ++ if (session_cache[type].lock == NULL) ++ goto malloc_err; ++ (void) pthread_mutex_init(session_cache[type].lock, NULL); ++ } ++ ++ return (1); ++ ++malloc_err: ++ pk11_free_all_locks(); ++ PK11err(PK11_F_INIT_ALL_LOCKS, PK11_R_MALLOC_FAILURE); ++ return (0); ++ } ++ ++static void pk11_free_all_locks(void) ++ { ++ int type; ++ ++#ifndef OPENSSL_NO_RSA ++ if (find_lock[OP_RSA] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_RSA]); ++ OPENSSL_free(find_lock[OP_RSA]); ++ find_lock[OP_RSA] = NULL; ++ } ++#endif /* OPENSSL_NO_RSA */ ++#ifndef OPENSSL_NO_DSA ++ if (find_lock[OP_DSA] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_DSA]); ++ OPENSSL_free(find_lock[OP_DSA]); ++ find_lock[OP_DSA] = NULL; ++ } ++#endif /* OPENSSL_NO_DSA */ ++#ifndef OPENSSL_NO_DH ++ if (find_lock[OP_DH] != NULL) ++ { ++ (void) pthread_mutex_destroy(find_lock[OP_DH]); ++ OPENSSL_free(find_lock[OP_DH]); ++ find_lock[OP_DH] = NULL; ++ } ++#endif /* OPENSSL_NO_DH */ ++ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ if (session_cache[type].lock != NULL) ++ { ++ (void) pthread_mutex_destroy(session_cache[type].lock); ++ OPENSSL_free(session_cache[type].lock); ++ session_cache[type].lock = NULL; ++ } ++ } ++ } ++ ++/* ++ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support. ++ */ ++static int bind_pk11(ENGINE *e) ++ { ++#ifndef OPENSSL_NO_RSA ++ const RSA_METHOD *rsa = NULL; ++ RSA_METHOD *pk11_rsa = PK11_RSA(); ++#endif /* OPENSSL_NO_RSA */ ++ if (!pk11_library_initialized) ++ if (!pk11_library_init(e)) ++ return (0); ++ ++ if (!ENGINE_set_id(e, engine_pk11_id) || ++ !ENGINE_set_name(e, engine_pk11_name) || ++ !ENGINE_set_ciphers(e, pk11_engine_ciphers) || ++ !ENGINE_set_digests(e, pk11_engine_digests)) ++ return (0); ++#ifndef OPENSSL_NO_RSA ++ if (pk11_have_rsa == CK_TRUE) ++ { ++ if (!ENGINE_set_RSA(e, PK11_RSA()) || ++ !ENGINE_set_load_privkey_function(e, pk11_load_privkey) || ++ !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey)) ++ return (0); ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered RSA\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ } ++#endif /* OPENSSL_NO_RSA */ ++#ifndef OPENSSL_NO_DSA ++ if (pk11_have_dsa == CK_TRUE) ++ { ++ if (!ENGINE_set_DSA(e, PK11_DSA())) ++ return (0); ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered DSA\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ } ++#endif /* OPENSSL_NO_DSA */ ++#ifndef OPENSSL_NO_DH ++ if (pk11_have_dh == CK_TRUE) ++ { ++ if (!ENGINE_set_DH(e, PK11_DH())) ++ return (0); ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered DH\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ } ++#endif /* OPENSSL_NO_DH */ ++ if (pk11_have_random) ++ { ++ if (!ENGINE_set_RAND(e, &pk11_random)) ++ return (0); ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: registered random\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ } ++ if (!ENGINE_set_init_function(e, pk11_init) || ++ !ENGINE_set_destroy_function(e, pk11_destroy) || ++ !ENGINE_set_finish_function(e, pk11_finish) || ++ !ENGINE_set_ctrl_function(e, pk11_ctrl) || ++ !ENGINE_set_cmd_defns(e, pk11_cmd_defns)) ++ return (0); ++ ++/* ++ * Apache calls OpenSSL function RSA_blinding_on() once during startup ++ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp ++ * here, we wire it back to the OpenSSL software implementation. ++ * Since it is used only once, performance is not a concern. ++ */ ++#ifndef OPENSSL_NO_RSA ++ rsa = RSA_PKCS1_SSLeay(); ++ pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp; ++ pk11_rsa->bn_mod_exp = rsa->bn_mod_exp; ++#endif /* OPENSSL_NO_RSA */ ++ ++ /* Ensure the pk11 error handling is set up */ ++ ERR_load_pk11_strings(); ++ ++ return (1); ++ } ++ ++/* Dynamic engine support is disabled at a higher level for Solaris */ ++#ifdef ENGINE_DYNAMIC_SUPPORT ++static int bind_helper(ENGINE *e, const char *id) ++ { ++ if (id && (strcmp(id, engine_pk11_id) != 0)) ++ return (0); ++ ++ if (!bind_pk11(e)) ++ return (0); ++ ++ return (1); ++ } ++ ++IMPLEMENT_DYNAMIC_CHECK_FN() ++IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) ++ ++#else ++static ENGINE *engine_pk11(void) ++ { ++ ENGINE *ret = ENGINE_new(); ++ ++ if (!ret) ++ return (NULL); ++ ++ if (!bind_pk11(ret)) ++ { ++ ENGINE_free(ret); ++ return (NULL); ++ } ++ ++ return (ret); ++ } ++ ++void ++ENGINE_load_pk11(void) ++ { ++ ENGINE *e_pk11 = NULL; ++ ++ /* ++ * Do not use dynamic PKCS#11 library on Solaris due to ++ * security reasons. We will link it in statically. ++ */ ++ /* Attempt to load PKCS#11 library */ ++ if (!pk11_dso) ++ pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0); ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE); ++ return; ++ } ++ ++ e_pk11 = engine_pk11(); ++ if (!e_pk11) ++ { ++ DSO_free(pk11_dso); ++ pk11_dso = NULL; ++ return; ++ } ++ ++ /* ++ * At this point, the pk11 shared library is either dynamically ++ * loaded or statically linked in. So, initialize the pk11 ++ * library before calling ENGINE_set_default since the latter ++ * needs cipher and digest algorithm information ++ */ ++ if (!pk11_library_init(e_pk11)) ++ { ++ DSO_free(pk11_dso); ++ pk11_dso = NULL; ++ ENGINE_free(e_pk11); ++ return; ++ } ++ ++ ENGINE_add(e_pk11); ++ ++ ENGINE_free(e_pk11); ++ ERR_clear_error(); ++ } ++#endif /* ENGINE_DYNAMIC_SUPPORT */ ++ ++/* ++ * These are the static string constants for the DSO file name and ++ * the function symbol names to bind to. ++ */ ++static const char *PK11_LIBNAME = NULL; ++ ++static const char *get_PK11_LIBNAME(void) ++ { ++ if (PK11_LIBNAME) ++ return (PK11_LIBNAME); ++ ++ return (def_PK11_LIBNAME); ++ } ++ ++static void free_PK11_LIBNAME(void) ++ { ++ if (PK11_LIBNAME) ++ OPENSSL_free((void*)PK11_LIBNAME); ++ ++ PK11_LIBNAME = NULL; ++ } ++ ++static long set_PK11_LIBNAME(const char *name) ++ { ++ free_PK11_LIBNAME(); ++ ++ return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0); ++ } ++ ++/* acquire all engine specific mutexes before fork */ ++static void pk11_fork_prepare(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ LOCK_OBJSTORE(OP_RSA); ++ LOCK_OBJSTORE(OP_DSA); ++ LOCK_OBJSTORE(OP_DH); ++ (void) pthread_mutex_lock(uri_lock); ++ for (i = 0; i < OP_MAX; i++) ++ { ++ (void) pthread_mutex_lock(session_cache[i].lock); ++ } ++ } ++ ++/* release all engine specific mutexes */ ++static void pk11_fork_parent(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ for (i = OP_MAX - 1; i >= 0; i--) ++ { ++ (void) pthread_mutex_unlock(session_cache[i].lock); ++ } ++ UNLOCK_OBJSTORE(OP_DH); ++ UNLOCK_OBJSTORE(OP_DSA); ++ UNLOCK_OBJSTORE(OP_RSA); ++ (void) pthread_mutex_unlock(uri_lock); ++ } ++ ++/* ++ * same situation as in parent - we need to unlock all locks to make them ++ * accessible to all threads. ++ */ ++static void pk11_fork_child(void) ++ { ++ int i; ++ ++ if (!pk11_library_initialized) ++ return; ++ ++ for (i = OP_MAX - 1; i >= 0; i--) ++ { ++ (void) pthread_mutex_unlock(session_cache[i].lock); ++ } ++ UNLOCK_OBJSTORE(OP_DH); ++ UNLOCK_OBJSTORE(OP_DSA); ++ UNLOCK_OBJSTORE(OP_RSA); ++ (void) pthread_mutex_unlock(uri_lock); ++ } ++ ++/* Initialization function for the pk11 engine */ ++static int pk11_init(ENGINE *e) ++{ ++ return (pk11_library_init(e)); ++} ++ ++/* ++ * Initialization function. Sets up various PKCS#11 library components. ++ * It selects a slot based on predefined critiera. In the process, it also ++ * count how many ciphers and digests to support. Since the cipher and ++ * digest information is needed when setting default engine, this function ++ * needs to be called before calling ENGINE_set_default. ++ */ ++/* ARGSUSED */ ++static int pk11_library_init(ENGINE *e) ++ { ++ CK_C_GetFunctionList p; ++ CK_RV rv = CKR_OK; ++ CK_INFO info; ++ CK_ULONG ul_state_len; ++ int any_slot_found; ++ int i; ++ ++ /* ++ * pk11_library_initialized is set to 0 in pk11_finish() which is called ++ * from ENGINE_finish(). However, if there is still at least one ++ * existing functional reference to the engine (see engine(3) for more ++ * information), pk11_finish() is skipped. For example, this can happen ++ * if an application forgets to clear one cipher context. In case of a ++ * fork() when the application is finishing the engine so that it can be ++ * reinitialized in the child, forgotten functional reference causes ++ * pk11_library_initialized to stay 1. In that case we need the PID ++ * check so that we properly initialize the engine again. ++ */ ++ if (pk11_library_initialized) ++ { ++ if (pk11_pid == getpid()) ++ { ++ return (1); ++ } ++ else ++ { ++ global_session = CK_INVALID_HANDLE; ++ /* ++ * free the locks first to prevent memory leak in case ++ * the application calls fork() without finishing the ++ * engine first. ++ */ ++ pk11_free_all_locks(); ++ } ++ } ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ ++#ifdef SOLARIS_AES_CTR ++ /* ++ * We must do this before we start working with slots since we need all ++ * NIDs there. ++ */ ++ if (pk11_add_aes_ctr_NIDs() == 0) ++ goto err; ++#endif /* SOLARIS_AES_CTR */ ++ ++#ifdef SOLARIS_HW_SLOT_SELECTION ++ if (check_hw_mechanisms() == 0) ++ goto err; ++#endif /* SOLARIS_HW_SLOT_SELECTION */ ++ ++ /* get the C_GetFunctionList function from the loaded library */ ++ p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, ++ PK11_GET_FUNCTION_LIST); ++ if (!p) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ ++ /* get the full function list from the loaded library */ ++ rv = p(&pFuncList); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv); ++ goto err; ++ } ++ ++ rv = pFuncList->C_Initialize(NULL_PTR); ++ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv); ++ goto err; ++ } ++ ++ rv = pFuncList->C_GetInfo(&info); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv); ++ goto err; ++ } ++ ++ if (pk11_choose_slots(&any_slot_found) == 0) ++ goto err; ++ ++ /* ++ * The library we use, set in def_PK11_LIBNAME, may not offer any ++ * slot(s). In that case, we must not proceed but we must not return an ++ * error. The reason is that applications that try to set up the PKCS#11 ++ * engine don't exit on error during the engine initialization just ++ * because no slot was present. ++ */ ++ if (any_slot_found == 0) ++ return (1); ++ ++ if (global_session == CK_INVALID_HANDLE) ++ { ++ /* Open the global_session for the new process */ ++ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &global_session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_LIBRARY_INIT, ++ PK11_R_OPENSESSION, rv); ++ goto err; ++ } ++ } ++ ++ /* ++ * Disable digest if C_GetOperationState is not supported since ++ * this function is required by OpenSSL digest copy function ++ */ ++ if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len) ++ == CKR_FUNCTION_NOT_SUPPORTED) { ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: C_GetOperationState() not supported, " ++ "setting digest_count to 0\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ digest_count = 0; ++ } ++ ++ pk11_library_initialized = TRUE; ++ pk11_pid = getpid(); ++ /* ++ * if initialization of the locks fails pk11_init_all_locks() ++ * will do the cleanup. ++ */ ++ if (!pk11_init_all_locks()) ++ goto err; ++ for (i = 0; i < OP_MAX; i++) ++ session_cache[i].head = NULL; ++ /* ++ * initialize active lists. We only use active lists ++ * for asymmetric ciphers. ++ */ ++ for (i = 0; i < OP_MAX; i++) ++ active_list[i] = NULL; ++ ++ if (!pk11_atfork_initialized) ++ { ++ if (pthread_atfork(pk11_fork_prepare, pk11_fork_parent, ++ pk11_fork_child) != 0) ++ { ++ PK11err(PK11_F_LIBRARY_INIT, PK11_R_ATFORK_FAILED); ++ goto err; ++ } ++ pk11_atfork_initialized = TRUE; ++ } ++ ++ return (1); ++ ++err: ++ return (0); ++ } ++ ++/* Destructor (complements the "ENGINE_pk11()" constructor) */ ++/* ARGSUSED */ ++static int pk11_destroy(ENGINE *e) ++ { ++ free_PK11_LIBNAME(); ++ ERR_unload_pk11_strings(); ++ return (1); ++ } ++ ++/* ++ * Termination function to clean up the session, the token, and the pk11 ++ * library. ++ */ ++/* ARGSUSED */ ++static int pk11_finish(ENGINE *e) ++ { ++ int i; ++ ++ if (pk11_dso == NULL) ++ { ++ PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED); ++ goto err; ++ } ++ ++ OPENSSL_assert(pFuncList != NULL); ++ ++ if (pk11_free_all_sessions() == 0) ++ goto err; ++ ++ /* free all active lists */ ++ for (i = 0; i < OP_MAX; i++) ++ pk11_free_active_list(i); ++ ++ pFuncList->C_CloseSession(global_session); ++ global_session = CK_INVALID_HANDLE; ++ ++ /* ++ * Since we are part of a library (libcrypto.so), calling this function ++ * may have side-effects. ++ */ ++#if 0 ++ pFuncList->C_Finalize(NULL); ++#endif ++ ++ if (!DSO_free(pk11_dso)) ++ { ++ PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE); ++ goto err; ++ } ++ pk11_dso = NULL; ++ pFuncList = NULL; ++ pk11_library_initialized = FALSE; ++ pk11_pid = 0; ++ /* ++ * There is no way how to unregister atfork handlers (other than ++ * unloading the library) so we just free the locks. For this reason ++ * the atfork handlers check if the engine is initialized and bail out ++ * immediately if not. This is necessary in case a process finishes ++ * the engine before calling fork(). ++ */ ++ pk11_free_all_locks(); ++ ++ return (1); ++ ++err: ++ return (0); ++ } ++ ++/* Standard engine interface function to set the dynamic library path */ ++/* ARGSUSED */ ++static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) ++ { ++ int initialized = ((pk11_dso == NULL) ? 0 : 1); ++ ++ switch (cmd) ++ { ++ case PK11_CMD_SO_PATH: ++ if (p == NULL) ++ { ++ PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER); ++ return (0); ++ } ++ ++ if (initialized) ++ { ++ PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED); ++ return (0); ++ } ++ ++ return (set_PK11_LIBNAME((const char *)p)); ++ default: ++ break; ++ } ++ ++ PK11err(PK11_F_CTRL, PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED); ++ ++ return (0); ++ } ++ ++ ++/* Required function by the engine random interface. It does nothing here */ ++static void pk11_rand_cleanup(void) ++ { ++ return; ++ } ++ ++/* ARGSUSED */ ++static void pk11_rand_add(const void *buf, int num, double add) ++ { ++ PK11_SESSION *sp; ++ ++ if ((sp = pk11_get_session(OP_RAND)) == NULL) ++ return; ++ ++ /* ++ * Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since ++ * the calling functions do not care anyway ++ */ ++ pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num); ++ pk11_return_session(sp, OP_RAND); ++ ++ return; ++ } ++ ++static void pk11_rand_seed(const void *buf, int num) ++ { ++ pk11_rand_add(buf, num, 0); ++ } ++ ++static int pk11_rand_bytes(unsigned char *buf, int num) ++ { ++ CK_RV rv; ++ PK11_SESSION *sp; ++ ++ if ((sp = pk11_get_session(OP_RAND)) == NULL) ++ return (0); ++ ++ rv = pFuncList->C_GenerateRandom(sp->session, buf, num); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv); ++ pk11_return_session(sp, OP_RAND); ++ return (0); ++ } ++ ++ pk11_return_session(sp, OP_RAND); ++ return (1); ++ } ++ ++/* Required function by the engine random interface. It does nothing here */ ++static int pk11_rand_status(void) ++ { ++ return (1); ++ } ++ ++/* Free all BIGNUM structures from PK11_SESSION. */ ++static void pk11_free_nums(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ switch (optype) ++ { ++#ifndef OPENSSL_NO_RSA ++ case OP_RSA: ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ if (sp->opdata_rsa_d_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_d_num); ++ sp->opdata_rsa_d_num = NULL; ++ } ++ break; ++#endif ++#ifndef OPENSSL_NO_DSA ++ case OP_DSA: ++ if (sp->opdata_dsa_pub_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_pub_num); ++ sp->opdata_dsa_pub_num = NULL; ++ } ++ if (sp->opdata_dsa_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_priv_num); ++ sp->opdata_dsa_priv_num = NULL; ++ } ++ break; ++#endif ++#ifndef OPENSSL_NO_DH ++ case OP_DH: ++ if (sp->opdata_dh_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dh_priv_num); ++ sp->opdata_dh_priv_num = NULL; ++ } ++ break; ++#endif ++ default: ++ break; ++ } ++ } ++ ++/* ++ * Get new PK11_SESSION structure ready for use. Every process must have ++ * its own freelist of PK11_SESSION structures so handle fork() here ++ * by destroying the old and creating new freelist. ++ * The returned PK11_SESSION structure is disconnected from the freelist. ++ */ ++PK11_SESSION * ++pk11_get_session(PK11_OPTYPE optype) ++ { ++ PK11_SESSION *sp = NULL, *sp1, *freelist; ++ pthread_mutex_t *freelist_lock; ++ static pid_t pid = 0; ++ pid_t new_pid; ++ CK_RV rv; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_GET_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (NULL); ++ } ++ (void) pthread_mutex_lock(freelist_lock); ++ ++ /* ++ * Will use it to find out if we forked. We cannot use the PID field in ++ * the session structure because we could get a newly allocated session ++ * here, with no PID information. ++ */ ++ if (pid == 0) ++ pid = getpid(); ++ ++ freelist = session_cache[optype].head; ++ sp = freelist; ++ ++ /* ++ * If the free list is empty, allocate new unitialized (filled ++ * with zeroes) PK11_SESSION structure otherwise return first ++ * structure from the freelist. ++ */ ++ if (sp == NULL) ++ { ++ if ((sp = OPENSSL_malloc(sizeof (PK11_SESSION))) == NULL) ++ { ++ PK11err(PK11_F_GET_SESSION, ++ PK11_R_MALLOC_FAILURE); ++ goto err; ++ } ++ (void) memset(sp, 0, sizeof (PK11_SESSION)); ++ ++ /* ++ * It is a new session so it will look like a cache miss to the ++ * code below. So, we must not try to to destroy its members so ++ * mark them as unused. ++ */ ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ } ++ else ++ freelist = sp->next; ++ ++ /* ++ * Check whether we have forked. In that case, we must get rid of all ++ * inherited sessions and start allocating new ones. ++ */ ++ if (pid != (new_pid = getpid())) ++ { ++ pid = new_pid; ++ ++ /* ++ * We are a new process and thus need to free any inherited ++ * PK11_SESSION objects aside from the first session (sp) which ++ * is the only PK11_SESSION structure we will reuse (for the ++ * head of the list). ++ */ ++ while ((sp1 = freelist) != NULL) ++ { ++ freelist = sp1->next; ++ /* ++ * NOTE: we do not want to call pk11_free_all_sessions() ++ * here because it would close underlying PKCS#11 ++ * sessions and destroy all objects. ++ */ ++ pk11_free_nums(sp1, optype); ++ OPENSSL_free(sp1); ++ } ++ ++ /* we have to free the active list as well. */ ++ pk11_free_active_list(optype); ++ ++ /* Initialize the process */ ++ rv = pFuncList->C_Initialize(NULL_PTR); ++ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) ++ { ++ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE, ++ rv); ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ ++ /* ++ * Choose slot here since the slot table is different on this ++ * process. If we are here then we must have found at least one ++ * usable slot before so we don't need to check any_slot_found. ++ * See pk11_library_init()'s usage of this function for more ++ * information. ++ */ ++#ifdef SOLARIS_HW_SLOT_SELECTION ++ if (check_hw_mechanisms() == 0) ++ goto err; ++#endif /* SOLARIS_HW_SLOT_SELECTION */ ++ if (pk11_choose_slots(NULL) == 0) ++ goto err; ++ ++ /* Open the global_session for the new process */ ++ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &global_session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION, ++ rv); ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ ++ /* ++ * It is an inherited session from our parent so it needs ++ * re-initialization. ++ */ ++ if (pk11_setup_session(sp, optype) == 0) ++ { ++ OPENSSL_free(sp); ++ sp = NULL; ++ goto err; ++ } ++ if (pk11_token_relogin(sp->session) == 0) ++ { ++ /* ++ * We will keep the session in the cache list and let ++ * the caller cope with the situation. ++ */ ++ freelist = sp; ++ sp = NULL; ++ goto err; ++ } ++ } ++ ++ if (sp->pid == 0) ++ { ++ /* It is a new session and needs initialization. */ ++ if (pk11_setup_session(sp, optype) == 0) ++ { ++ OPENSSL_free(sp); ++ sp = NULL; ++ } ++ } ++ ++ /* set new head for the list of PK11_SESSION objects */ ++ session_cache[optype].head = freelist; ++ ++err: ++ if (sp != NULL) ++ sp->next = NULL; ++ ++ (void) pthread_mutex_unlock(freelist_lock); ++ ++ return (sp); ++ } ++ ++ ++void ++pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ pthread_mutex_t *freelist_lock; ++ PK11_SESSION *freelist; ++ ++ /* ++ * If this is a session from the parent it will be taken care of and ++ * freed in pk11_get_session() as part of the post-fork clean up the ++ * next time we will ask for a new session. ++ */ ++ if (sp == NULL || sp->pid != getpid()) ++ return; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_RETURN_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return; ++ } ++ ++ (void) pthread_mutex_lock(freelist_lock); ++ freelist = session_cache[optype].head; ++ sp->next = freelist; ++ session_cache[optype].head = sp; ++ (void) pthread_mutex_unlock(freelist_lock); ++ } ++ ++ ++/* Destroy all objects. This function is called when the engine is finished */ ++static int pk11_free_all_sessions() ++ { ++ int ret = 1; ++ int type; ++ ++#ifndef OPENSSL_NO_RSA ++ (void) pk11_destroy_rsa_key_objects(NULL); ++#endif /* OPENSSL_NO_RSA */ ++#ifndef OPENSSL_NO_DSA ++ (void) pk11_destroy_dsa_key_objects(NULL); ++#endif /* OPENSSL_NO_DSA */ ++#ifndef OPENSSL_NO_DH ++ (void) pk11_destroy_dh_key_objects(NULL); ++#endif /* OPENSSL_NO_DH */ ++ (void) pk11_destroy_cipher_key_objects(NULL); ++ ++ /* ++ * We try to release as much as we can but any error means that we will ++ * return 0 on exit. ++ */ ++ for (type = 0; type < OP_MAX; type++) ++ { ++ if (pk11_free_session_list(type) == 0) ++ ret = 0; ++ } ++ ++ return (ret); ++ } ++ ++/* ++ * Destroy session structures from the linked list specified. Free as many ++ * sessions as possible but any failure in C_CloseSession() means that we ++ * return an error on return. ++ */ ++static int pk11_free_session_list(PK11_OPTYPE optype) ++ { ++ CK_RV rv; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *freelist = NULL; ++ pid_t mypid = getpid(); ++ pthread_mutex_t *freelist_lock; ++ int ret = 1; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ case OP_RAND: ++ case OP_DIGEST: ++ case OP_CIPHER: ++ freelist_lock = session_cache[optype].lock; ++ break; ++ default: ++ PK11err(PK11_F_FREE_ALL_SESSIONS, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (0); ++ } ++ ++ (void) pthread_mutex_lock(freelist_lock); ++ freelist = session_cache[optype].head; ++ while ((sp = freelist) != NULL) ++ { ++ if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid) ++ { ++ rv = pFuncList->C_CloseSession(sp->session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, ++ PK11_R_CLOSESESSION, rv); ++ ret = 0; ++ } ++ } ++ freelist = sp->next; ++ pk11_free_nums(sp, optype); ++ OPENSSL_free(sp); ++ } ++ ++ (void) pthread_mutex_unlock(freelist_lock); ++ return (ret); ++ } ++ ++ ++static int ++pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype) ++ { ++ CK_RV rv; ++ CK_SLOT_ID myslot; ++ ++ switch (optype) ++ { ++ case OP_RSA: ++ case OP_DSA: ++ case OP_DH: ++ myslot = pubkey_SLOTID; ++ break; ++ case OP_RAND: ++ myslot = rand_SLOTID; ++ break; ++ case OP_DIGEST: ++ case OP_CIPHER: ++ myslot = SLOTID; ++ break; ++ default: ++ PK11err(PK11_F_SETUP_SESSION, ++ PK11_R_INVALID_OPERATION_TYPE); ++ return (0); ++ } ++ ++ sp->session = CK_INVALID_HANDLE; ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype); ++#endif /* DEBUG_SLOT_SELECTION */ ++ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &sp->session); ++ if (rv == CKR_CRYPTOKI_NOT_INITIALIZED) ++ { ++ /* ++ * We are probably a child process so force the ++ * reinitialize of the session ++ */ ++ pk11_library_initialized = FALSE; ++ if (!pk11_library_init(NULL)) ++ return (0); ++ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &sp->session); ++ } ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); ++ return (0); ++ } ++ ++ sp->pid = getpid(); ++ ++ switch (optype) ++ { ++#ifndef OPENSSL_NO_RSA ++ case OP_RSA: ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub = NULL; ++ sp->opdata_rsa_n_num = NULL; ++ sp->opdata_rsa_e_num = NULL; ++ sp->opdata_rsa_priv = NULL; ++ sp->opdata_rsa_d_num = NULL; ++ break; ++#endif /* OPENSSL_NO_RSA */ ++#ifndef OPENSSL_NO_DSA ++ case OP_DSA: ++ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_pub = NULL; ++ sp->opdata_dsa_pub_num = NULL; ++ sp->opdata_dsa_priv = NULL; ++ sp->opdata_dsa_priv_num = NULL; ++ break; ++#endif /* OPENSSL_NO_DSA */ ++#ifndef OPENSSL_NO_DH ++ case OP_DH: ++ sp->opdata_dh_key = CK_INVALID_HANDLE; ++ sp->opdata_dh = NULL; ++ sp->opdata_dh_priv_num = NULL; ++ break; ++#endif /* OPENSSL_NO_DH */ ++ case OP_CIPHER: ++ sp->opdata_cipher_key = CK_INVALID_HANDLE; ++ sp->opdata_encrypt = -1; ++ break; ++ } ++ ++ /* ++ * We always initialize the session as containing a non-persistent ++ * object. The key load functions set it to persistent if that is so. ++ */ ++ sp->persistent = CK_FALSE; ++ return (1); ++ } ++ ++#ifndef OPENSSL_NO_RSA ++/* Destroy RSA public key from single session. */ ++int ++pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_rsa_pub_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_pub_key, ++ ret, uselock, OP_RSA); ++ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_pub = NULL; ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++/* Destroy RSA private key from single session. */ ++int ++pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_rsa_priv_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_priv_key, ++ ret, uselock, OP_RSA); ++ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_rsa_priv = NULL; ++ if (sp->opdata_rsa_d_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_d_num); ++ sp->opdata_rsa_d_num = NULL; ++ } ++ ++ /* ++ * For the RSA key by reference code, public components 'n'/'e' ++ * are the key components we use to check for the cache hit. We ++ * must free those as well. ++ */ ++ if (sp->opdata_rsa_n_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_n_num); ++ sp->opdata_rsa_n_num = NULL; ++ } ++ if (sp->opdata_rsa_e_num != NULL) ++ { ++ BN_free(sp->opdata_rsa_e_num); ++ sp->opdata_rsa_e_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++/* ++ * Destroy RSA key object wrapper. If session is NULL, try to destroy all ++ * objects in the free list. ++ */ ++int ++pk11_destroy_rsa_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_RSA].lock); ++ local_free_session = session_cache[OP_RSA].head; ++ uselock = FALSE; ++ } ++ ++ /* ++ * go through the list of sessions and delete key objects ++ */ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_rsa_object_pub(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ if (pk11_destroy_rsa_object_priv(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++ ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_RSA].lock); ++ ++ return (ret); ++ } ++#endif /* OPENSSL_NO_RSA */ ++ ++#ifndef OPENSSL_NO_DSA ++/* Destroy DSA public key from single session. */ ++int ++pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dsa_pub_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_pub_key, ++ ret, uselock, OP_DSA); ++ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_pub = NULL; ++ if (sp->opdata_dsa_pub_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_pub_num); ++ sp->opdata_dsa_pub_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++/* Destroy DSA private key from single session. */ ++int ++pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dsa_priv_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_priv_key, ++ ret, uselock, OP_DSA); ++ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; ++ sp->opdata_dsa_priv = NULL; ++ if (sp->opdata_dsa_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dsa_priv_num); ++ sp->opdata_dsa_priv_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++/* ++ * Destroy DSA key object wrapper. If session is NULL, try to destroy all ++ * objects in the free list. ++ */ ++int ++pk11_destroy_dsa_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_DSA].lock); ++ local_free_session = session_cache[OP_DSA].head; ++ uselock = FALSE; ++ } ++ ++ /* ++ * go through the list of sessions and delete key objects ++ */ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_dsa_object_pub(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ if (pk11_destroy_dsa_object_priv(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++ ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_DSA].lock); ++ ++ return (ret); ++ } ++#endif /* OPENSSL_NO_DSA */ ++ ++#ifndef OPENSSL_NO_DH ++/* Destroy DH key from single session. */ ++int ++pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock) ++ { ++ int ret = 0; ++ ++ if (sp->opdata_dh_key != CK_INVALID_HANDLE) ++ { ++ TRY_OBJ_DESTROY(sp, sp->opdata_dh_key, ++ ret, uselock, OP_DH); ++ sp->opdata_dh_key = CK_INVALID_HANDLE; ++ sp->opdata_dh = NULL; ++ if (sp->opdata_dh_priv_num != NULL) ++ { ++ BN_free(sp->opdata_dh_priv_num); ++ sp->opdata_dh_priv_num = NULL; ++ } ++ } ++ ++ return (ret); ++ } ++ ++/* ++ * Destroy DH key object wrapper. ++ * ++ * arg0: pointer to PKCS#11 engine session structure ++ * if session is NULL, try to destroy all objects in the free list ++ */ ++int ++pk11_destroy_dh_key_objects(PK11_SESSION *session) ++ { ++ int ret = 1; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ CK_BBOOL uselock = TRUE; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_DH].lock); ++ local_free_session = session_cache[OP_DH].head; ++ uselock = FALSE; ++ } ++ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ /* ++ * Do not terminate list traversal if one of the ++ * destroy operations fails. ++ */ ++ if (pk11_destroy_dh_object(sp, uselock) == 0) ++ { ++ ret = 0; ++ continue; ++ } ++ } ++err: ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_DH].lock); ++ ++ return (ret); ++ } ++#endif /* OPENSSL_NO_DH */ ++ ++static int ++pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh, ++ CK_BBOOL persistent) ++ { ++ CK_RV rv; ++ ++ /* ++ * We never try to destroy persistent objects which are the objects ++ * stored in the keystore. Also, we always use read-only sessions so ++ * C_DestroyObject() would be returning CKR_SESSION_READ_ONLY here. ++ */ ++ if (persistent == CK_TRUE) ++ return (1); ++ ++ rv = pFuncList->C_DestroyObject(session, oh); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT, ++ rv); ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++ ++/* Symmetric ciphers and digests support functions */ ++ ++static int ++cipher_nid_to_pk11(int nid) ++ { ++ int i; ++ ++ for (i = 0; i < PK11_CIPHER_MAX; i++) ++ if (ciphers[i].nid == nid) ++ return (ciphers[i].id); ++ return (-1); ++ } ++ ++static int ++pk11_usable_ciphers(const int **nids) ++ { ++ if (cipher_count > 0) ++ *nids = cipher_nids; ++ else ++ *nids = NULL; ++ return (cipher_count); ++ } ++ ++static int ++pk11_usable_digests(const int **nids) ++ { ++ if (digest_count > 0) ++ *nids = digest_nids; ++ else ++ *nids = NULL; ++ return (digest_count); ++ } ++ ++/* ++ * Init context for encryption or decryption using a symmetric key. ++ */ ++static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher, ++ PK11_SESSION *sp, CK_MECHANISM_PTR pmech) ++ { ++ CK_RV rv; ++#ifdef SOLARIS_AES_CTR ++ CK_AES_CTR_PARAMS ctr_params; ++#endif /* SOLARIS_AES_CTR */ ++ ++ /* ++ * We expect pmech->mechanism to be already set and ++ * pParameter/ulParameterLen initialized to NULL/0 before ++ * pk11_init_symetric() is called. ++ */ ++ OPENSSL_assert(pmech->mechanism != NULL); ++ OPENSSL_assert(pmech->pParameter == NULL); ++ OPENSSL_assert(pmech->ulParameterLen == 0); ++ ++#ifdef SOLARIS_AES_CTR ++ if (ctx->cipher->nid == NID_aes_128_ctr || ++ ctx->cipher->nid == NID_aes_192_ctr || ++ ctx->cipher->nid == NID_aes_256_ctr) ++ { ++ pmech->pParameter = (void *)(&ctr_params); ++ pmech->ulParameterLen = sizeof (ctr_params); ++ /* ++ * For now, we are limited to the fixed length of the counter, ++ * it covers the whole counter block. That's what RFC 4344 ++ * needs. For more information on internal structure of the ++ * counter block, see RFC 3686. If needed in the future, we can ++ * add code so that the counter length can be set via ++ * ENGINE_ctrl() function. ++ */ ++ ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8; ++ OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE); ++ (void) memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE); ++ } ++ else ++#endif /* SOLARIS_AES_CTR */ ++ { ++ if (pcipher->iv_len > 0) ++ { ++ pmech->pParameter = (void *)ctx->iv; ++ pmech->ulParameterLen = pcipher->iv_len; ++ } ++ } ++ ++ /* if we get here, the encryption needs to be reinitialized */ ++ if (ctx->encrypt) ++ rv = pFuncList->C_EncryptInit(sp->session, pmech, ++ sp->opdata_cipher_key); ++ else ++ rv = pFuncList->C_DecryptInit(sp->session, pmech, ++ sp->opdata_cipher_key); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ? ++ PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv); ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++/* ARGSUSED */ ++static int ++pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, ++ const unsigned char *iv, int enc) ++ { ++ CK_MECHANISM mech; ++ int index; ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; ++ PK11_SESSION *sp; ++ PK11_CIPHER *p_ciph_table_row; ++ ++ state->sp = NULL; ++ ++ index = cipher_nid_to_pk11(ctx->cipher->nid); ++ if (index < 0 || index >= PK11_CIPHER_MAX) ++ return (0); ++ ++ p_ciph_table_row = &ciphers[index]; ++ /* ++ * iv_len in the ctx->cipher structure is the maximum IV length for the ++ * current cipher and it must be less or equal to the IV length in our ++ * ciphers table. The key length must be in the allowed interval. From ++ * all cipher modes that the PKCS#11 engine supports only RC4 allows a ++ * key length to be in some range, all other NIDs have a precise key ++ * length. Every application can define its own EVP functions so this ++ * code serves as a sanity check. ++ * ++ * Note that the reason why the IV length in ctx->cipher might be ++ * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs ++ * macro to define functions that return EVP structures for all DES ++ * modes. So, even ECB modes get 8 byte IV. ++ */ ++ if (ctx->cipher->iv_len < p_ciph_table_row->iv_len || ++ ctx->key_len < p_ciph_table_row->min_key_len || ++ ctx->key_len > p_ciph_table_row->max_key_len) { ++ PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM); ++ return (0); ++ } ++ ++ if ((sp = pk11_get_session(OP_CIPHER)) == NULL) ++ return (0); ++ ++ /* if applicable, the mechanism parameter is used for IV */ ++ mech.mechanism = p_ciph_table_row->mech_type; ++ mech.pParameter = NULL; ++ mech.ulParameterLen = 0; ++ ++ /* The key object is destroyed here if it is not the current key. */ ++ (void) check_new_cipher_key(sp, key, ctx->key_len); ++ ++ /* ++ * If the key is the same and the encryption is also the same, then ++ * just reuse it. However, we must not forget to reinitialize the ++ * context that was finalized in pk11_cipher_cleanup(). ++ */ ++ if (sp->opdata_cipher_key != CK_INVALID_HANDLE && ++ sp->opdata_encrypt == ctx->encrypt) ++ { ++ state->sp = sp; ++ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) ++ return (0); ++ ++ return (1); ++ } ++ ++ /* ++ * Check if the key has been invalidated. If so, a new key object ++ * needs to be created. ++ */ ++ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) ++ { ++ sp->opdata_cipher_key = pk11_get_cipher_key( ++ ctx, key, p_ciph_table_row->key_type, sp); ++ } ++ ++ if (sp->opdata_encrypt != ctx->encrypt && sp->opdata_encrypt != -1) ++ { ++ /* ++ * The previous encryption/decryption is different. Need to ++ * terminate the previous * active encryption/decryption here. ++ */ ++ if (!pk11_cipher_final(sp)) ++ { ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ } ++ ++ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) ++ { ++ pk11_return_session(sp, OP_CIPHER); ++ return (0); ++ } ++ ++ /* now initialize the context with a new key */ ++ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) ++ return (0); ++ ++ sp->opdata_encrypt = ctx->encrypt; ++ state->sp = sp; ++ ++ return (1); ++ } ++ ++/* ++ * When reusing the same key in an encryption/decryption session for a ++ * decryption/encryption session, we need to close the active session ++ * and recreate a new one. Note that the key is in the global session so ++ * that it needs not be recreated. ++ * ++ * It is more appropriate to use C_En/DecryptFinish here. At the time of this ++ * development, these two functions in the PKCS#11 libraries used return ++ * unexpected errors when passing in 0 length output. It may be a good ++ * idea to try them again if performance is a problem here and fix ++ * C_En/DecryptFinial if there are bugs there causing the problem. ++ */ ++static int ++pk11_cipher_final(PK11_SESSION *sp) ++ { ++ CK_RV rv; ++ ++ rv = pFuncList->C_CloseSession(sp->session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv); ++ return (0); ++ } ++ ++ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, ++ NULL_PTR, NULL_PTR, &sp->session); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv); ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++/* ++ * An engine interface function. The calling function allocates sufficient ++ * memory for the output buffer "out" to hold the results. ++ */ ++static int ++pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, ++ const unsigned char *in, unsigned int inl) ++ { ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; ++ PK11_SESSION *sp; ++ CK_RV rv; ++ unsigned long outl = inl; ++ ++ if (state == NULL || state->sp == NULL) ++ return (0); ++ ++ sp = (PK11_SESSION *) state->sp; ++ ++ if (!inl) ++ return (1); ++ ++ /* RC4 is the only stream cipher we support */ ++ if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0) ++ return (0); ++ ++ if (ctx->encrypt) ++ { ++ rv = pFuncList->C_EncryptUpdate(sp->session, ++ (unsigned char *)in, inl, out, &outl); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, ++ PK11_R_ENCRYPTUPDATE, rv); ++ return (0); ++ } ++ } ++ else ++ { ++ rv = pFuncList->C_DecryptUpdate(sp->session, ++ (unsigned char *)in, inl, out, &outl); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, ++ PK11_R_DECRYPTUPDATE, rv); ++ return (0); ++ } ++ } ++ ++ /* ++ * For DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always ++ * the same size of input. ++ * The application has guaranteed to call the block ciphers with ++ * correctly aligned buffers. ++ */ ++ if (inl != outl) ++ return (0); ++ ++ return (1); ++ } ++ ++/* ++ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal() ++ * here is the right thing because in EVP_DecryptFinal_ex(), engine's ++ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but ++ * the engine can't find out that it's the finalizing call. We wouldn't ++ * necessarily have to finalize the context here since reinitializing it with ++ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness, ++ * let's do it. Some implementations might leak memory if the previously used ++ * context is initialized without finalizing it first. ++ */ ++static int ++pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx) ++ { ++ CK_RV rv; ++ CK_ULONG len = EVP_MAX_BLOCK_LENGTH; ++ CK_BYTE buf[EVP_MAX_BLOCK_LENGTH]; ++ PK11_CIPHER_STATE *state = ctx->cipher_data; ++ ++ if (state != NULL && state->sp != NULL) ++ { ++ /* ++ * We are not interested in the data here, we just need to get ++ * rid of the context. ++ */ ++ if (ctx->encrypt) ++ rv = pFuncList->C_EncryptFinal( ++ state->sp->session, buf, &len); ++ else ++ rv = pFuncList->C_DecryptFinal( ++ state->sp->session, buf, &len); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ? ++ PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv); ++ pk11_return_session(state->sp, OP_CIPHER); ++ return (0); ++ } ++ ++ pk11_return_session(state->sp, OP_CIPHER); ++ state->sp = NULL; ++ } ++ ++ return (1); ++ } ++ ++/* ++ * Registered by the ENGINE when used to find out how to deal with ++ * a particular NID in the ENGINE. This says what we'll do at the ++ * top level - note, that list is restricted by what we answer with ++ */ ++/* ARGSUSED */ ++static int ++pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, ++ const int **nids, int nid) ++ { ++ if (!cipher) ++ return (pk11_usable_ciphers(nids)); ++ ++ switch (nid) ++ { ++ case NID_des_ede3_cbc: ++ *cipher = &pk11_3des_cbc; ++ break; ++ case NID_des_cbc: ++ *cipher = &pk11_des_cbc; ++ break; ++ case NID_des_ede3_ecb: ++ *cipher = &pk11_3des_ecb; ++ break; ++ case NID_des_ecb: ++ *cipher = &pk11_des_ecb; ++ break; ++ case NID_aes_128_cbc: ++ *cipher = &pk11_aes_128_cbc; ++ break; ++ case NID_aes_192_cbc: ++ *cipher = &pk11_aes_192_cbc; ++ break; ++ case NID_aes_256_cbc: ++ *cipher = &pk11_aes_256_cbc; ++ break; ++ case NID_aes_128_ecb: ++ *cipher = &pk11_aes_128_ecb; ++ break; ++ case NID_aes_192_ecb: ++ *cipher = &pk11_aes_192_ecb; ++ break; ++ case NID_aes_256_ecb: ++ *cipher = &pk11_aes_256_ecb; ++ break; ++ case NID_bf_cbc: ++ *cipher = &pk11_bf_cbc; ++ break; ++ case NID_rc4: ++ *cipher = &pk11_rc4; ++ break; ++ default: ++#ifdef SOLARIS_AES_CTR ++ /* ++ * These can't be in separated cases because the NIDs ++ * here are not constants. ++ */ ++ if (nid == NID_aes_128_ctr) ++ *cipher = &pk11_aes_128_ctr; ++ else if (nid == NID_aes_192_ctr) ++ *cipher = &pk11_aes_192_ctr; ++ else if (nid == NID_aes_256_ctr) ++ *cipher = &pk11_aes_256_ctr; ++ else ++#endif /* SOLARIS_AES_CTR */ ++ *cipher = NULL; ++ break; ++ } ++ return (*cipher != NULL); ++ } ++ ++/* ARGSUSED */ ++static int ++pk11_engine_digests(ENGINE *e, const EVP_MD **digest, ++ const int **nids, int nid) ++ { ++ if (!digest) ++ return (pk11_usable_digests(nids)); ++ ++ switch (nid) ++ { ++ case NID_md5: ++ *digest = &pk11_md5; ++ break; ++ case NID_sha1: ++ *digest = &pk11_sha1; ++ break; ++ case NID_sha224: ++ *digest = &pk11_sha224; ++ break; ++ case NID_sha256: ++ *digest = &pk11_sha256; ++ break; ++ case NID_sha384: ++ *digest = &pk11_sha384; ++ break; ++ case NID_sha512: ++ *digest = &pk11_sha512; ++ break; ++ default: ++ *digest = NULL; ++ break; ++ } ++ return (*digest != NULL); ++ } ++ ++ ++/* Create a secret key object in a PKCS#11 session */ ++static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, ++ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp) ++ { ++ CK_RV rv; ++ CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE; ++ CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY; ++ CK_ULONG ul_key_attr_count = 6; ++ ++ CK_ATTRIBUTE a_key_template[] = ++ { ++ {CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)}, ++ {CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)}, ++ {CKA_TOKEN, &false, sizeof (false)}, ++ {CKA_ENCRYPT, &true, sizeof (true)}, ++ {CKA_DECRYPT, &true, sizeof (true)}, ++ {CKA_VALUE, (void*) NULL, 0}, ++ }; ++ ++ /* ++ * Create secret key object in global_session. All other sessions ++ * can use the key handles. Here is why: ++ * OpenSSL will call EncryptInit and EncryptUpdate using a secret key. ++ * It may then call DecryptInit and DecryptUpdate using the same key. ++ * To use the same key object, we need to call EncryptFinal with ++ * a 0 length message. Currently, this does not work for 3DES ++ * mechanism. To get around this problem, we close the session and ++ * then create a new session to use the same key object. When a session ++ * is closed, all the object handles will be invalid. Thus, create key ++ * objects in a global session, an individual session may be closed to ++ * terminate the active operation. ++ */ ++ CK_SESSION_HANDLE session = global_session; ++ a_key_template[0].pValue = &obj_key; ++ a_key_template[1].pValue = &key_type; ++ a_key_template[5].pValue = (void *) key; ++ a_key_template[5].ulValueLen = (unsigned long) ctx->key_len; ++ ++ rv = pFuncList->C_CreateObject(session, ++ a_key_template, ul_key_attr_count, &h_key); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT, ++ rv); ++ goto err; ++ } ++ ++ /* ++ * Save the key information used in this session. ++ * The max can be saved is PK11_KEY_LEN_MAX. ++ */ ++ sp->opdata_key_len = ctx->key_len > PK11_KEY_LEN_MAX ? ++ PK11_KEY_LEN_MAX : ctx->key_len; ++ (void) memcpy(sp->opdata_key, key, sp->opdata_key_len); ++err: ++ ++ return (h_key); ++ } ++ ++static int ++md_nid_to_pk11(int nid) ++ { ++ int i; ++ ++ for (i = 0; i < PK11_DIGEST_MAX; i++) ++ if (digests[i].nid == nid) ++ return (digests[i].id); ++ return (-1); ++ } ++ ++static int ++pk11_digest_init(EVP_MD_CTX *ctx) ++ { ++ CK_RV rv; ++ CK_MECHANISM mech; ++ int index; ++ PK11_SESSION *sp; ++ PK11_DIGEST *pdp; ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; ++ ++ state->sp = NULL; ++ ++ index = md_nid_to_pk11(ctx->digest->type); ++ if (index < 0 || index >= PK11_DIGEST_MAX) ++ return (0); ++ ++ pdp = &digests[index]; ++ if ((sp = pk11_get_session(OP_DIGEST)) == NULL) ++ return (0); ++ ++ /* at present, no parameter is needed for supported digests */ ++ mech.mechanism = pdp->mech_type; ++ mech.pParameter = NULL; ++ mech.ulParameterLen = 0; ++ ++ rv = pFuncList->C_DigestInit(sp->session, &mech); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv); ++ pk11_return_session(sp, OP_DIGEST); ++ return (0); ++ } ++ ++ state->sp = sp; ++ ++ return (1); ++ } ++ ++static int ++pk11_digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) ++ { ++ CK_RV rv; ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; ++ ++ /* 0 length message will cause a failure in C_DigestFinal */ ++ if (count == 0) ++ return (1); ++ ++ if (state == NULL || state->sp == NULL) ++ return (0); ++ ++ rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data, ++ count); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv); ++ pk11_return_session(state->sp, OP_DIGEST); ++ state->sp = NULL; ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++static int ++pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md) ++ { ++ CK_RV rv; ++ unsigned long len; ++ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; ++ len = ctx->digest->md_size; ++ ++ if (state == NULL || state->sp == NULL) ++ return (0); ++ ++ rv = pFuncList->C_DigestFinal(state->sp->session, md, &len); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv); ++ pk11_return_session(state->sp, OP_DIGEST); ++ state->sp = NULL; ++ return (0); ++ } ++ ++ if (ctx->digest->md_size != len) ++ return (0); ++ ++ /* ++ * Final is called and digest is returned, so return the session ++ * to the pool ++ */ ++ pk11_return_session(state->sp, OP_DIGEST); ++ state->sp = NULL; ++ ++ return (1); ++ } ++ ++static int ++pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) ++ { ++ CK_RV rv; ++ int ret = 0; ++ PK11_CIPHER_STATE *state, *state_to; ++ CK_BYTE_PTR pstate = NULL; ++ CK_ULONG ul_state_len; ++ ++ /* The copy-from state */ ++ state = (PK11_CIPHER_STATE *) from->md_data; ++ if (state == NULL || state->sp == NULL) ++ goto err; ++ ++ /* Initialize the copy-to state */ ++ if (!pk11_digest_init(to)) ++ goto err; ++ state_to = (PK11_CIPHER_STATE *) to->md_data; ++ ++ /* Get the size of the operation state of the copy-from session */ ++ rv = pFuncList->C_GetOperationState(state->sp->session, NULL, ++ &ul_state_len); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, ++ rv); ++ goto err; ++ } ++ if (ul_state_len == 0) ++ { ++ goto err; ++ } ++ ++ pstate = OPENSSL_malloc(ul_state_len); ++ if (pstate == NULL) ++ { ++ PK11err(PK11_F_DIGEST_COPY, PK11_R_MALLOC_FAILURE); ++ goto err; ++ } ++ ++ /* Get the operation state of the copy-from session */ ++ rv = pFuncList->C_GetOperationState(state->sp->session, pstate, ++ &ul_state_len); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, ++ rv); ++ goto err; ++ } ++ ++ /* Set the operation state of the copy-to session */ ++ rv = pFuncList->C_SetOperationState(state_to->sp->session, pstate, ++ ul_state_len, 0, 0); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_DIGEST_COPY, ++ PK11_R_SET_OPERATION_STATE, rv); ++ goto err; ++ } ++ ++ ret = 1; ++err: ++ if (pstate != NULL) ++ OPENSSL_free(pstate); ++ ++ return (ret); ++ } ++ ++/* Return any pending session state to the pool */ ++static int ++pk11_digest_cleanup(EVP_MD_CTX *ctx) ++ { ++ PK11_CIPHER_STATE *state = ctx->md_data; ++ unsigned char buf[EVP_MAX_MD_SIZE]; ++ ++ if (state != NULL && state->sp != NULL) ++ { ++ /* ++ * If state->sp is not NULL then pk11_digest_final() has not ++ * been called yet. We must call it now to free any memory ++ * that might have been allocated in the token when ++ * pk11_digest_init() was called. pk11_digest_final() ++ * will return the session to the cache. ++ */ ++ if (!pk11_digest_final(ctx, buf)) ++ return (0); ++ } ++ ++ return (1); ++ } ++ ++/* ++ * Check if the new key is the same as the key object in the session. If the key ++ * is the same, no need to create a new key object. Otherwise, the old key ++ * object needs to be destroyed and a new one will be created. Return 1 for ++ * cache hit, 0 for cache miss. Note that we must check the key length first ++ * otherwise we could end up reusing a different, longer key with the same ++ * prefix. ++ */ ++static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, ++ int key_len) ++ { ++ if (sp->opdata_key_len != key_len || ++ memcmp(sp->opdata_key, key, key_len) != 0) ++ { ++ (void) pk11_destroy_cipher_key_objects(sp); ++ return (0); ++ } ++ return (1); ++ } ++ ++/* Destroy one or more secret key objects. */ ++static int pk11_destroy_cipher_key_objects(PK11_SESSION *session) ++ { ++ int ret = 0; ++ PK11_SESSION *sp = NULL; ++ PK11_SESSION *local_free_session; ++ ++ if (session != NULL) ++ local_free_session = session; ++ else ++ { ++ (void) pthread_mutex_lock(session_cache[OP_CIPHER].lock); ++ local_free_session = session_cache[OP_CIPHER].head; ++ } ++ ++ while ((sp = local_free_session) != NULL) ++ { ++ local_free_session = sp->next; ++ ++ if (sp->opdata_cipher_key != CK_INVALID_HANDLE) ++ { ++ /* ++ * The secret key object is created in the ++ * global_session. See pk11_get_cipher_key(). ++ */ ++ if (pk11_destroy_object(global_session, ++ sp->opdata_cipher_key, CK_FALSE) == 0) ++ goto err; ++ sp->opdata_cipher_key = CK_INVALID_HANDLE; ++ } ++ } ++ ret = 1; ++err: ++ ++ if (session == NULL) ++ (void) pthread_mutex_unlock(session_cache[OP_CIPHER].lock); ++ ++ return (ret); ++ } ++ ++ ++/* ++ * Public key mechanisms optionally supported ++ * ++ * CKM_RSA_X_509 ++ * CKM_RSA_PKCS ++ * CKM_DSA ++ * ++ * The first slot that supports at least one of those mechanisms is chosen as a ++ * public key slot. ++ * ++ * Symmetric ciphers optionally supported ++ * ++ * CKM_DES3_CBC ++ * CKM_DES_CBC ++ * CKM_AES_CBC ++ * CKM_DES3_ECB ++ * CKM_DES_ECB ++ * CKM_AES_ECB ++ * CKM_AES_CTR ++ * CKM_RC4 ++ * CKM_BLOWFISH_CBC ++ * ++ * Digests optionally supported ++ * ++ * CKM_MD5 ++ * CKM_SHA_1 ++ * CKM_SHA224 ++ * CKM_SHA256 ++ * CKM_SHA384 ++ * CKM_SHA512 ++ * ++ * The output of this function is a set of global variables indicating which ++ * mechanisms from RSA, DSA, DH and RAND are present, and also two arrays of ++ * mechanisms, one for symmetric ciphers and one for digests. Also, 3 global ++ * variables carry information about which slot was chosen for (a) public key ++ * mechanisms, (b) random operations, and (c) symmetric ciphers and digests. ++ */ ++static int ++pk11_choose_slots(int *any_slot_found) ++ { ++ CK_SLOT_ID_PTR pSlotList = NULL_PTR; ++ CK_ULONG ulSlotCount = 0; ++ CK_MECHANISM_INFO mech_info; ++ CK_TOKEN_INFO token_info; ++ int i; ++ CK_RV rv; ++ CK_SLOT_ID best_slot_sofar; ++ CK_BBOOL found_candidate_slot = CK_FALSE; ++ int slot_n_cipher = 0; ++ int slot_n_digest = 0; ++ CK_SLOT_ID current_slot = 0; ++ int current_slot_n_cipher = 0; ++ int current_slot_n_digest = 0; ++ ++ int local_cipher_nids[PK11_CIPHER_MAX]; ++ int local_digest_nids[PK11_DIGEST_MAX]; ++ ++ /* let's initialize the output parameter */ ++ if (any_slot_found != NULL) ++ *any_slot_found = 0; ++ ++ /* Get slot list for memory allocation */ ++ rv = pFuncList->C_GetSlotList(CK_FALSE, NULL_PTR, &ulSlotCount); ++ ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); ++ return (0); ++ } ++ ++ /* it's not an error if we didn't find any providers */ ++ if (ulSlotCount == 0) ++ { ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: no crypto providers found\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ return (1); ++ } ++ ++ pSlotList = OPENSSL_malloc(ulSlotCount * sizeof (CK_SLOT_ID)); ++ ++ if (pSlotList == NULL) ++ { ++ PK11err(PK11_F_CHOOSE_SLOT, PK11_R_MALLOC_FAILURE); ++ return (0); ++ } ++ ++ /* Get the slot list for processing */ ++ rv = pFuncList->C_GetSlotList(CK_FALSE, pSlotList, &ulSlotCount); ++ if (rv != CKR_OK) ++ { ++ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); ++ OPENSSL_free(pSlotList); ++ return (0); ++ } ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME); ++ fprintf(stderr, "%s: number of slots: %d\n", PK11_DBG, ulSlotCount); ++ ++ fprintf(stderr, "%s: == checking rand slots ==\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ for (i = 0; i < ulSlotCount; i++) ++ { ++ current_slot = pSlotList[i]; ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); ++#endif /* DEBUG_SLOT_SELECTION */ ++ /* Check if slot has random support. */ ++ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); ++ if (rv != CKR_OK) ++ continue; ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++ if (token_info.flags & CKF_RNG) ++ { ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ pk11_have_random = CK_TRUE; ++ rand_SLOTID = current_slot; ++ break; ++ } ++ } ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++ pubkey_SLOTID = pSlotList[0]; ++ for (i = 0; i < ulSlotCount; i++) ++ { ++ CK_BBOOL slot_has_rsa = CK_FALSE; ++ CK_BBOOL slot_has_dsa = CK_FALSE; ++ CK_BBOOL slot_has_dh = CK_FALSE; ++ current_slot = pSlotList[i]; ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); ++#endif /* DEBUG_SLOT_SELECTION */ ++ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); ++ if (rv != CKR_OK) ++ continue; ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++#ifndef OPENSSL_NO_RSA ++ /* ++ * Check if this slot is capable of signing and ++ * verifying with CKM_RSA_PKCS. ++ */ ++ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_RSA_PKCS, ++ &mech_info); ++ ++ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && ++ (mech_info.flags & CKF_VERIFY))) ++ { ++ /* ++ * Check if this slot is capable of encryption, ++ * decryption, sign, and verify with CKM_RSA_X_509. ++ */ ++ rv = pFuncList->C_GetMechanismInfo(current_slot, ++ CKM_RSA_X_509, &mech_info); ++ ++ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && ++ (mech_info.flags & CKF_VERIFY) && ++ (mech_info.flags & CKF_ENCRYPT) && ++ (mech_info.flags & CKF_VERIFY_RECOVER) && ++ (mech_info.flags & CKF_DECRYPT))) ++ { ++ slot_has_rsa = CK_TRUE; ++ } ++ } ++#endif /* OPENSSL_NO_RSA */ ++ ++#ifndef OPENSSL_NO_DSA ++ /* ++ * Check if this slot is capable of signing and ++ * verifying with CKM_DSA. ++ */ ++ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_DSA, ++ &mech_info); ++ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && ++ (mech_info.flags & CKF_VERIFY))) ++ { ++ slot_has_dsa = CK_TRUE; ++ } ++ ++#endif /* OPENSSL_NO_DSA */ ++ ++#ifndef OPENSSL_NO_DH ++ /* ++ * Check if this slot is capable of DH key generataion and ++ * derivation. ++ */ ++ rv = pFuncList->C_GetMechanismInfo(current_slot, ++ CKM_DH_PKCS_KEY_PAIR_GEN, &mech_info); ++ ++ if (rv == CKR_OK && (mech_info.flags & CKF_GENERATE_KEY_PAIR)) ++ { ++ rv = pFuncList->C_GetMechanismInfo(current_slot, ++ CKM_DH_PKCS_DERIVE, &mech_info); ++ if (rv == CKR_OK && (mech_info.flags & CKF_DERIVE)) ++ { ++ slot_has_dh = CK_TRUE; ++ } ++ } ++#endif /* OPENSSL_NO_DH */ ++ ++ if (!found_candidate_slot && ++ (slot_has_rsa || slot_has_dsa || slot_has_dh)) ++ { ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, ++ "%s: potential slot: %d\n", PK11_DBG, current_slot); ++#endif /* DEBUG_SLOT_SELECTION */ ++ best_slot_sofar = current_slot; ++ pk11_have_rsa = slot_has_rsa; ++ pk11_have_dsa = slot_has_dsa; ++ pk11_have_dh = slot_has_dh; ++ found_candidate_slot = CK_TRUE; ++ /* ++ * Cache the flags for later use. We might need those if ++ * RSA keys by reference feature is used. ++ */ ++ pubkey_token_flags = token_info.flags; ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, ++ "%s: setting found_candidate_slot to CK_TRUE\n", ++ PK11_DBG); ++ fprintf(stderr, ++ "%s: best so far slot: %d\n", PK11_DBG, ++ best_slot_sofar); ++ fprintf(stderr, "%s: pubkey flags changed to " ++ "%lu.\n", PK11_DBG, pubkey_token_flags); ++ } ++ else ++ { ++ fprintf(stderr, ++ "%s: no rsa/dsa/dh\n", PK11_DBG); ++ } ++#else ++ } /* if */ ++#endif /* DEBUG_SLOT_SELECTION */ ++ } /* for */ ++ ++ if (found_candidate_slot == CK_TRUE) ++ { ++ pubkey_SLOTID = best_slot_sofar; ++ } ++ ++ found_candidate_slot = CK_FALSE; ++ best_slot_sofar = 0; ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++ SLOTID = pSlotList[0]; ++ for (i = 0; i < ulSlotCount; i++) ++ { ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++ current_slot = pSlotList[i]; ++ current_slot_n_cipher = 0; ++ current_slot_n_digest = 0; ++ (void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids)); ++ (void) memset(local_digest_nids, 0, sizeof (local_digest_nids)); ++ ++ pk11_find_symmetric_ciphers(pFuncList, current_slot, ++ ¤t_slot_n_cipher, local_cipher_nids); ++ ++ pk11_find_digests(pFuncList, current_slot, ++ ¤t_slot_n_digest, local_digest_nids); ++ ++#ifdef DEBUG_SLOT_SELECTION ++ fprintf(stderr, "%s: current_slot_n_cipher %d\n", PK11_DBG, ++ current_slot_n_cipher); ++ fprintf(stderr, "%s: current_slot_n_digest %d\n", PK11_DBG, ++ current_slot_n_digest); ++ fprintf(stderr, "%s: best so far cipher/digest slot: %d\n", ++ PK11_DBG, best_slot_sofar); ++#endif /* DEBUG_SLOT_SELECTION */ ++ ++ /* ++ * If the current slot supports more ciphers/digests than ++ * the previous best one we change the current best to this one, @@ 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 chninkel at users.sourceforge.net Sun Apr 29 14:13:04 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 29 Apr 2012 12:13:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17895] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 17895 http://gar.svn.sourceforge.net/gar/?rev=17895&view=rev Author: chninkel Date: 2012-04-29 12:13:04 +0000 (Sun, 29 Apr 2012) Log Message: ----------- openssl1/trunk: fixed checkpkg errors Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-28 21:29:59 UTC (rev 17894) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-29 12:13:04 UTC (rev 17895) @@ -53,23 +53,23 @@ #CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl # We ship the .a files in the devel package -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a -ifeq ($(GARCH),sparc) -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a -else -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a -endif +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a +#ifeq ($(GARCH),sparc) +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a +#else +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a +#CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a +#endif #CHECKPKG_OVERRIDES_CSWlibssl-dev += surplus-dependency|CSWlibssl1-0-0 # We do ship libcrypto in libssl package -CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 +#CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 #CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/pentium_pro/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 -CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 +#CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 # References to default path in documentation files, can be safely ignored @@ -84,7 +84,7 @@ CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL # We have a lot of collision until libssl1.0.0 will replace libssl0.9.8 -include checkpkg.overrides +#include checkpkg.overrides ###### Upstream and opencsw files information ####### @@ -133,7 +133,7 @@ EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 # we include *.a files in the devel package so we don't want them excluded -MERGE_EXCLUDE_STATICLIBS = +#MERGE_EXCLUDE_STATICLIBS = # No .so files in libraries EXTRA_MERGE_EXCLUDE_FILES = .*/libcrypto.so .*/libssl.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 29 14:20:41 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 29 Apr 2012 12:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[17896] csw/mgar/pkg/openssl1/trunk/checkpkg.overrides Message-ID: Revision: 17896 http://gar.svn.sourceforge.net/gar/?rev=17896&view=rev Author: chninkel Date: 2012-04-29 12:20:41 +0000 (Sun, 29 Apr 2012) Log Message: ----------- openssl1/trunk: removed checkpkg temporary overrides for openssl 0.9.8 clash Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/checkpkg.overrides Deleted: csw/mgar/pkg/openssl1/trunk/checkpkg.overrides =================================================================== --- csw/mgar/pkg/openssl1/trunk/checkpkg.overrides 2012-04-29 12:13:04 UTC (rev 17895) +++ csw/mgar/pkg/openssl1/trunk/checkpkg.overrides 2012-04-29 12:20:41 UTC (rev 17896) @@ -1,1092 +0,0 @@ -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_f_md.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DigestFinal_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_cipher.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_DSAPublicKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_comba4.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_set_mark.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_options.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_cert_store.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/HMAC_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_write_guarantee.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_callback_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_write.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_REQ.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CONF_modules_unload.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_client_CA_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_CRL_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_copy.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_info_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MDC2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_print_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_write_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_client_cert_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_exp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_cache_full.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_library_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/des_old.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_length.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/blowfish.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_REQ_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_mem.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_mul.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_RECP_CTX_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_cmp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_zero.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_type.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_set_flags.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_type.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_CRL_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_cipher_ctx.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_timeout.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_bn2mpi.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_check.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_cfb_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/HMAC.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_get_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/crypto.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_max_cert_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_set_key_length.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_sqr_words.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_sqr.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_RSAPrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_cmp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_connect.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CONF_modules_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_print_ex_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_cmp_words.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_get_ex_new_index.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_add_client_CA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/hmac.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_dup_verify_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_int_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_check_PKCS1_type_1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_bio_pair.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_add_PKCS1_OAEP.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_sqr_recursive.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_random_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_ripemd160.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_put_error.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_comba8.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_get_digestbyobj.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_set_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_RSA_PUBKEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DHparams_print.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_get_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_retry_type.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_nbio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSAparams_print.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_msg_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD4_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CipherFinal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_set_odd_parity.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CONF_modules_load.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/evp.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_set_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_set_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CipherUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_retry_BIO.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/pem.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_block_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/x509_vfy.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ctrl_reset_read_request.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_want_read.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_SIG.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ripemd.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_NAME.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_SignUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_PrivateKey_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_get_object.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_quad_cksum.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_generate_prime.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_print.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_OBJECT_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ofb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_set_dynlock_lock_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_accept_renegotiate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_get_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_client_CA_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_set_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/PKCS12_parse.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_set_dynlock_create_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_PrivateKey_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_div_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_client_cert_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/pentium_pro/libcrypto.a|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_node_stats.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD4_Update.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_num_bits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_check_private_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_bind_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_default_passwd_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_print_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/stack.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_verify_result.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_sign_setup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_pop_to_mark.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_copy.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_tmp_dh.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_dup_info_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MDC2_Update.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_add_info_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/lhash.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/rc4.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_cleanup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_mem_buf.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DHparams_print_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_tell.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_peek_error_line_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_rshift.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ede2_ofb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_add_input_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_print_errors_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_cfb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_sha1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_set_padding.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_RSAPrivateKey_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_public_decrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_set_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_should_retry.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_session.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ssl2.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_compute_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_ln2nid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_VerifyFinal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_VerifyUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_generate_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_get_cipherbyname.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/PEM.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_dup_DH.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_client_CA_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ctrl_pending.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_expand.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_ALGOR.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_set_object.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_remove_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_get_text_by_NID.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/dtls1.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_RECP_CTX_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/md4.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_need_tmp_rsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ofb_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_bn2bin.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_dup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_peek_last_error_line.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_NID.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_NAME.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_pending.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_connect_good.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_connect.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_get_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_zero.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_callback_arg.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_client_CA_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_get_error.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/rand.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_add_error_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_add_session.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_EncryptInit_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ui_compat.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_nid_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_status.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_OBJECT_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_set_locking_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_CTX_start.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_process.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_remove_session.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ncbc_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_create_param.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_do_handshake.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_tmp_dh.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_nbio_accept.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_get_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_get_text_by_OBJ.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD5.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RIPEMD160_Update.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MDC2_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_write_filename.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_alert_type_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_set_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_RSAPrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_ssl_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_callback_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_key_length.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_mem_ptr.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_md2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/x509.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_cmp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_remove_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_div_recp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_get_index_by_OBJ.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_hex2bn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_prime_fasttest.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_close.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DecryptInit_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD5_Update.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_sub_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_accept_state.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_free_all.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DigestInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/pkgconfig/libssl.pc|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_md.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_cleanup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_private_decrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/md5.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_get0_result.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/bio.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_reason_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/safestack.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_ASN1_OBJECT.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_msg_callback_arg.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_callback_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_ssl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_version.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_num_bits_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ssl_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_nid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ssl3.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_current_cipher.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/rsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_set1_EC_KEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BUF_MEM_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_session_reused.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SHA1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_EncryptInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_set_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_set1_DH.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_RSAPublicKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_CTX_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_peer_cert_chain.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_want_nothing.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_add.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_remove_state.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ecdsa.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_set_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD2_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_generate_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_set_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_check_SSLv23.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_cleanup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_session_cache_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_event.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_verify_result.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/bn.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_screen.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_BytesToKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_shutdown_wr.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_to_montgomery.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_wpending.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_SignFinal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_num_bytes.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/md5.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_RECP_CTX_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CipherInit_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_add_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_dup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/sha.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/des_read_2passwords.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/pem2.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_cbc_cksum.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_alert_type_string_long.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_read_request.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_get_rand_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ede3_cbcm_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_one.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_SIG_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_error.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_OpenSSL.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_sqr_comba4.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ripemd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_pseudo_rand.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/des.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_write.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_cipher_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_md5.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OPENSSL_config.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_string_to_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_set1_DSA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_sign.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_pop.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_VerifyInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_error_string_n.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/libssl.a|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_cbc_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_get_digestbynid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_session_cache_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_get1_EC_KEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_get_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_certificate_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_print.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_write_buf_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_description.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_low_normal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_accept_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_read.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_conn_ip.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_number.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_flush_sessions.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_conn_int_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_seek.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_recursive.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OpenSSL_add_all_ciphers.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_SealInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_add.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_sqr_comba8.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DecryptFinal_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_CTX_end.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CipherInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_doall.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_dump.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_get_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_node_usage_stats.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_f_ssl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_set_app_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_cert_store.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_clear.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OpenSSL_add_all_digests.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_PrivateKey_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_stats.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_file_name.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_info_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_f_null.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/rc2.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_generate_parameters.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_get1_DSA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OPENSSL_VERSION_NUMBER.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ui.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/des.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_tmp_rsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_state_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_connect_renegotiate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_puts.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_PKCS8PrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_tmp_rsa_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_prime.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/conf.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_load_error_strings.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_SESSION_get_time.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ssl_copy_session_id.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CONF_modules_load_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mpi2bn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_RSA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lhash.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/tls1.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_PACK.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_txt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_hits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_f_base64.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ssl23.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_info_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_OBJ.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_cfb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_verify_ASN1_OCTET_STRING.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_depth.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/HMAC_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/kssl.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ocsp.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/aes.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_DSA_PUBKEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DecryptInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_peer_certificate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_blinding_on.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_lib_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_RSAPublicKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SMIME_write_PKCS7.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_swap.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_pseudo_bytes.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_check_PKCS1_type_2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_set_bit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_verify_depth.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_conn_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_CRL.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/comp.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_connect_state.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_func_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_rw_filename.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_lock.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_f_cipher.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_from_montgomery.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_delete_entry.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_sqr.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_nid2ln.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ede2_cfb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_name.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_DSAPrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/asn1.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/asn1_mac.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_max_cert_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_retrieve.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_bind_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_check_none.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_msg_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_OpenInit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_internal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_info_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_retry_reason.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_renegotiate_timeout.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ede3_ofb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_cipher_list.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_set_dynlock_destroy_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_one.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_timeout.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ctrl_wpending.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_SSL_CTX.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_SESSION_set_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_add_verify_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_print_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_set.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_msg_callback_arg.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_SESSION_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_nid2sn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_new_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OPENSSL_Applink.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_dup_input_boolean.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_RSA_PUBKEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_new_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_version.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_read_filename.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_REQ_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_need_tmp_rsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_OpenUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_copy_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_rand.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_enc_write.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/dsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_get_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/asn1t.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_certificate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_should_write.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ebcdic.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ossl_typ.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_bytes.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_num_renegotiates.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_exp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ssl.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_null.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_CRL_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BUF_MEM_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_accept_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_check_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_get_digestbyname.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/buffer.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_set_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_read.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/PKCS7_sign.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_cb_hits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_set_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_NID.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/pkgconfig/libcrypto.pc|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_socket.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_EC_KEY.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_alert_desc_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_OpenSSL.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_stats_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sessions.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/opensslv.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_invert.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SHA1_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_verify_depth.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_ssl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_enc_read.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_wexpand.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_add_none.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_dec2bn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_conn_hostname.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ssl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_nid_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mul_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_lshift.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/pkcs12.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_generate_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_cipher_status.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_SESSION_set_time.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_quiet_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_iv_length.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_CTX_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mul.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/pem.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ctrl_get_read_request.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_certificate_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_invert_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_state_string_long.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RIPEMD160_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_SESSION_get_timeout.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_sqr_normal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_clear_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_SIG_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_nid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_oneline.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RC4_set_key.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_construct_prompt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_cipher.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_quiet_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_get0_user_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_alert_desc_string_long.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_DH.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_CTX_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_cache_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_copy.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_tmp_dh_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_EncryptFinal_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/threads.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_get_error_line_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ui_compat.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_key_sched.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/err.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_options.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DecryptUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_add_words.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_set_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_public_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_null_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_value_one.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_add_client_CA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_get_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_dup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ec.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/dh.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_bin2bn.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate_chain_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_RSAPrivateKey_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_pkey_type.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_asn1_to_param.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_set_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MDC2_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/blowfish.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_use_PrivateKey_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/des_read_password.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_reset.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_get_ex_new_index.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_expand2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/des_read_pw_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_close.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_verify_depth.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_get_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_pcbc_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_write_buf_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_print_ex_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_want.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_create.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_part_recursive.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/cast.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_quiet_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_want_write.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_destroy.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_flags.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_crypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_REQ_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_mul_montgomery.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_block_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_accept.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_set_high.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_should_read.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_get_ex_new_index.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_ecb_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_generate_nconf.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_DSAPublicKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_SIG.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_load_UI_strings.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_odd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_ssl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/pentium_pro/libssl.a|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_ciphers.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_rstate_string_long.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_default_passwd_cb_userdata.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_mem_buf.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OPENSSL_load_builtin_modules.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_make_bio_pair.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_SealUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/ecdh.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_get_new_dynlockid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_CRL.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_bits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_print_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_PKCS8PrivateKey_bio.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/pkcs7.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_new_cb.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/obj_mac.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_do_sign.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_X509_ALGOR.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_mem_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_sub.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_SSLeay.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_rshift1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSLeay_add_ssl_algorithms.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ede3_cfb64_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_print.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_string_to_2keys.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_get_ex_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_fix_top.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_ssl_version.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_ASN1_OBJECT.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_quiet_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_get_cipherbyobj.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_inverse.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_renegotiate_bytes.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_fcrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_version.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_info_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_destroy_bio_pair.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_set_key_unchecked.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_do_accept.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_add_word.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_mem_eof_return.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_session_id_context.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/sha.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_nnmod.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_length_set.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DigestUpdate.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_convert.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_mdc2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_private_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_cache_size.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_OBJ.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/buffer.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_want_x509_lookup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_convert_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_conn_hostname.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate_ASN1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_connect.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DH_get_default_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_2.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mod_add.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/CRYPTO_destroy_dynlockid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/txt_db.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_set_max.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_options.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_high.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_words.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/X509_NAME_entry_count.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/PKCS7_verify.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_ex_new_index.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_vfree.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_clear_bit.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_generate_v3.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_xcbc_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_socket.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SHA1_Update.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_delete.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_bits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/e_os2.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CipherFinal_ex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RAND_set_rand_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BF_options.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_RSAPrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_conn_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_s_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_create.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_set_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_ecb3_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_load_client_CA_file.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_set_low.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_insert.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_obj2nid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_GET_FUNC.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_name.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SHA1_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_txt2nid.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_bn2hex.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_pending.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DES_set_key_checked.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/DSA_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_SSL_SESSION.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_new_method.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_get_error_line.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/symhacks.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_RECP_CTX_set.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_PKEY_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_do_connect.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_padding_check_PKCS1_OAEP.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD4_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_cert_verify_callback.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RIPEMD160.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_shutdown.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ptr_ctrl.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_get_app_data.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_flags.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_add_words.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/MD2_Final.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_BLINDING_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_add_extra_chain_cert.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_add_input_boolean.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_dss1.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_DSA_SIG.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OBJ_nid2obj.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/x509.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_free.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_next.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ASN1_STRING_new.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/HMAC_cleanup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_is_bit_set.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BUF_strdup.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OPENSSL_no_config.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_dup_error_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/pqueue.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_tmp_rsa.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_fd.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/i2d_SSL_SESSION.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_DecryptFinal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_blinding_off.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_low_recursive.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/rsa.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_md.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_PKCS8PrivateKey_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_rstate_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_set_options.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/lib/amd64/libcrypto.a|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_Netscape_RSA.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_flush.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/UI_dup_input_string.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BUF_MEM_grow.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/d2i_X509_REQ_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_print_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/krb5_asn.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_div.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/evp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/lh_error.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RIPEMD160_Init.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_new_fp.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/PKCS7_encrypt.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_sub.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_set_conn_int_port.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_key_length.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_check_top.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/RSA_flags.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_mode.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_gets.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_PrivateKey.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_get_md_ctx.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/des_read_pw.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/include/openssl/conf_api.h|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/bn_mul_normal.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_should_io_special.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/OpenSSL_add_ssl_algorithms.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/EVP_MAX_MD_SIZE.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BN_mask_bits.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/ERR_get_next_error_library.3|CSWlibssl-dev|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-collision|/opt/csw/share/man/man3/BIO_ctrl.3|CSWlibssl-dev|CSWossldevel @@ 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 chninkel at users.sourceforge.net Sun Apr 29 19:29:03 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 29 Apr 2012 17:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[17897] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 17897 http://gar.svn.sourceforge.net/gar/?rev=17897&view=rev Author: chninkel Date: 2012-04-29 17:29:03 +0000 (Sun, 29 Apr 2012) Log Message: ----------- openssl1/trunk: don't enable pkcs11 for the 64 libraries in the solaris9 build Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-29 12:20:41 UTC (rev 17896) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-29 17:29:03 UTC (rev 17897) @@ -117,7 +117,7 @@ # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 -ifneq ($(shell /usr/bin/uname -r),5.9) +ifneq ($(findstring solaris9,$(GAR_PLATFORM)), solaris9) PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) endif 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 Apr 29 23:00:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 29 Apr 2012 21:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17898] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 17898 http://gar.svn.sourceforge.net/gar/?rev=17898&view=rev Author: wahwah Date: 2012-04-29 21:00:31 +0000 (Sun, 29 Apr 2012) Log Message: ----------- zlib/trunk: version bump to 1.2.6 Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zlib/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-04-29 17:29:03 UTC (rev 17897) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-04-29 21:00:31 UTC (rev 17898) @@ -1,5 +1,7 @@ +# $Id$ + NAME = zlib -VERSION = 1.2.5 +VERSION = 1.2.6 CATEGORIES = lib GARTYPE = v2 @@ -37,8 +39,11 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium +# https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 +EXTRA_CFLAGS = -xcode=pic32 + CONFIGURE_ARGS += --prefix=$(prefix) -CONFIGURE_ARGS += --eprefix=$(exec_prefix) +CONFIGURE_ARGS += --eprefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) CONFIGURE_ARGS += --includedir=$(includedir) CONFIGURE_ARGS += --shared Property changes on: csw/mgar/pkg/zlib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2012-04-29 17:29:03 UTC (rev 17897) +++ csw/mgar/pkg/zlib/trunk/checksums 2012-04-29 21:00:31 UTC (rev 17898) @@ -1,4 +1 @@ -769d66250c5aee840205a5d92cab05e7 Makefile.in.diff -eb5fb03fc91399bb0ad892223d339c09 configure.diff -4f83c4bd64190ba690413ab698861b3f license -be1e89810e66150f5b0327984d8625a0 zlib-1.2.5.tar.bz2 +dc2cfa0d2313ca77224b4d932b2911e9 zlib-1.2.6.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 Mon Apr 30 09:08:51 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 07:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[17899] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 17899 http://gar.svn.sourceforge.net/gar/?rev=17899&view=rev Author: wahwah Date: 2012-04-30 07:08:51 +0000 (Mon, 30 Apr 2012) Log Message: ----------- integrate-catalogs: A bugfix A variable needed to be passed from one function to another. Bug was intruduced during refactoring. 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 2012-04-29 21:00:31 UTC (rev 17898) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-30 07:08:51 UTC (rev 17899) @@ -127,11 +127,12 @@ # Convert this to pool.map when multiprocessing if fixed. catalogs = dict(map(lambda x: GetCatalog(*x), catalogs_to_fetch_args)) diffs_by_catalogname = ComposeDiffsByCatalogname( - catalogs, catrel_from, catrel_to, include_version_changes) + catalogs, catrel_from, catrel_to, include_version_changes, + include_downgrades) return catalogs, diffs_by_catalogname def ComposeDiffsByCatalogname(catalogs, catrel_from, catrel_to, - include_version_changes): + include_version_changes, include_downgrades): """Get a data structure indexed with catalognames. { 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 Apr 30 09:14:24 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 07:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[17900] csw/mgar/gar/v2/lib/python Message-ID: Revision: 17900 http://gar.svn.sourceforge.net/gar/?rev=17900&view=rev Author: wahwah Date: 2012-04-30 07:14:24 +0000 (Mon, 30 Apr 2012) Log Message: ----------- integrate-catalogs: Cache more data locally Run faster! Faster! Faster! Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py csw/mgar/gar/v2/lib/python/rest.py csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-30 07:08:51 UTC (rev 17899) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-04-30 07:14:24 UTC (rev 17900) @@ -242,7 +242,7 @@ options.include_version_changes) bundles_by_md5 = {} bundles_missing = set() - cp = rest.CachedPkgstats("pkgstats.db") + cp = rest.CachedPkgstats("pkgstats") for key in catalogs: for pkg in catalogs[key]: # logging.debug("%r", pkg) Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2012-04-30 07:08:51 UTC (rev 17899) +++ csw/mgar/gar/v2/lib/python/rest.py 2012-04-30 07:14:24 UTC (rev 17900) @@ -95,9 +95,10 @@ def __init__(self, filename): self.filename = filename - self.d = gdbm.open(filename, "c") + self.d = gdbm.open("%s.db" % self.filename, "c") self.rest_client = RestClient() self.local_cache = {} + self.deps = gdbm.open("%s-deps.db" % self.filename, "c") def GetPkgstats(self, md5): if md5 in self.local_cache: @@ -109,3 +110,13 @@ self.d[md5] = cjson.encode(pkgstats) self.local_cache[md5] = pkgstats return pkgstats + + def GetDeps(self, md5): + if str(md5) in self.deps: + return cjson.decode(self.deps[md5]) + else: + pkgstats = self.GetPkgstats(md5) + data = {"deps": pkgstats["depends"], + "pkgname": pkgstats["basic_stats"]["pkgname"]} + self.deps[md5] = cjson.encode(data) + return data Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-04-30 07:08:51 UTC (rev 17899) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-04-30 07:14:24 UTC (rev 17900) @@ -21,12 +21,15 @@ import subprocess +class Error(Exception): + """A generic error.""" + class RevDeps(object): def __init__(self): self.cached_catalogs = {} self.rest_client = rest.RestClient() - self.cp = rest.CachedPkgstats("pkgstats.db") + self.cp = rest.CachedPkgstats("pkgstats") def MakeRevIndex(self, catrel, arch, osrel): key = (catrel, arch, osrel) @@ -42,16 +45,12 @@ for pkg_simple in catalog: # pprint.pprint(pkg_simple) md5 = pkg_simple["md5_sum"] - pkg = self.cp.GetPkgstats(md5) - if not pkg: - logging.warning("No package for %r", md5) - continue - for dep_pkgname, _ in pkg["depends"]: + # pkg = self.cp.GetPkgstats(md5) + short_data = self.cp.GetDeps(md5) + pkgname = short_data["pkgname"] + for dep_pkgname, _ in short_data["deps"]: rev_dep_set = rev_deps.setdefault(dep_pkgname, list()) - rev_dep_set.append((md5, pkg["basic_stats"]["pkgname"])) - sys.stdout.write(".") - sys.stdout.flush() - sys.stdout.write("\n") + rev_dep_set.append((md5, pkgname)) self.cached_catalogs[key] = rev_deps with open(fn, "w") as fd: fd.write(cjson.encode(self.cached_catalogs[key])) 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 Apr 30 09:14:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 07:14:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17901] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 17901 http://gar.svn.sourceforge.net/gar/?rev=17901&view=rev Author: wahwah Date: 2012-04-30 07:14:44 +0000 (Mon, 30 Apr 2012) Log Message: ----------- checkpkg: bugfix:Remove tmp bits from binary paths The temporary directory names were leaking into the indexed data. Context: http://lists.opencsw.org/pipermail/maintainers/2012-April/016496.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2012-04-30 07:14:24 UTC (rev 17900) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2012-04-30 07:14:44 UTC (rev 17901) @@ -88,13 +88,13 @@ self.files_metadata = [] files_root = self.GetFilesDir() all_files = self.GetAllFilePaths() - def StripRe(x, strip_re): - return re.sub(strip_re, "", x) file_magic = FileMagic() basedir = self.GetBasedir() for file_path in all_files: full_path = unicode(self.MakeAbsolutePath(file_path)) file_info = GetFileMetadata(file_magic, self.pkgpath, full_path) + # To prevent files from containing the full temporary path. + file_info["path"] = StripRe(file_path, ROOT_RE) self.files_metadata.append(file_info) return self.files_metadata This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Apr 30 10:42:03 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 30 Apr 2012 10:42:03 +0200 Subject: [csw-devel] SF.net SVN: gar:[17897] csw/mgar/pkg/openssl1/trunk/Makefile In-Reply-To: References: Message-ID: <8EFA9B46-9C77-47D3-B649-B4F72F171A7D@opencsw.org> Hi Yann, Am 29.04.2012 um 19:29 schrieb chninkel at users.sourceforge.net: > Revision: 17897 > http://gar.svn.sourceforge.net/gar/?rev=17897&view=rev > Author: chninkel > Date: 2012-04-29 17:29:03 +0000 (Sun, 29 Apr 2012) > Log Message: > ----------- > openssl1/trunk: don't enable pkcs11 for the 64 libraries in the solaris9 build > > Modified Paths: > -------------- > csw/mgar/pkg/openssl1/trunk/Makefile > > Modified: csw/mgar/pkg/openssl1/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-29 12:20:41 UTC (rev 17896) > +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-29 17:29:03 UTC (rev 17897) > @@ -117,7 +117,7 @@ > # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine > ifdef PKCS11 > PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 > -ifneq ($(shell /usr/bin/uname -r),5.9) > +ifneq ($(findstring solaris9,$(GAR_PLATFORM)), solaris9) Is there a specific reason why you disable PKCS#11 in the 64 bit part of Solaris 9? It is built the same way on Solaris 10 as is the pure Solaris 10 build. Best regards -- Dago > PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 > CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) > endif > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Mon Apr 30 11:56:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Apr 2012 09:56:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[17902] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 17902 http://gar.svn.sourceforge.net/gar/?rev=17902&view=rev Author: dmichelsen Date: 2012-04-30 09:56:55 +0000 (Mon, 30 Apr 2012) Log Message: ----------- sudo/trunk: Update to 1.8.4p4 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 07:14:44 UTC (rev 17901) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 09:56:55 UTC (rev 17902) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.3p2 +VERSION = 1.8.4p4 CATEGORIES = utils GARTYPE = v2 @@ -33,7 +33,6 @@ OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2012-04-30 07:14:44 UTC (rev 17901) +++ csw/mgar/pkg/sudo/trunk/checksums 2012-04-30 09:56:55 UTC (rev 17902) @@ -1 +1 @@ -6d4282a1530c541f7900fa8dfcf2a882 sudo-1.8.3p2.tar.gz +b9be6df7ecefedff2263052ed9fc5e93 sudo-1.8.4p4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 30 12:28:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 10:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[17903] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 17903 http://gar.svn.sourceforge.net/gar/?rev=17903&view=rev Author: wahwah Date: 2012-04-30 10:28:04 +0000 (Mon, 30 Apr 2012) Log Message: ----------- gcc4/trunk: split up libgo and libitm Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 09:56:55 UTC (rev 17902) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 10:28:04 UTC (rev 17903) @@ -139,6 +139,8 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo0 # checkpkg-undetectable dependencies RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWbinutils @@ -283,6 +285,16 @@ RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibssp0 += $(PKG_BASENAME)corert +PACKAGES += CSWlibgo0 +PKGFILES_CSWlibgo0 += $(call baseisadirs,$(libdir),libgo\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgo0 += $(DESCRIPTION), libgo.so.0 +RUNTIME_DEP_PKGS_CSWlibgo0 += CSWlibgcc-s1 + +PACKAGES += CSWlibitm1 +PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibitm1 += $(DESCRIPTION), libitm.so.1 +RUNTIME_DEP_PKGS_CSWlibitm1 += CSWlibgcc-s1 + LIBSTDCXX_VERSION = 6 PACKAGES += CSWlibstdc++$(LIBSTDCXX_VERSION) 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 Apr 30 12:50:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Apr 2012 10:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[17904] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 17904 http://gar.svn.sourceforge.net/gar/?rev=17904&view=rev Author: dmichelsen Date: 2012-04-30 10:50:47 +0000 (Mon, 30 Apr 2012) Log Message: ----------- sudo/trunk: Fix override Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 10:28:04 UTC (rev 17903) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 10:50:47 UTC (rev 17904) @@ -33,7 +33,7 @@ OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers 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 Apr 30 12:53:56 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 30 Apr 2012 10:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[17905] csw/mgar/pkg/poppler-data/trunk/Makefile Message-ID: Revision: 17905 http://gar.svn.sourceforge.net/gar/?rev=17905&view=rev Author: cgrzemba Date: 2012-04-30 10:53:56 +0000 (Mon, 30 Apr 2012) Log Message: ----------- poppler-data/trunk: fix package name Modified Paths: -------------- csw/mgar/pkg/poppler-data/trunk/Makefile Modified: csw/mgar/pkg/poppler-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler-data/trunk/Makefile 2012-04-30 10:50:47 UTC (rev 17904) +++ csw/mgar/pkg/poppler-data/trunk/Makefile 2012-04-30 10:53:56 UTC (rev 17905) @@ -11,6 +11,7 @@ CATALOGNAME_CSWpoppler-data = poppler_data SPKG_DESC_CSWpoppler-data = $(DESCRIPTION), encoding data OBSOLETED_BY_CSWpoppler-data = CSWpopplerdata +CATALOGNAME_CSWpopplerdata = poppler_data_stub MASTER_SITES = http://poppler.freedesktop.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 30 12:56:45 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Apr 2012 10:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[17906] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 17906 http://gar.svn.sourceforge.net/gar/?rev=17906&view=rev Author: dmichelsen Date: 2012-04-30 10:56:45 +0000 (Mon, 30 Apr 2012) Log Message: ----------- sudo/trunk: Fix override... again Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 10:53:56 UTC (rev 17905) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-04-30 10:56:45 UTC (rev 17906) @@ -34,6 +34,7 @@ # These are just docs CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudoedit.1m CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers 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 Apr 30 14:36:44 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 12:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[17907] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 17907 http://gar.svn.sourceforge.net/gar/?rev=17907&view=rev Author: wahwah Date: 2012-04-30 12:36:44 +0000 (Mon, 30 Apr 2012) Log Message: ----------- gcc4/trunk: allow libgo contain /usr/local references Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 10:56:45 UTC (rev 17906) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 12:36:44 UTC (rev 17907) @@ -289,6 +289,8 @@ PKGFILES_CSWlibgo0 += $(call baseisadirs,$(libdir),libgo\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgo0 += $(DESCRIPTION), libgo.so.0 RUNTIME_DEP_PKGS_CSWlibgo0 += CSWlibgcc-s1 +# Hasn't been investigated. I feel lucky. +CHECKPKG_OVERRIDES_CSWlibgo0 += file-with-bad-content PACKAGES += CSWlibitm1 PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 30 15:14:57 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 13:14:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[17908] csw/mgar/pkg/lang-python/psycopg2/trunk Message-ID: Revision: 17908 http://gar.svn.sourceforge.net/gar/?rev=17908&view=rev Author: wahwah Date: 2012-04-30 13:14:56 +0000 (Mon, 30 Apr 2012) Log Message: ----------- lang-python/psycopg2/trunk: version bump to 2.4.5, no longer linking to the old libpq Modified Paths: -------------- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile csw/mgar/pkg/lang-python/psycopg2/trunk/checksums Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2012-04-30 12:36:44 UTC (rev 17907) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2012-04-30 13:14:56 UTC (rev 17908) @@ -1,6 +1,6 @@ # $Id$ NAME = psycopg2 -VERSION = 2.2.2 +VERSION = 2.4.5 CATEGORIES = python GARTYPE = v2 @@ -16,23 +16,14 @@ CATALOGNAME = py_psycopg2 LICENSE = LICENSE -BUILD_DEP_PKGS = CSWpython-devel CSWlibpq -RUNTIME_DEP_PKGS_CSWpy-psycopg2 = CSWlibpython2-6-1-0 CSWlibpq +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWpostgresql-dev +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpq5 -MASTER_SITES = http://initd.org/psycopg/tarballs/ +MASTER_SITES = http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# 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 = - -# for libpq-fe.h and libpq -EXTRA_CFLAGS = -I/opt/csw/postgresql/include -EXTRA_LDFLAGS = -L/opt/csw/postgresql/lib -R/opt/csw/postgresql/lib - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/checksums 2012-04-30 12:36:44 UTC (rev 17907) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/checksums 2012-04-30 13:14:56 UTC (rev 17908) @@ -1 +1 @@ -571af2ad9dfeb522ee5f8553278a4c38 psycopg2-2.2.2.tar.gz +075e4df465e9a863f288d5bdf6e6887e psycopg2-2.4.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 30 17:02:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 15:02:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[17909] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 17909 http://gar.svn.sourceforge.net/gar/?rev=17909&view=rev Author: wahwah Date: 2012-04-30 15:02:07 +0000 (Mon, 30 Apr 2012) Log Message: ----------- removed old packages (no need to keep rebuilding them) Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 13:14:56 UTC (rev 17908) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-04-30 15:02:07 UTC (rev 17909) @@ -226,9 +226,6 @@ PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*) SPKG_DESC_CSWlibgcc-s1 += $(DESCRIPTION), libgcc_s.so.1 RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgcc-s1 -# For reference, the old CSWgcc3corert: -# http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/ -OBSOLETED_BY_CSWlibgcc-s1 = CSWgcc3corert PACKAGES += CSWlibgcj-tools$(JAVA_LIB_VERSION) CATALOGNAME_CSWlibgcj-tools$(JAVA_LIB_VERSION) = libgcj_tools$(JAVA_LIB_VERSION) @@ -250,7 +247,6 @@ SPKG_DESC_CSWlibgfortran3 += $(DESCRIPTION), libgfortran.so.3 RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgfortran3 RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgfortran3 = $(PKG_BASENAME)gfortranrt PACKAGES += CSWlibgij$(JAVA_LIB_VERSION) CATALOGNAME_CSWlibgij$(JAVA_LIB_VERSION) = libgij$(JAVA_LIB_VERSION) @@ -263,7 +259,6 @@ PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*) SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgomp1 += $(PKG_BASENAME)corert PACKAGES += CSWlibobjc$(LIBOBJC) @@ -283,7 +278,6 @@ PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*) SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibssp0 += $(PKG_BASENAME)corert PACKAGES += CSWlibgo0 PKGFILES_CSWlibgo0 += $(call baseisadirs,$(libdir),libgo\.so\.0(\.\d+)*) @@ -304,7 +298,6 @@ PKGFILES_CSWlibstdc++$(LIBSTDCXX_VERSION) += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.$(LIBSTDCXX_VERSION)(\.\d+)*) SPKG_DESC_CSWlibstdc++$(LIBSTDCXX_VERSION) += $(DESCRIPTION), libstdc++.so.$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_CSWlibstdc++$(LIBSTDCXX_VERSION) += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibstdc++$(LIBSTDCXX_VERSION) = $(PKG_BASENAME)g++rt # The libquadmath.so.0 library is only build on Intel PACKAGES_i386 += CSWlibquadmath0 @@ -349,7 +342,6 @@ ALTERNATIVES_$(PKG_BASENAME)g++ += $(PKG_VERSION_TOKEN)g++ ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) -OBSOLETED_BY_CSWlibgcc-s1 += $(PKG_BASENAME)corert RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcc-s1 PACKAGES += $(PKG_BASENAME)gfortran @@ -374,9 +366,6 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 -OBSOLETED_BY_$(PKG_BASENAME)gfortran = $(PKG_BASENAME)g95 -OBSOLETED_BY_$(PKG_BASENAME)gfortran += $(PKG_BASENAME)g95rt - ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) 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 Apr 30 17:36:34 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 30 Apr 2012 15:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[17910] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 17910 http://gar.svn.sourceforge.net/gar/?rev=17910&view=rev Author: chninkel Date: 2012-04-30 15:36:33 +0000 (Mon, 30 Apr 2012) Log Message: ----------- openssl1/trunk: fixed pkcs11 patch and re-enabled PKCS11 for Solaris 9 build Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30 Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-30 15:02:07 UTC (rev 17909) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-04-30 15:36:33 UTC (rev 17910) @@ -117,8 +117,8 @@ # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 -ifneq ($(findstring solaris9,$(GAR_PLATFORM)), solaris9) - PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03 +ifneq ($(shell /usr/bin/uname -r),5.9) + PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30 CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) endif endif Deleted: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 2012-04-30 15:02:07 UTC (rev 17909) +++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8o.patch.2010-09-03 2012-04-30 15:36:33 UTC (rev 17910) @@ -1,12221 +0,0 @@ -diff -uNr openssl-0.9.8o.orig//Configure openssl-0.9.8o//Configure ---- openssl-0.9.8o.orig//Configure 2010-09-04 00:11:46.000000000 +0200 -+++ openssl-0.9.8o//Configure 2010-09-04 00:21:50.864850050 +0200 -@@ -12,7 +12,7 @@ - - # see INSTALL for instructions. - --my $usage="Usage: Configure [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; -+my $usage="Usage: Configure --pk11-libname=PK11_LIB_LOCATION [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n"; - - # Options: - # -@@ -21,6 +21,9 @@ - # --prefix prefix for the OpenSSL include, lib and bin directories - # (Default: the OPENSSLDIR directory) - # -+# --pk11-libname PKCS#11 library name. -+# (Default: none) -+# - # --install_prefix Additional prefix for package builders (empty by - # default). This needn't be set in advance, you can - # just as well use "make INSTALL_PREFIX=/whatever install". -@@ -591,6 +594,9 @@ - my $idx_ranlib = $idx++; - my $idx_arflags = $idx++; - -+# PKCS#11 engine patch -+my $pk11_libname=""; -+ - my $prefix=""; - my $libdir=""; - my $openssldir=""; -@@ -829,6 +835,10 @@ - { - $flags.=$_." "; - } -+ elsif (/^--pk11-libname=(.*)$/) -+ { -+ $pk11_libname=$1; -+ } - elsif (/^--prefix=(.*)$/) - { - $prefix=$1; -@@ -964,6 +974,13 @@ - exit 0; - } - -+if (! $pk11_libname) -+ { -+ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; -+ print STDERR "See README.pkcs11 for more information.\n"; -+ exit 1; -+ } -+ - if ($target =~ m/^CygWin32(-.*)$/) { - $target = "Cygwin".$1; - } -@@ -1130,6 +1147,8 @@ - if ($flags ne "") { $cflags="$flags$cflags"; } - else { $no_user_cflags=1; } - -+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; -+ - # Kerberos settings. The flavor must be provided from outside, either through - # the script "config" or manually. - if (!$no_krb5) -@@ -1493,6 +1512,7 @@ - s/^VERSION=.*/VERSION=$version/; - s/^MAJOR=.*/MAJOR=$major/; - s/^MINOR=.*/MINOR=$minor/; -+ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; - s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; - s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; - s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; -diff -uNr openssl-0.9.8o.orig//Makefile.org openssl-0.9.8o//Makefile.org ---- openssl-0.9.8o.orig//Makefile.org 2010-01-27 17:06:36.000000000 +0100 -+++ openssl-0.9.8o//Makefile.org 2010-09-04 00:22:02.057767099 +0200 -@@ -26,6 +26,9 @@ - INSTALL_PREFIX= - INSTALLTOP=/usr/local/ssl - -+# You must set this through --pk11-libname configure option. -+PK11_LIB_LOCATION= -+ - # Do not edit this manually. Use Configure --openssldir=DIR do change this! - OPENSSLDIR=/usr/local/ssl - -diff -uNr openssl-0.9.8o.orig//crypto/engine/Makefile openssl-0.9.8o//crypto/engine/Makefile ---- openssl-0.9.8o.orig//crypto/engine/Makefile 2009-09-27 16:04:32.000000000 +0200 -+++ openssl-0.9.8o//crypto/engine/Makefile 2010-09-04 00:22:06.443813644 +0200 -@@ -21,12 +21,14 @@ - eng_table.c eng_pkey.c eng_fat.c eng_all.c \ - tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ - tb_cipher.c tb_digest.c \ -- eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c -+ eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \ -+ hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c - LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ - eng_table.o eng_pkey.o eng_fat.o eng_all.o \ - tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ - tb_cipher.o tb_digest.o \ -- eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o -+ eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \ -+ hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o - - SRC= $(LIBSRC) - -@@ -288,6 +290,61 @@ - eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h - eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h - eng_table.o: eng_table.c -+hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c -+hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c -+hw_pk11_uri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -+hw_pk11_uri.o: ../../include/openssl/opensslconf.h -+hw_pk11_uri.o: ../../include/openssl/opensslv.h -+hw_pk11_uri.o: ../../include/openssl/ossl_typ.h -+hw_pk11_uri.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -+hw_pk11_uri.o: ../../include/openssl/symhacks.h hw_pk11.h hw_pk11_err.h -+hw_pk11_uri.o: hw_pk11_uri.c hw_pk11_uri.h pkcs11f.h pkcs11t.h - tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h - tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h - tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -diff -uNr openssl-0.9.8o.orig//crypto/engine/cryptoki.h openssl-0.9.8o//crypto/engine/cryptoki.h ---- openssl-0.9.8o.orig//crypto/engine/cryptoki.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8o//crypto/engine/cryptoki.h 2010-09-04 00:22:06.460757086 +0200 -@@ -0,0 +1,103 @@ -+/* -+ * CDDL HEADER START -+ * -+ * The contents of this file are subject to the terms of the -+ * Common Development and Distribution License, Version 1.0 only -+ * (the "License"). You may not use this file except in compliance -+ * with the License. -+ * -+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+ * or http://www.opensolaris.org/os/licensing. -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ * When distributing Covered Code, include this CDDL HEADER in each -+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+ * If applicable, add the following below this CDDL HEADER, with the -+ * fields enclosed by brackets "[]" replaced with your own identifying -+ * information: Portions Copyright [yyyy] [name of copyright owner] -+ * -+ * CDDL HEADER END -+ */ -+/* -+ * Copyright 2003 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+#ifndef _CRYPTOKI_H -+#define _CRYPTOKI_H -+ -+#pragma ident "@(#)cryptoki.h 1.2 05/06/08 SMI" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#ifndef CK_PTR -+#define CK_PTR * -+#endif -+ -+#ifndef CK_DEFINE_FUNCTION -+#define CK_DEFINE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION -+#define CK_DECLARE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION_POINTER -+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) -+#endif -+ -+#ifndef CK_CALLBACK_FUNCTION -+#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) -+#endif -+ -+#ifndef NULL_PTR -+#include /* For NULL */ -+#define NULL_PTR NULL -+#endif -+ -+/* -+ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint -+ */ -+#ifndef CK_DISABLE_TRUE_FALSE -+#define CK_DISABLE_TRUE_FALSE -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ -+#ifndef FALSE -+#define FALSE 0 -+#endif /* FALSE */ -+#endif /* CK_DISABLE_TRUE_FALSE */ -+ -+#undef CK_PKCS11_FUNCTION_INFO -+ -+#include "pkcs11.h" -+ -+/* Solaris specific functions */ -+ -+#include -+ -+/* -+ * SUNW_C_GetMechSession will initialize the framework and do all -+ * the necessary PKCS#11 calls to create a session capable of -+ * providing operations on the requested mechanism -+ */ -+CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech, -+ CK_SESSION_HANDLE_PTR hSession); -+ -+/* -+ * SUNW_C_KeyToObject will create a secret key object for the given -+ * mechanism from the rawkey data. -+ */ -+CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, -+ CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len, -+ CK_OBJECT_HANDLE_PTR obj); -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _CRYPTOKI_H */ -diff -uNr openssl-0.9.8o.orig//crypto/engine/eng_all.c openssl-0.9.8o//crypto/engine/eng_all.c ---- openssl-0.9.8o.orig//crypto/engine/eng_all.c 2010-03-01 01:30:11.000000000 +0100 -+++ openssl-0.9.8o//crypto/engine/eng_all.c 2010-09-04 00:22:06.503582943 +0200 -@@ -110,6 +110,9 @@ - #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); - #endif -+#ifndef OPENSSL_NO_HW_PKCS11 -+ ENGINE_load_pk11(); -+#endif - #endif - } - -diff -uNr openssl-0.9.8o.orig//crypto/engine/engine.h openssl-0.9.8o//crypto/engine/engine.h ---- openssl-0.9.8o.orig//crypto/engine/engine.h 2010-02-09 15:18:15.000000000 +0100 -+++ openssl-0.9.8o//crypto/engine/engine.h 2010-09-04 00:22:06.528927372 +0200 -@@ -337,6 +337,7 @@ - void ENGINE_load_ubsec(void); - #endif - void ENGINE_load_cryptodev(void); -+void ENGINE_load_pk11(void); - void ENGINE_load_padlock(void); - void ENGINE_load_builtin_engines(void); - #ifdef OPENSSL_SYS_WIN32 -diff -uNr openssl-0.9.8o.orig//crypto/engine/hw_pk11.c openssl-0.9.8o//crypto/engine/hw_pk11.c ---- openssl-0.9.8o.orig//crypto/engine/hw_pk11.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8o//crypto/engine/hw_pk11.c 2010-09-04 00:22:06.552558696 +0200 -@@ -0,0 +1,3813 @@ -+/* -+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+/* crypto/engine/hw_pk11.c */ -+/* -+ * This product includes software developed by the OpenSSL Project for -+ * use in the OpenSSL Toolkit (http://www.openssl.org/). -+ * -+ * This project also referenced hw_pkcs11-0.9.7b.patch written by -+ * Afchine Madjlessi. -+ */ -+/* -+ * ==================================================================== -+ * Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * licensing at OpenSSL.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This product includes cryptographic software written by Eric Young -+ * (eay at cryptsoft.com). This product includes software written by Tim -+ * Hudson (tjh at cryptsoft.com). -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifndef OPENSSL_NO_RSA -+#include -+#endif -+#ifndef OPENSSL_NO_DSA -+#include -+#endif -+#ifndef OPENSSL_NO_DH -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef OPENSSL_NO_HW -+#ifndef OPENSSL_NO_HW_PK11 -+ -+/* label for debug messages printed on stderr */ -+#define PK11_DBG "PKCS#11 ENGINE DEBUG" -+/* prints a lot of debug messages on stderr about slot selection process */ -+#undef DEBUG_SLOT_SELECTION -+/* -+ * Solaris specific code. See comment at check_hw_mechanisms() for more -+ * information. -+ */ -+#if defined(__SVR4) && defined(__sun) -+#define SOLARIS_HW_SLOT_SELECTION -+#endif -+ -+/* -+ * AES counter mode is not supported in the OpenSSL EVP API yet and neither -+ * there are official OIDs for mechanisms based on this mode. With our changes, -+ * an application can define its own EVP calls for AES counter mode and then -+ * it can make use of hardware acceleration through this engine. However, it's -+ * better if we keep AES CTR support code under ifdef's. -+ */ -+#define SOLARIS_AES_CTR -+ -+#include "cryptoki.h" -+#include "pkcs11.h" -+#include "hw_pk11.h" -+#include "hw_pk11_uri.h" -+#include "hw_pk11_err.c" -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NIDs for AES counter mode that will be defined during the engine -+ * initialization. -+ */ -+int NID_aes_128_ctr = NID_undef; -+int NID_aes_192_ctr = NID_undef; -+int NID_aes_256_ctr = NID_undef; -+#endif /* SOLARIS_AES_CTR */ -+ -+/* -+ * We use this lock to prevent multiple C_Login()s, guard getpassphrase(), -+ * uri_struct manipulation, and static token info. All of that is used by the -+ * RSA keys by reference feature. -+ */ -+pthread_mutex_t *uri_lock; -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+/* -+ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel -+ * library. See comment at check_hw_mechanisms() for more information. -+ */ -+int *hw_cnids; -+int *hw_dnids; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* PKCS#11 session caches and their locks for all operation types */ -+static PK11_CACHE session_cache[OP_MAX]; -+ -+/* -+ * We cache the flags so that we do not have to run C_GetTokenInfo() again when -+ * logging into the token. -+ */ -+CK_FLAGS pubkey_token_flags; -+ -+/* -+ * As stated in v2.20, 11.7 Object Management Function, in section for -+ * C_FindObjectsInit(), at most one search operation may be active at a given -+ * time in a given session. Therefore, C_Find{,Init,Final}Objects() should be -+ * grouped together to form one atomic search operation. This is already -+ * ensured by the property of unique PKCS#11 session handle used for each -+ * PK11_SESSION object. -+ * -+ * This is however not the biggest concern - maintaining consistency of the -+ * underlying object store is more important. The same section of the spec also -+ * says that one thread can be in the middle of a search operation while another -+ * thread destroys the object matching the search template which would result in -+ * invalid handle returned from the search operation. -+ * -+ * Hence, the following locks are used for both protection of the object stores. -+ * They are also used for active list protection. -+ */ -+pthread_mutex_t *find_lock[OP_MAX] = { NULL }; -+ -+/* -+ * lists of asymmetric key handles which are active (referenced by at least one -+ * PK11_SESSION structure, either held by a thread or present in free_session -+ * list) for given algorithm type -+ */ -+PK11_active *active_list[OP_MAX] = { NULL }; -+ -+/* -+ * Create all secret key objects in a global session so that they are available -+ * to use for other sessions. These other sessions may be opened or closed -+ * without losing the secret key objects. -+ */ -+static CK_SESSION_HANDLE global_session = CK_INVALID_HANDLE; -+ -+/* ENGINE level stuff */ -+static int pk11_init(ENGINE *e); -+static int pk11_library_init(ENGINE *e); -+static int pk11_finish(ENGINE *e); -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); -+static int pk11_destroy(ENGINE *e); -+ -+/* RAND stuff */ -+static void pk11_rand_seed(const void *buf, int num); -+static void pk11_rand_add(const void *buf, int num, double add_entropy); -+static void pk11_rand_cleanup(void); -+static int pk11_rand_bytes(unsigned char *buf, int num); -+static int pk11_rand_status(void); -+ -+/* These functions are also used in other files */ -+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype); -+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+ -+/* active list manipulation functions used in this file */ -+extern int pk11_active_delete(CK_OBJECT_HANDLE h, PK11_OPTYPE type); -+extern void pk11_free_active_list(PK11_OPTYPE type); -+ -+#ifndef OPENSSL_NO_RSA -+int pk11_destroy_rsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DSA -+int pk11_destroy_dsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DH -+int pk11_destroy_dh_key_objects(PK11_SESSION *session); -+int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock); -+#endif -+ -+/* Local helper functions */ -+static int pk11_free_all_sessions(void); -+static int pk11_free_session_list(PK11_OPTYPE optype); -+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session); -+static int pk11_destroy_object(CK_SESSION_HANDLE handle, CK_OBJECT_HANDLE oh, -+ CK_BBOOL persistent); -+static const char *get_PK11_LIBNAME(void); -+static void free_PK11_LIBNAME(void); -+static long set_PK11_LIBNAME(const char *name); -+ -+/* Symmetric cipher and digest support functions */ -+static int cipher_nid_to_pk11(int nid); -+#ifdef SOLARIS_AES_CTR -+static int pk11_add_NID(char *sn, char *ln); -+static int pk11_add_aes_ctr_NIDs(void); -+#endif /* SOLARIS_AES_CTR */ -+static int pk11_usable_ciphers(const int **nids); -+static int pk11_usable_digests(const int **nids); -+static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc); -+static int pk11_cipher_final(PK11_SESSION *sp); -+static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl); -+static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx); -+static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid); -+static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid); -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp); -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len); -+static int md_nid_to_pk11(int nid); -+static int pk11_digest_init(EVP_MD_CTX *ctx); -+static int pk11_digest_update(EVP_MD_CTX *ctx, const void *data, -+ size_t count); -+static int pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md); -+static int pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from); -+static int pk11_digest_cleanup(EVP_MD_CTX *ctx); -+ -+static int pk11_choose_slots(int *any_slot_found); -+static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_cipher, -+ int *local_cipher_nids); -+static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_digest, -+ int *local_digest_nids); -+static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids, -+ int id); -+static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids, -+ int id); -+ -+static int pk11_init_all_locks(void); -+static void pk11_free_all_locks(void); -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+static int check_hw_mechanisms(void); -+static int nid_in_table(int nid, int *nid_table); -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* Index for the supported ciphers */ -+enum pk11_cipher_id { -+ PK11_DES_CBC, -+ PK11_DES3_CBC, -+ PK11_DES_ECB, -+ PK11_DES3_ECB, -+ PK11_RC4, -+ PK11_AES_128_CBC, -+ PK11_AES_192_CBC, -+ PK11_AES_256_CBC, -+ PK11_AES_128_ECB, -+ PK11_AES_192_ECB, -+ PK11_AES_256_ECB, -+ PK11_BLOWFISH_CBC, -+#ifdef SOLARIS_AES_CTR -+ PK11_AES_128_CTR, -+ PK11_AES_192_CTR, -+ PK11_AES_256_CTR, -+#endif /* SOLARIS_AES_CTR */ -+ PK11_CIPHER_MAX -+}; -+ -+/* Index for the supported digests */ -+enum pk11_digest_id { -+ PK11_MD5, -+ PK11_SHA1, -+ PK11_SHA224, -+ PK11_SHA256, -+ PK11_SHA384, -+ PK11_SHA512, -+ PK11_DIGEST_MAX -+}; -+ -+#define TRY_OBJ_DESTROY(sp, obj_hdl, retval, uselock, alg_type) \ -+ { \ -+ if (uselock) \ -+ LOCK_OBJSTORE(alg_type); \ -+ if (pk11_active_delete(obj_hdl, alg_type) == 1) \ -+ { \ -+ retval = pk11_destroy_object(sp->session, obj_hdl, \ -+ sp->persistent); \ -+ } \ -+ if (uselock) \ -+ UNLOCK_OBJSTORE(alg_type); \ -+ } -+ -+static int cipher_nids[PK11_CIPHER_MAX]; -+static int digest_nids[PK11_DIGEST_MAX]; -+static int cipher_count = 0; -+static int digest_count = 0; -+static CK_BBOOL pk11_have_rsa = CK_FALSE; -+static CK_BBOOL pk11_have_dsa = CK_FALSE; -+static CK_BBOOL pk11_have_dh = CK_FALSE; -+static CK_BBOOL pk11_have_random = CK_FALSE; -+ -+typedef struct PK11_CIPHER_st -+ { -+ enum pk11_cipher_id id; -+ int nid; -+ int iv_len; -+ int min_key_len; -+ int max_key_len; -+ CK_KEY_TYPE key_type; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_CIPHER; -+ -+static PK11_CIPHER ciphers[] = -+ { -+ { PK11_DES_CBC, NID_des_cbc, 8, 8, 8, -+ CKK_DES, CKM_DES_CBC, }, -+ { PK11_DES3_CBC, NID_des_ede3_cbc, 8, 24, 24, -+ CKK_DES3, CKM_DES3_CBC, }, -+ { PK11_DES_ECB, NID_des_ecb, 0, 8, 8, -+ CKK_DES, CKM_DES_ECB, }, -+ { PK11_DES3_ECB, NID_des_ede3_ecb, 0, 24, 24, -+ CKK_DES3, CKM_DES3_ECB, }, -+ { PK11_RC4, NID_rc4, 0, 16, 256, -+ CKK_RC4, CKM_RC4, }, -+ { PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, 16, -+ CKK_AES, CKM_AES_CBC, }, -+ { PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, 24, -+ CKK_AES, CKM_AES_CBC, }, -+ { PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, 32, -+ CKK_AES, CKM_AES_CBC, }, -+ { PK11_AES_128_ECB, NID_aes_128_ecb, 0, 16, 16, -+ CKK_AES, CKM_AES_ECB, }, -+ { PK11_AES_192_ECB, NID_aes_192_ecb, 0, 24, 24, -+ CKK_AES, CKM_AES_ECB, }, -+ { PK11_AES_256_ECB, NID_aes_256_ecb, 0, 32, 32, -+ CKK_AES, CKM_AES_ECB, }, -+ { PK11_BLOWFISH_CBC, NID_bf_cbc, 8, 16, 16, -+ CKK_BLOWFISH, CKM_BLOWFISH_CBC, }, -+#ifdef SOLARIS_AES_CTR -+ /* we don't know the correct NIDs until the engine is initialized */ -+ { PK11_AES_128_CTR, NID_undef, 16, 16, 16, -+ CKK_AES, CKM_AES_CTR, }, -+ { PK11_AES_192_CTR, NID_undef, 16, 24, 24, -+ CKK_AES, CKM_AES_CTR, }, -+ { PK11_AES_256_CTR, NID_undef, 16, 32, 32, -+ CKK_AES, CKM_AES_CTR, }, -+#endif /* SOLARIS_AES_CTR */ -+ }; -+ -+typedef struct PK11_DIGEST_st -+ { -+ enum pk11_digest_id id; -+ int nid; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_DIGEST; -+ -+static PK11_DIGEST digests[] = -+ { -+ {PK11_MD5, NID_md5, CKM_MD5, }, -+ {PK11_SHA1, NID_sha1, CKM_SHA_1, }, -+ {PK11_SHA224, NID_sha224, CKM_SHA224, }, -+ {PK11_SHA256, NID_sha256, CKM_SHA256, }, -+ {PK11_SHA384, NID_sha384, CKM_SHA384, }, -+ {PK11_SHA512, NID_sha512, CKM_SHA512, }, -+ {0, NID_undef, 0xFFFF, }, -+ }; -+ -+/* -+ * Structure to be used for the cipher_data/md_data in -+ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same pk11 -+ * session in multiple cipher_update calls -+ */ -+typedef struct PK11_CIPHER_STATE_st -+ { -+ PK11_SESSION *sp; -+ } PK11_CIPHER_STATE; -+ -+ -+/* -+ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets -+ * called when libcrypto requests a cipher NID. -+ * -+ * Note how the PK11_CIPHER_STATE is used here. -+ */ -+ -+/* DES CBC EVP */ -+static const EVP_CIPHER pk11_des_cbc = -+ { -+ NID_des_cbc, -+ 8, 8, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* 3DES CBC EVP */ -+static const EVP_CIPHER pk11_3des_cbc = -+ { -+ NID_des_ede3_cbc, -+ 8, 24, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and -+ * get_asn1_parameters fields are set to NULL. -+ */ -+static const EVP_CIPHER pk11_des_ecb = -+ { -+ NID_des_ecb, -+ 8, 8, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_3des_ecb = -+ { -+ NID_des_ede3_ecb, -+ 8, 24, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+ -+static const EVP_CIPHER pk11_aes_128_cbc = -+ { -+ NID_aes_128_cbc, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_cbc = -+ { -+ NID_aes_192_cbc, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_cbc = -+ { -+ NID_aes_256_cbc, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use IV so that's why set_asn1_parameters and -+ * get_asn1_parameters are set to NULL. -+ */ -+static const EVP_CIPHER pk11_aes_128_ecb = -+ { -+ NID_aes_128_ecb, -+ 16, 16, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_ecb = -+ { -+ NID_aes_192_ecb, -+ 16, 24, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_ecb = -+ { -+ NID_aes_256_ecb, -+ 16, 32, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NID_undef's will be changed to the AES counter mode NIDs as soon they are -+ * created in pk11_library_init(). Note that the need to change these structures -+ * is the reason why we don't define them with the const keyword. -+ */ -+static EVP_CIPHER pk11_aes_128_ctr = -+ { -+ NID_undef, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_192_ctr = -+ { -+ NID_undef, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_256_ctr = -+ { -+ NID_undef, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+#endif /* SOLARIS_AES_CTR */ -+ -+static const EVP_CIPHER pk11_bf_cbc = -+ { -+ NID_bf_cbc, -+ 8, 16, 8, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_rc4 = -+ { -+ NID_rc4, -+ 1, 16, 0, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof (PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_MD pk11_md5 = -+ { -+ NID_md5, -+ NID_md5WithRSAEncryption, -+ MD5_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ MD5_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha1 = -+ { -+ NID_sha1, -+ NID_sha1WithRSAEncryption, -+ SHA_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha224 = -+ { -+ NID_sha224, -+ NID_sha224WithRSAEncryption, -+ SHA224_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-224 uses the same cblock size as SHA-256 */ -+ SHA256_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha256 = -+ { -+ NID_sha256, -+ NID_sha256WithRSAEncryption, -+ SHA256_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA256_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha384 = -+ { -+ NID_sha384, -+ NID_sha384WithRSAEncryption, -+ SHA384_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-384 uses the same cblock size as SHA-512 */ -+ SHA512_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha512 = -+ { -+ NID_sha512, -+ NID_sha512WithRSAEncryption, -+ SHA512_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA512_CBLOCK, -+ sizeof (PK11_CIPHER_STATE), -+ }; -+ -+/* -+ * Initialization function. Sets up various PKCS#11 library components. -+ * The definitions for control commands specific to this engine -+ */ -+#define PK11_CMD_SO_PATH ENGINE_CMD_BASE -+static const ENGINE_CMD_DEFN pk11_cmd_defns[] = -+ { -+ { -+ PK11_CMD_SO_PATH, -+ "SO_PATH", -+ "Specifies the path to the 'pkcs#11' shared library", -+ ENGINE_CMD_FLAG_STRING -+ }, -+ {0, NULL, NULL, 0} -+ }; -+ -+ -+static RAND_METHOD pk11_random = -+ { -+ pk11_rand_seed, -+ pk11_rand_bytes, -+ pk11_rand_cleanup, -+ pk11_rand_add, -+ pk11_rand_bytes, -+ pk11_rand_status -+ }; -+ -+ -+/* Constants used when creating the ENGINE */ -+static const char *engine_pk11_id = "pkcs11"; -+static const char *engine_pk11_name = "PKCS #11 engine support"; -+ -+CK_FUNCTION_LIST_PTR pFuncList = NULL; -+static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList"; -+ -+/* -+ * This is a static string constant for the DSO file name and the function -+ * symbol names to bind to. We set it in the Configure script based on whether -+ * this is 32 or 64 bit build. -+ */ -+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION; -+ -+static CK_BBOOL true = TRUE; -+static CK_BBOOL false = FALSE; -+/* Needed in hw_pk11_pub.c as well so that's why it is not static. */ -+CK_SLOT_ID pubkey_SLOTID = 0; -+static CK_SLOT_ID rand_SLOTID = 0; -+static CK_SLOT_ID SLOTID = 0; -+static CK_BBOOL pk11_library_initialized = FALSE; -+static CK_BBOOL pk11_atfork_initialized = FALSE; -+static int pk11_pid = 0; -+ -+static DSO *pk11_dso = NULL; -+ -+/* allocate and initialize all locks used by the engine itself */ -+static int pk11_init_all_locks(void) -+ { -+ int type; -+ -+#ifndef OPENSSL_NO_RSA -+ find_lock[OP_RSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); -+ if (find_lock[OP_RSA] == NULL) -+ goto malloc_err; -+ (void) pthread_mutex_init(find_lock[OP_RSA], NULL); -+#endif /* OPENSSL_NO_RSA */ -+ -+ if ((uri_lock = OPENSSL_malloc(sizeof (pthread_mutex_t))) == NULL) -+ goto malloc_err; -+ (void) pthread_mutex_init(uri_lock, NULL); -+ -+#ifndef OPENSSL_NO_DSA -+ find_lock[OP_DSA] = OPENSSL_malloc(sizeof (pthread_mutex_t)); -+ if (find_lock[OP_DSA] == NULL) -+ goto malloc_err; -+ (void) pthread_mutex_init(find_lock[OP_DSA], NULL); -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+ find_lock[OP_DH] = OPENSSL_malloc(sizeof (pthread_mutex_t)); -+ if (find_lock[OP_DH] == NULL) -+ goto malloc_err; -+ (void) pthread_mutex_init(find_lock[OP_DH], NULL); -+#endif /* OPENSSL_NO_DH */ -+ -+ for (type = 0; type < OP_MAX; type++) -+ { -+ session_cache[type].lock = -+ OPENSSL_malloc(sizeof (pthread_mutex_t)); -+ if (session_cache[type].lock == NULL) -+ goto malloc_err; -+ (void) pthread_mutex_init(session_cache[type].lock, NULL); -+ } -+ -+ return (1); -+ -+malloc_err: -+ pk11_free_all_locks(); -+ PK11err(PK11_F_INIT_ALL_LOCKS, PK11_R_MALLOC_FAILURE); -+ return (0); -+ } -+ -+static void pk11_free_all_locks(void) -+ { -+ int type; -+ -+#ifndef OPENSSL_NO_RSA -+ if (find_lock[OP_RSA] != NULL) -+ { -+ (void) pthread_mutex_destroy(find_lock[OP_RSA]); -+ OPENSSL_free(find_lock[OP_RSA]); -+ find_lock[OP_RSA] = NULL; -+ } -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ if (find_lock[OP_DSA] != NULL) -+ { -+ (void) pthread_mutex_destroy(find_lock[OP_DSA]); -+ OPENSSL_free(find_lock[OP_DSA]); -+ find_lock[OP_DSA] = NULL; -+ } -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ if (find_lock[OP_DH] != NULL) -+ { -+ (void) pthread_mutex_destroy(find_lock[OP_DH]); -+ OPENSSL_free(find_lock[OP_DH]); -+ find_lock[OP_DH] = NULL; -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+ for (type = 0; type < OP_MAX; type++) -+ { -+ if (session_cache[type].lock != NULL) -+ { -+ (void) pthread_mutex_destroy(session_cache[type].lock); -+ OPENSSL_free(session_cache[type].lock); -+ session_cache[type].lock = NULL; -+ } -+ } -+ } -+ -+/* -+ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support. -+ */ -+static int bind_pk11(ENGINE *e) -+ { -+#ifndef OPENSSL_NO_RSA -+ const RSA_METHOD *rsa = NULL; -+ RSA_METHOD *pk11_rsa = PK11_RSA(); -+#endif /* OPENSSL_NO_RSA */ -+ if (!pk11_library_initialized) -+ if (!pk11_library_init(e)) -+ return (0); -+ -+ if (!ENGINE_set_id(e, engine_pk11_id) || -+ !ENGINE_set_name(e, engine_pk11_name) || -+ !ENGINE_set_ciphers(e, pk11_engine_ciphers) || -+ !ENGINE_set_digests(e, pk11_engine_digests)) -+ return (0); -+#ifndef OPENSSL_NO_RSA -+ if (pk11_have_rsa == CK_TRUE) -+ { -+ if (!ENGINE_set_RSA(e, PK11_RSA()) || -+ !ENGINE_set_load_privkey_function(e, pk11_load_privkey) || -+ !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey)) -+ return (0); -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered RSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ if (pk11_have_dsa == CK_TRUE) -+ { -+ if (!ENGINE_set_DSA(e, PK11_DSA())) -+ return (0); -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ if (pk11_have_dh == CK_TRUE) -+ { -+ if (!ENGINE_set_DH(e, PK11_DH())) -+ return (0); -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DH\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DH */ -+ if (pk11_have_random) -+ { -+ if (!ENGINE_set_RAND(e, &pk11_random)) -+ return (0); -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered random\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+ if (!ENGINE_set_init_function(e, pk11_init) || -+ !ENGINE_set_destroy_function(e, pk11_destroy) || -+ !ENGINE_set_finish_function(e, pk11_finish) || -+ !ENGINE_set_ctrl_function(e, pk11_ctrl) || -+ !ENGINE_set_cmd_defns(e, pk11_cmd_defns)) -+ return (0); -+ -+/* -+ * Apache calls OpenSSL function RSA_blinding_on() once during startup -+ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp -+ * here, we wire it back to the OpenSSL software implementation. -+ * Since it is used only once, performance is not a concern. -+ */ -+#ifndef OPENSSL_NO_RSA -+ rsa = RSA_PKCS1_SSLeay(); -+ pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp; -+ pk11_rsa->bn_mod_exp = rsa->bn_mod_exp; -+#endif /* OPENSSL_NO_RSA */ -+ -+ /* Ensure the pk11 error handling is set up */ -+ ERR_load_pk11_strings(); -+ -+ return (1); -+ } -+ -+/* Dynamic engine support is disabled at a higher level for Solaris */ -+#ifdef ENGINE_DYNAMIC_SUPPORT -+static int bind_helper(ENGINE *e, const char *id) -+ { -+ if (id && (strcmp(id, engine_pk11_id) != 0)) -+ return (0); -+ -+ if (!bind_pk11(e)) -+ return (0); -+ -+ return (1); -+ } -+ -+IMPLEMENT_DYNAMIC_CHECK_FN() -+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) -+ -+#else -+static ENGINE *engine_pk11(void) -+ { -+ ENGINE *ret = ENGINE_new(); -+ -+ if (!ret) -+ return (NULL); -+ -+ if (!bind_pk11(ret)) -+ { -+ ENGINE_free(ret); -+ return (NULL); -+ } -+ -+ return (ret); -+ } -+ -+void -+ENGINE_load_pk11(void) -+ { -+ ENGINE *e_pk11 = NULL; -+ -+ /* -+ * Do not use dynamic PKCS#11 library on Solaris due to -+ * security reasons. We will link it in statically. -+ */ -+ /* Attempt to load PKCS#11 library */ -+ if (!pk11_dso) -+ pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0); -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE); -+ return; -+ } -+ -+ e_pk11 = engine_pk11(); -+ if (!e_pk11) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ return; -+ } -+ -+ /* -+ * At this point, the pk11 shared library is either dynamically -+ * loaded or statically linked in. So, initialize the pk11 -+ * library before calling ENGINE_set_default since the latter -+ * needs cipher and digest algorithm information -+ */ -+ if (!pk11_library_init(e_pk11)) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ ENGINE_free(e_pk11); -+ return; -+ } -+ -+ ENGINE_add(e_pk11); -+ -+ ENGINE_free(e_pk11); -+ ERR_clear_error(); -+ } -+#endif /* ENGINE_DYNAMIC_SUPPORT */ -+ -+/* -+ * These are the static string constants for the DSO file name and -+ * the function symbol names to bind to. -+ */ -+static const char *PK11_LIBNAME = NULL; -+ -+static const char *get_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ return (PK11_LIBNAME); -+ -+ return (def_PK11_LIBNAME); -+ } -+ -+static void free_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ OPENSSL_free((void*)PK11_LIBNAME); -+ -+ PK11_LIBNAME = NULL; -+ } -+ -+static long set_PK11_LIBNAME(const char *name) -+ { -+ free_PK11_LIBNAME(); -+ -+ return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0); -+ } -+ -+/* acquire all engine specific mutexes before fork */ -+static void pk11_fork_prepare(void) -+ { -+ int i; -+ -+ if (!pk11_library_initialized) -+ return; -+ -+ LOCK_OBJSTORE(OP_RSA); -+ LOCK_OBJSTORE(OP_DSA); -+ LOCK_OBJSTORE(OP_DH); -+ (void) pthread_mutex_lock(uri_lock); -+ for (i = 0; i < OP_MAX; i++) -+ { -+ (void) pthread_mutex_lock(session_cache[i].lock); -+ } -+ } -+ -+/* release all engine specific mutexes */ -+static void pk11_fork_parent(void) -+ { -+ int i; -+ -+ if (!pk11_library_initialized) -+ return; -+ -+ for (i = OP_MAX - 1; i >= 0; i--) -+ { -+ (void) pthread_mutex_unlock(session_cache[i].lock); -+ } -+ UNLOCK_OBJSTORE(OP_DH); -+ UNLOCK_OBJSTORE(OP_DSA); -+ UNLOCK_OBJSTORE(OP_RSA); -+ (void) pthread_mutex_unlock(uri_lock); -+ } -+ -+/* -+ * same situation as in parent - we need to unlock all locks to make them -+ * accessible to all threads. -+ */ -+static void pk11_fork_child(void) -+ { -+ int i; -+ -+ if (!pk11_library_initialized) -+ return; -+ -+ for (i = OP_MAX - 1; i >= 0; i--) -+ { -+ (void) pthread_mutex_unlock(session_cache[i].lock); -+ } -+ UNLOCK_OBJSTORE(OP_DH); -+ UNLOCK_OBJSTORE(OP_DSA); -+ UNLOCK_OBJSTORE(OP_RSA); -+ (void) pthread_mutex_unlock(uri_lock); -+ } -+ -+/* Initialization function for the pk11 engine */ -+static int pk11_init(ENGINE *e) -+{ -+ return (pk11_library_init(e)); -+} -+ -+/* -+ * Initialization function. Sets up various PKCS#11 library components. -+ * It selects a slot based on predefined critiera. In the process, it also -+ * count how many ciphers and digests to support. Since the cipher and -+ * digest information is needed when setting default engine, this function -+ * needs to be called before calling ENGINE_set_default. -+ */ -+/* ARGSUSED */ -+static int pk11_library_init(ENGINE *e) -+ { -+ CK_C_GetFunctionList p; -+ CK_RV rv = CKR_OK; -+ CK_INFO info; -+ CK_ULONG ul_state_len; -+ int any_slot_found; -+ int i; -+ -+ /* -+ * pk11_library_initialized is set to 0 in pk11_finish() which is called -+ * from ENGINE_finish(). However, if there is still at least one -+ * existing functional reference to the engine (see engine(3) for more -+ * information), pk11_finish() is skipped. For example, this can happen -+ * if an application forgets to clear one cipher context. In case of a -+ * fork() when the application is finishing the engine so that it can be -+ * reinitialized in the child, forgotten functional reference causes -+ * pk11_library_initialized to stay 1. In that case we need the PID -+ * check so that we properly initialize the engine again. -+ */ -+ if (pk11_library_initialized) -+ { -+ if (pk11_pid == getpid()) -+ { -+ return (1); -+ } -+ else -+ { -+ global_session = CK_INVALID_HANDLE; -+ /* -+ * free the locks first to prevent memory leak in case -+ * the application calls fork() without finishing the -+ * engine first. -+ */ -+ pk11_free_all_locks(); -+ } -+ } -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+#ifdef SOLARIS_AES_CTR -+ /* -+ * We must do this before we start working with slots since we need all -+ * NIDs there. -+ */ -+ if (pk11_add_aes_ctr_NIDs() == 0) -+ goto err; -+#endif /* SOLARIS_AES_CTR */ -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+ /* get the C_GetFunctionList function from the loaded library */ -+ p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, -+ PK11_GET_FUNCTION_LIST); -+ if (!p) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+ /* get the full function list from the loaded library */ -+ rv = p(&pFuncList); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_GetInfo(&info); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv); -+ goto err; -+ } -+ -+ if (pk11_choose_slots(&any_slot_found) == 0) -+ goto err; -+ -+ /* -+ * The library we use, set in def_PK11_LIBNAME, may not offer any -+ * slot(s). In that case, we must not proceed but we must not return an -+ * error. The reason is that applications that try to set up the PKCS#11 -+ * engine don't exit on error during the engine initialization just -+ * because no slot was present. -+ */ -+ if (any_slot_found == 0) -+ return (1); -+ -+ if (global_session == CK_INVALID_HANDLE) -+ { -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, -+ PK11_R_OPENSESSION, rv); -+ goto err; -+ } -+ } -+ -+ /* -+ * Disable digest if C_GetOperationState is not supported since -+ * this function is required by OpenSSL digest copy function -+ */ -+ if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len) -+ == CKR_FUNCTION_NOT_SUPPORTED) { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: C_GetOperationState() not supported, " -+ "setting digest_count to 0\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ digest_count = 0; -+ } -+ -+ pk11_library_initialized = TRUE; -+ pk11_pid = getpid(); -+ /* -+ * if initialization of the locks fails pk11_init_all_locks() -+ * will do the cleanup. -+ */ -+ if (!pk11_init_all_locks()) -+ goto err; -+ for (i = 0; i < OP_MAX; i++) -+ session_cache[i].head = NULL; -+ /* -+ * initialize active lists. We only use active lists -+ * for asymmetric ciphers. -+ */ -+ for (i = 0; i < OP_MAX; i++) -+ active_list[i] = NULL; -+ -+ if (!pk11_atfork_initialized) -+ { -+ if (pthread_atfork(pk11_fork_prepare, pk11_fork_parent, -+ pk11_fork_child) != 0) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_ATFORK_FAILED); -+ goto err; -+ } -+ pk11_atfork_initialized = TRUE; -+ } -+ -+ return (1); -+ -+err: -+ return (0); -+ } -+ -+/* Destructor (complements the "ENGINE_pk11()" constructor) */ -+/* ARGSUSED */ -+static int pk11_destroy(ENGINE *e) -+ { -+ free_PK11_LIBNAME(); -+ ERR_unload_pk11_strings(); -+ return (1); -+ } -+ -+/* -+ * Termination function to clean up the session, the token, and the pk11 -+ * library. -+ */ -+/* ARGSUSED */ -+static int pk11_finish(ENGINE *e) -+ { -+ int i; -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED); -+ goto err; -+ } -+ -+ OPENSSL_assert(pFuncList != NULL); -+ -+ if (pk11_free_all_sessions() == 0) -+ goto err; -+ -+ /* free all active lists */ -+ for (i = 0; i < OP_MAX; i++) -+ pk11_free_active_list(i); -+ -+ pFuncList->C_CloseSession(global_session); -+ global_session = CK_INVALID_HANDLE; -+ -+ /* -+ * Since we are part of a library (libcrypto.so), calling this function -+ * may have side-effects. -+ */ -+#if 0 -+ pFuncList->C_Finalize(NULL); -+#endif -+ -+ if (!DSO_free(pk11_dso)) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ pk11_dso = NULL; -+ pFuncList = NULL; -+ pk11_library_initialized = FALSE; -+ pk11_pid = 0; -+ /* -+ * There is no way how to unregister atfork handlers (other than -+ * unloading the library) so we just free the locks. For this reason -+ * the atfork handlers check if the engine is initialized and bail out -+ * immediately if not. This is necessary in case a process finishes -+ * the engine before calling fork(). -+ */ -+ pk11_free_all_locks(); -+ -+ return (1); -+ -+err: -+ return (0); -+ } -+ -+/* Standard engine interface function to set the dynamic library path */ -+/* ARGSUSED */ -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) -+ { -+ int initialized = ((pk11_dso == NULL) ? 0 : 1); -+ -+ switch (cmd) -+ { -+ case PK11_CMD_SO_PATH: -+ if (p == NULL) -+ { -+ PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER); -+ return (0); -+ } -+ -+ if (initialized) -+ { -+ PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED); -+ return (0); -+ } -+ -+ return (set_PK11_LIBNAME((const char *)p)); -+ default: -+ break; -+ } -+ -+ PK11err(PK11_F_CTRL, PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED); -+ -+ return (0); -+ } -+ -+ -+/* Required function by the engine random interface. It does nothing here */ -+static void pk11_rand_cleanup(void) -+ { -+ return; -+ } -+ -+/* ARGSUSED */ -+static void pk11_rand_add(const void *buf, int num, double add) -+ { -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return; -+ -+ /* -+ * Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since -+ * the calling functions do not care anyway -+ */ -+ pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num); -+ pk11_return_session(sp, OP_RAND); -+ -+ return; -+ } -+ -+static void pk11_rand_seed(const void *buf, int num) -+ { -+ pk11_rand_add(buf, num, 0); -+ } -+ -+static int pk11_rand_bytes(unsigned char *buf, int num) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return (0); -+ -+ rv = pFuncList->C_GenerateRandom(sp->session, buf, num); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv); -+ pk11_return_session(sp, OP_RAND); -+ return (0); -+ } -+ -+ pk11_return_session(sp, OP_RAND); -+ return (1); -+ } -+ -+/* Required function by the engine random interface. It does nothing here */ -+static int pk11_rand_status(void) -+ { -+ return (1); -+ } -+ -+/* Free all BIGNUM structures from PK11_SESSION. */ -+static void pk11_free_nums(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ switch (optype) -+ { -+#ifndef OPENSSL_NO_RSA -+ case OP_RSA: -+ if (sp->opdata_rsa_n_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_n_num); -+ sp->opdata_rsa_n_num = NULL; -+ } -+ if (sp->opdata_rsa_e_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_e_num); -+ sp->opdata_rsa_e_num = NULL; -+ } -+ if (sp->opdata_rsa_d_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_d_num); -+ sp->opdata_rsa_d_num = NULL; -+ } -+ break; -+#endif -+#ifndef OPENSSL_NO_DSA -+ case OP_DSA: -+ if (sp->opdata_dsa_pub_num != NULL) -+ { -+ BN_free(sp->opdata_dsa_pub_num); -+ sp->opdata_dsa_pub_num = NULL; -+ } -+ if (sp->opdata_dsa_priv_num != NULL) -+ { -+ BN_free(sp->opdata_dsa_priv_num); -+ sp->opdata_dsa_priv_num = NULL; -+ } -+ break; -+#endif -+#ifndef OPENSSL_NO_DH -+ case OP_DH: -+ if (sp->opdata_dh_priv_num != NULL) -+ { -+ BN_free(sp->opdata_dh_priv_num); -+ sp->opdata_dh_priv_num = NULL; -+ } -+ break; -+#endif -+ default: -+ break; -+ } -+ } -+ -+/* -+ * Get new PK11_SESSION structure ready for use. Every process must have -+ * its own freelist of PK11_SESSION structures so handle fork() here -+ * by destroying the old and creating new freelist. -+ * The returned PK11_SESSION structure is disconnected from the freelist. -+ */ -+PK11_SESSION * -+pk11_get_session(PK11_OPTYPE optype) -+ { -+ PK11_SESSION *sp = NULL, *sp1, *freelist; -+ pthread_mutex_t *freelist_lock; -+ static pid_t pid = 0; -+ pid_t new_pid; -+ CK_RV rv; -+ -+ switch (optype) -+ { -+ case OP_RSA: -+ case OP_DSA: -+ case OP_DH: -+ case OP_RAND: -+ case OP_DIGEST: -+ case OP_CIPHER: -+ freelist_lock = session_cache[optype].lock; -+ break; -+ default: -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return (NULL); -+ } -+ (void) pthread_mutex_lock(freelist_lock); -+ -+ /* -+ * Will use it to find out if we forked. We cannot use the PID field in -+ * the session structure because we could get a newly allocated session -+ * here, with no PID information. -+ */ -+ if (pid == 0) -+ pid = getpid(); -+ -+ freelist = session_cache[optype].head; -+ sp = freelist; -+ -+ /* -+ * If the free list is empty, allocate new unitialized (filled -+ * with zeroes) PK11_SESSION structure otherwise return first -+ * structure from the freelist. -+ */ -+ if (sp == NULL) -+ { -+ if ((sp = OPENSSL_malloc(sizeof (PK11_SESSION))) == NULL) -+ { -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ (void) memset(sp, 0, sizeof (PK11_SESSION)); -+ -+ /* -+ * It is a new session so it will look like a cache miss to the -+ * code below. So, we must not try to to destroy its members so -+ * mark them as unused. -+ */ -+ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; -+ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; -+ } -+ else -+ freelist = sp->next; -+ -+ /* -+ * Check whether we have forked. In that case, we must get rid of all -+ * inherited sessions and start allocating new ones. -+ */ -+ if (pid != (new_pid = getpid())) -+ { -+ pid = new_pid; -+ -+ /* -+ * We are a new process and thus need to free any inherited -+ * PK11_SESSION objects aside from the first session (sp) which -+ * is the only PK11_SESSION structure we will reuse (for the -+ * head of the list). -+ */ -+ while ((sp1 = freelist) != NULL) -+ { -+ freelist = sp1->next; -+ /* -+ * NOTE: we do not want to call pk11_free_all_sessions() -+ * here because it would close underlying PKCS#11 -+ * sessions and destroy all objects. -+ */ -+ pk11_free_nums(sp1, optype); -+ OPENSSL_free(sp1); -+ } -+ -+ /* we have to free the active list as well. */ -+ pk11_free_active_list(optype); -+ -+ /* Initialize the process */ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* -+ * Choose slot here since the slot table is different on this -+ * process. If we are here then we must have found at least one -+ * usable slot before so we don't need to check any_slot_found. -+ * See pk11_library_init()'s usage of this function for more -+ * information. -+ */ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ if (pk11_choose_slots(NULL) == 0) -+ goto err; -+ -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* -+ * It is an inherited session from our parent so it needs -+ * re-initialization. -+ */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ if (pk11_token_relogin(sp->session) == 0) -+ { -+ /* -+ * We will keep the session in the cache list and let -+ * the caller cope with the situation. -+ */ -+ freelist = sp; -+ sp = NULL; -+ goto err; -+ } -+ } -+ -+ if (sp->pid == 0) -+ { -+ /* It is a new session and needs initialization. */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ } -+ } -+ -+ /* set new head for the list of PK11_SESSION objects */ -+ session_cache[optype].head = freelist; -+ -+err: -+ if (sp != NULL) -+ sp->next = NULL; -+ -+ (void) pthread_mutex_unlock(freelist_lock); -+ -+ return (sp); -+ } -+ -+ -+void -+pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ pthread_mutex_t *freelist_lock; -+ PK11_SESSION *freelist; -+ -+ /* -+ * If this is a session from the parent it will be taken care of and -+ * freed in pk11_get_session() as part of the post-fork clean up the -+ * next time we will ask for a new session. -+ */ -+ if (sp == NULL || sp->pid != getpid()) -+ return; -+ -+ switch (optype) -+ { -+ case OP_RSA: -+ case OP_DSA: -+ case OP_DH: -+ case OP_RAND: -+ case OP_DIGEST: -+ case OP_CIPHER: -+ freelist_lock = session_cache[optype].lock; -+ break; -+ default: -+ PK11err(PK11_F_RETURN_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return; -+ } -+ -+ (void) pthread_mutex_lock(freelist_lock); -+ freelist = session_cache[optype].head; -+ sp->next = freelist; -+ session_cache[optype].head = sp; -+ (void) pthread_mutex_unlock(freelist_lock); -+ } -+ -+ -+/* Destroy all objects. This function is called when the engine is finished */ -+static int pk11_free_all_sessions() -+ { -+ int ret = 1; -+ int type; -+ -+#ifndef OPENSSL_NO_RSA -+ (void) pk11_destroy_rsa_key_objects(NULL); -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ (void) pk11_destroy_dsa_key_objects(NULL); -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ (void) pk11_destroy_dh_key_objects(NULL); -+#endif /* OPENSSL_NO_DH */ -+ (void) pk11_destroy_cipher_key_objects(NULL); -+ -+ /* -+ * We try to release as much as we can but any error means that we will -+ * return 0 on exit. -+ */ -+ for (type = 0; type < OP_MAX; type++) -+ { -+ if (pk11_free_session_list(type) == 0) -+ ret = 0; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy session structures from the linked list specified. Free as many -+ * sessions as possible but any failure in C_CloseSession() means that we -+ * return an error on return. -+ */ -+static int pk11_free_session_list(PK11_OPTYPE optype) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *freelist = NULL; -+ pid_t mypid = getpid(); -+ pthread_mutex_t *freelist_lock; -+ int ret = 1; -+ -+ switch (optype) -+ { -+ case OP_RSA: -+ case OP_DSA: -+ case OP_DH: -+ case OP_RAND: -+ case OP_DIGEST: -+ case OP_CIPHER: -+ freelist_lock = session_cache[optype].lock; -+ break; -+ default: -+ PK11err(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return (0); -+ } -+ -+ (void) pthread_mutex_lock(freelist_lock); -+ freelist = session_cache[optype].head; -+ while ((sp = freelist) != NULL) -+ { -+ if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid) -+ { -+ rv = pFuncList->C_CloseSession(sp->session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_CLOSESESSION, rv); -+ ret = 0; -+ } -+ } -+ freelist = sp->next; -+ pk11_free_nums(sp, optype); -+ OPENSSL_free(sp); -+ } -+ -+ (void) pthread_mutex_unlock(freelist_lock); -+ return (ret); -+ } -+ -+ -+static int -+pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ CK_RV rv; -+ CK_SLOT_ID myslot; -+ -+ switch (optype) -+ { -+ case OP_RSA: -+ case OP_DSA: -+ case OP_DH: -+ myslot = pubkey_SLOTID; -+ break; -+ case OP_RAND: -+ myslot = rand_SLOTID; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ myslot = SLOTID; -+ break; -+ default: -+ PK11err(PK11_F_SETUP_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return (0); -+ } -+ -+ sp->session = CK_INVALID_HANDLE; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ if (rv == CKR_CRYPTOKI_NOT_INITIALIZED) -+ { -+ /* -+ * We are probably a child process so force the -+ * reinitialize of the session -+ */ -+ pk11_library_initialized = FALSE; -+ if (!pk11_library_init(NULL)) -+ return (0); -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ } -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); -+ return (0); -+ } -+ -+ sp->pid = getpid(); -+ -+ switch (optype) -+ { -+#ifndef OPENSSL_NO_RSA -+ case OP_RSA: -+ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; -+ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; -+ sp->opdata_rsa_pub = NULL; -+ sp->opdata_rsa_n_num = NULL; -+ sp->opdata_rsa_e_num = NULL; -+ sp->opdata_rsa_priv = NULL; -+ sp->opdata_rsa_d_num = NULL; -+ break; -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ case OP_DSA: -+ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; -+ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; -+ sp->opdata_dsa_pub = NULL; -+ sp->opdata_dsa_pub_num = NULL; -+ sp->opdata_dsa_priv = NULL; -+ sp->opdata_dsa_priv_num = NULL; -+ break; -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ case OP_DH: -+ sp->opdata_dh_key = CK_INVALID_HANDLE; -+ sp->opdata_dh = NULL; -+ sp->opdata_dh_priv_num = NULL; -+ break; -+#endif /* OPENSSL_NO_DH */ -+ case OP_CIPHER: -+ sp->opdata_cipher_key = CK_INVALID_HANDLE; -+ sp->opdata_encrypt = -1; -+ break; -+ } -+ -+ /* -+ * We always initialize the session as containing a non-persistent -+ * object. The key load functions set it to persistent if that is so. -+ */ -+ sp->persistent = CK_FALSE; -+ return (1); -+ } -+ -+#ifndef OPENSSL_NO_RSA -+/* Destroy RSA public key from single session. */ -+int -+pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->opdata_rsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_pub_key, -+ ret, uselock, OP_RSA); -+ sp->opdata_rsa_pub_key = CK_INVALID_HANDLE; -+ sp->opdata_rsa_pub = NULL; -+ if (sp->opdata_rsa_n_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_n_num); -+ sp->opdata_rsa_n_num = NULL; -+ } -+ if (sp->opdata_rsa_e_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_e_num); -+ sp->opdata_rsa_e_num = NULL; -+ } -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy RSA private key from single session. */ -+int -+pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->opdata_rsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp, sp->opdata_rsa_priv_key, -+ ret, uselock, OP_RSA); -+ sp->opdata_rsa_priv_key = CK_INVALID_HANDLE; -+ sp->opdata_rsa_priv = NULL; -+ if (sp->opdata_rsa_d_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_d_num); -+ sp->opdata_rsa_d_num = NULL; -+ } -+ -+ /* -+ * For the RSA key by reference code, public components 'n'/'e' -+ * are the key components we use to check for the cache hit. We -+ * must free those as well. -+ */ -+ if (sp->opdata_rsa_n_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_n_num); -+ sp->opdata_rsa_n_num = NULL; -+ } -+ if (sp->opdata_rsa_e_num != NULL) -+ { -+ BN_free(sp->opdata_rsa_e_num); -+ sp->opdata_rsa_e_num = NULL; -+ } -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy RSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int -+pk11_destroy_rsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ (void) pthread_mutex_lock(session_cache[OP_RSA].lock); -+ local_free_session = session_cache[OP_RSA].head; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_rsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_rsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ (void) pthread_mutex_unlock(session_cache[OP_RSA].lock); -+ -+ return (ret); -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+/* Destroy DSA public key from single session. */ -+int -+pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->opdata_dsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_pub_key, -+ ret, uselock, OP_DSA); -+ sp->opdata_dsa_pub_key = CK_INVALID_HANDLE; -+ sp->opdata_dsa_pub = NULL; -+ if (sp->opdata_dsa_pub_num != NULL) -+ { -+ BN_free(sp->opdata_dsa_pub_num); -+ sp->opdata_dsa_pub_num = NULL; -+ } -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy DSA private key from single session. */ -+int -+pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->opdata_dsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp, sp->opdata_dsa_priv_key, -+ ret, uselock, OP_DSA); -+ sp->opdata_dsa_priv_key = CK_INVALID_HANDLE; -+ sp->opdata_dsa_priv = NULL; -+ if (sp->opdata_dsa_priv_num != NULL) -+ { -+ BN_free(sp->opdata_dsa_priv_num); -+ sp->opdata_dsa_priv_num = NULL; -+ } -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int -+pk11_destroy_dsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ (void) pthread_mutex_lock(session_cache[OP_DSA].lock); -+ local_free_session = session_cache[OP_DSA].head; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_dsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ (void) pthread_mutex_unlock(session_cache[OP_DSA].lock); -+ -+ return (ret); -+ } -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+/* Destroy DH key from single session. */ -+int -+pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->opdata_dh_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp, sp->opdata_dh_key, -+ ret, uselock, OP_DH); -+ sp->opdata_dh_key = CK_INVALID_HANDLE; -+ sp->opdata_dh = NULL; -+ if (sp->opdata_dh_priv_num != NULL) -+ { -+ BN_free(sp->opdata_dh_priv_num); -+ sp->opdata_dh_priv_num = NULL; -+ } -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DH key object wrapper. -+ * -+ * arg0: pointer to PKCS#11 engine session structure -+ * if session is NULL, try to destroy all objects in the free list -+ */ -+int -+pk11_destroy_dh_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ (void) pthread_mutex_lock(session_cache[OP_DH].lock); -+ local_free_session = session_cache[OP_DH].head; -+ uselock = FALSE; -+ } -+ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dh_object(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+err: -+ if (session == NULL) -+ (void) pthread_mutex_unlock(session_cache[OP_DH].lock); -+ -+ return (ret); -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+static int -+pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh, -+ CK_BBOOL persistent) -+ { -+ CK_RV rv; -+ -+ /* -+ * We never try to destroy persistent objects which are the objects -+ * stored in the keystore. Also, we always use read-only sessions so -+ * C_DestroyObject() would be returning CKR_SESSION_READ_ONLY here. -+ */ -+ if (persistent == CK_TRUE) -+ return (1); -+ -+ rv = pFuncList->C_DestroyObject(session, oh); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT, -+ rv); -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+ -+/* Symmetric ciphers and digests support functions */ -+ -+static int -+cipher_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_CIPHER_MAX; i++) -+ if (ciphers[i].nid == nid) -+ return (ciphers[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_usable_ciphers(const int **nids) -+ { -+ if (cipher_count > 0) -+ *nids = cipher_nids; -+ else -+ *nids = NULL; -+ return (cipher_count); -+ } -+ -+static int -+pk11_usable_digests(const int **nids) -+ { -+ if (digest_count > 0) -+ *nids = digest_nids; -+ else -+ *nids = NULL; -+ return (digest_count); -+ } -+ -+/* -+ * Init context for encryption or decryption using a symmetric key. -+ */ -+static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher, -+ PK11_SESSION *sp, CK_MECHANISM_PTR pmech) -+ { -+ CK_RV rv; -+#ifdef SOLARIS_AES_CTR -+ CK_AES_CTR_PARAMS ctr_params; -+#endif /* SOLARIS_AES_CTR */ -+ -+ /* -+ * We expect pmech->mechanism to be already set and -+ * pParameter/ulParameterLen initialized to NULL/0 before -+ * pk11_init_symetric() is called. -+ */ -+ OPENSSL_assert(pmech->mechanism != NULL); -+ OPENSSL_assert(pmech->pParameter == NULL); -+ OPENSSL_assert(pmech->ulParameterLen == 0); -+ -+#ifdef SOLARIS_AES_CTR -+ if (ctx->cipher->nid == NID_aes_128_ctr || -+ ctx->cipher->nid == NID_aes_192_ctr || -+ ctx->cipher->nid == NID_aes_256_ctr) -+ { -+ pmech->pParameter = (void *)(&ctr_params); -+ pmech->ulParameterLen = sizeof (ctr_params); -+ /* -+ * For now, we are limited to the fixed length of the counter, -+ * it covers the whole counter block. That's what RFC 4344 -+ * needs. For more information on internal structure of the -+ * counter block, see RFC 3686. If needed in the future, we can -+ * add code so that the counter length can be set via -+ * ENGINE_ctrl() function. -+ */ -+ ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8; -+ OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE); -+ (void) memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE); -+ } -+ else -+#endif /* SOLARIS_AES_CTR */ -+ { -+ if (pcipher->iv_len > 0) -+ { -+ pmech->pParameter = (void *)ctx->iv; -+ pmech->ulParameterLen = pcipher->iv_len; -+ } -+ } -+ -+ /* if we get here, the encryption needs to be reinitialized */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptInit(sp->session, pmech, -+ sp->opdata_cipher_key); -+ else -+ rv = pFuncList->C_DecryptInit(sp->session, pmech, -+ sp->opdata_cipher_key); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ? -+ PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv); -+ pk11_return_session(sp, OP_CIPHER); -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+/* ARGSUSED */ -+static int -+pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+ { -+ CK_MECHANISM mech; -+ int index; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ PK11_CIPHER *p_ciph_table_row; -+ -+ state->sp = NULL; -+ -+ index = cipher_nid_to_pk11(ctx->cipher->nid); -+ if (index < 0 || index >= PK11_CIPHER_MAX) -+ return (0); -+ -+ p_ciph_table_row = &ciphers[index]; -+ /* -+ * iv_len in the ctx->cipher structure is the maximum IV length for the -+ * current cipher and it must be less or equal to the IV length in our -+ * ciphers table. The key length must be in the allowed interval. From -+ * all cipher modes that the PKCS#11 engine supports only RC4 allows a -+ * key length to be in some range, all other NIDs have a precise key -+ * length. Every application can define its own EVP functions so this -+ * code serves as a sanity check. -+ * -+ * Note that the reason why the IV length in ctx->cipher might be -+ * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs -+ * macro to define functions that return EVP structures for all DES -+ * modes. So, even ECB modes get 8 byte IV. -+ */ -+ if (ctx->cipher->iv_len < p_ciph_table_row->iv_len || -+ ctx->key_len < p_ciph_table_row->min_key_len || -+ ctx->key_len > p_ciph_table_row->max_key_len) { -+ PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM); -+ return (0); -+ } -+ -+ if ((sp = pk11_get_session(OP_CIPHER)) == NULL) -+ return (0); -+ -+ /* if applicable, the mechanism parameter is used for IV */ -+ mech.mechanism = p_ciph_table_row->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ /* The key object is destroyed here if it is not the current key. */ -+ (void) check_new_cipher_key(sp, key, ctx->key_len); -+ -+ /* -+ * If the key is the same and the encryption is also the same, then -+ * just reuse it. However, we must not forget to reinitialize the -+ * context that was finalized in pk11_cipher_cleanup(). -+ */ -+ if (sp->opdata_cipher_key != CK_INVALID_HANDLE && -+ sp->opdata_encrypt == ctx->encrypt) -+ { -+ state->sp = sp; -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ return (1); -+ } -+ -+ /* -+ * Check if the key has been invalidated. If so, a new key object -+ * needs to be created. -+ */ -+ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) -+ { -+ sp->opdata_cipher_key = pk11_get_cipher_key( -+ ctx, key, p_ciph_table_row->key_type, sp); -+ } -+ -+ if (sp->opdata_encrypt != ctx->encrypt && sp->opdata_encrypt != -1) -+ { -+ /* -+ * The previous encryption/decryption is different. Need to -+ * terminate the previous * active encryption/decryption here. -+ */ -+ if (!pk11_cipher_final(sp)) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return (0); -+ } -+ } -+ -+ if (sp->opdata_cipher_key == CK_INVALID_HANDLE) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return (0); -+ } -+ -+ /* now initialize the context with a new key */ -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ sp->opdata_encrypt = ctx->encrypt; -+ state->sp = sp; -+ -+ return (1); -+ } -+ -+/* -+ * When reusing the same key in an encryption/decryption session for a -+ * decryption/encryption session, we need to close the active session -+ * and recreate a new one. Note that the key is in the global session so -+ * that it needs not be recreated. -+ * -+ * It is more appropriate to use C_En/DecryptFinish here. At the time of this -+ * development, these two functions in the PKCS#11 libraries used return -+ * unexpected errors when passing in 0 length output. It may be a good -+ * idea to try them again if performance is a problem here and fix -+ * C_En/DecryptFinial if there are bugs there causing the problem. -+ */ -+static int -+pk11_cipher_final(PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ -+ rv = pFuncList->C_CloseSession(sp->session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv); -+ return (0); -+ } -+ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv); -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+/* -+ * An engine interface function. The calling function allocates sufficient -+ * memory for the output buffer "out" to hold the results. -+ */ -+static int -+pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl) -+ { -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ CK_RV rv; -+ unsigned long outl = inl; -+ -+ if (state == NULL || state->sp == NULL) -+ return (0); -+ -+ sp = (PK11_SESSION *) state->sp; -+ -+ if (!inl) -+ return (1); -+ -+ /* RC4 is the only stream cipher we support */ -+ if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0) -+ return (0); -+ -+ if (ctx->encrypt) -+ { -+ rv = pFuncList->C_EncryptUpdate(sp->session, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_ENCRYPTUPDATE, rv); -+ return (0); -+ } -+ } -+ else -+ { -+ rv = pFuncList->C_DecryptUpdate(sp->session, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_DECRYPTUPDATE, rv); -+ return (0); -+ } -+ } -+ -+ /* -+ * For DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always -+ * the same size of input. -+ * The application has guaranteed to call the block ciphers with -+ * correctly aligned buffers. -+ */ -+ if (inl != outl) -+ return (0); -+ -+ return (1); -+ } -+ -+/* -+ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal() -+ * here is the right thing because in EVP_DecryptFinal_ex(), engine's -+ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but -+ * the engine can't find out that it's the finalizing call. We wouldn't -+ * necessarily have to finalize the context here since reinitializing it with -+ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness, -+ * let's do it. Some implementations might leak memory if the previously used -+ * context is initialized without finalizing it first. -+ */ -+static int -+pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_ULONG len = EVP_MAX_BLOCK_LENGTH; -+ CK_BYTE buf[EVP_MAX_BLOCK_LENGTH]; -+ PK11_CIPHER_STATE *state = ctx->cipher_data; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * We are not interested in the data here, we just need to get -+ * rid of the context. -+ */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptFinal( -+ state->sp->session, buf, &len); -+ else -+ rv = pFuncList->C_DecryptFinal( -+ state->sp->session, buf, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ? -+ PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv); -+ pk11_return_session(state->sp, OP_CIPHER); -+ return (0); -+ } -+ -+ pk11_return_session(state->sp, OP_CIPHER); -+ state->sp = NULL; -+ } -+ -+ return (1); -+ } -+ -+/* -+ * Registered by the ENGINE when used to find out how to deal with -+ * a particular NID in the ENGINE. This says what we'll do at the -+ * top level - note, that list is restricted by what we answer with -+ */ -+/* ARGSUSED */ -+static int -+pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid) -+ { -+ if (!cipher) -+ return (pk11_usable_ciphers(nids)); -+ -+ switch (nid) -+ { -+ case NID_des_ede3_cbc: -+ *cipher = &pk11_3des_cbc; -+ break; -+ case NID_des_cbc: -+ *cipher = &pk11_des_cbc; -+ break; -+ case NID_des_ede3_ecb: -+ *cipher = &pk11_3des_ecb; -+ break; -+ case NID_des_ecb: -+ *cipher = &pk11_des_ecb; -+ break; -+ case NID_aes_128_cbc: -+ *cipher = &pk11_aes_128_cbc; -+ break; -+ case NID_aes_192_cbc: -+ *cipher = &pk11_aes_192_cbc; -+ break; -+ case NID_aes_256_cbc: -+ *cipher = &pk11_aes_256_cbc; -+ break; -+ case NID_aes_128_ecb: -+ *cipher = &pk11_aes_128_ecb; -+ break; -+ case NID_aes_192_ecb: -+ *cipher = &pk11_aes_192_ecb; -+ break; -+ case NID_aes_256_ecb: -+ *cipher = &pk11_aes_256_ecb; -+ break; -+ case NID_bf_cbc: -+ *cipher = &pk11_bf_cbc; -+ break; -+ case NID_rc4: -+ *cipher = &pk11_rc4; -+ break; -+ default: -+#ifdef SOLARIS_AES_CTR -+ /* -+ * These can't be in separated cases because the NIDs -+ * here are not constants. -+ */ -+ if (nid == NID_aes_128_ctr) -+ *cipher = &pk11_aes_128_ctr; -+ else if (nid == NID_aes_192_ctr) -+ *cipher = &pk11_aes_192_ctr; -+ else if (nid == NID_aes_256_ctr) -+ *cipher = &pk11_aes_256_ctr; -+ else -+#endif /* SOLARIS_AES_CTR */ -+ *cipher = NULL; -+ break; -+ } -+ return (*cipher != NULL); -+ } -+ -+/* ARGSUSED */ -+static int -+pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid) -+ { -+ if (!digest) -+ return (pk11_usable_digests(nids)); -+ -+ switch (nid) -+ { -+ case NID_md5: -+ *digest = &pk11_md5; -+ break; -+ case NID_sha1: -+ *digest = &pk11_sha1; -+ break; -+ case NID_sha224: -+ *digest = &pk11_sha224; -+ break; -+ case NID_sha256: -+ *digest = &pk11_sha256; -+ break; -+ case NID_sha384: -+ *digest = &pk11_sha384; -+ break; -+ case NID_sha512: -+ *digest = &pk11_sha512; -+ break; -+ default: -+ *digest = NULL; -+ break; -+ } -+ return (*digest != NULL); -+ } -+ -+ -+/* Create a secret key object in a PKCS#11 session */ -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE; -+ CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY; -+ CK_ULONG ul_key_attr_count = 6; -+ -+ CK_ATTRIBUTE a_key_template[] = -+ { -+ {CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)}, -+ {CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)}, -+ {CKA_TOKEN, &false, sizeof (false)}, -+ {CKA_ENCRYPT, &true, sizeof (true)}, -+ {CKA_DECRYPT, &true, sizeof (true)}, -+ {CKA_VALUE, (void*) NULL, 0}, -+ }; -+ -+ /* -+ * Create secret key object in global_session. All other sessions -+ * can use the key handles. Here is why: -+ * OpenSSL will call EncryptInit and EncryptUpdate using a secret key. -+ * It may then call DecryptInit and DecryptUpdate using the same key. -+ * To use the same key object, we need to call EncryptFinal with -+ * a 0 length message. Currently, this does not work for 3DES -+ * mechanism. To get around this problem, we close the session and -+ * then create a new session to use the same key object. When a session -+ * is closed, all the object handles will be invalid. Thus, create key -+ * objects in a global session, an individual session may be closed to -+ * terminate the active operation. -+ */ -+ CK_SESSION_HANDLE session = global_session; -+ a_key_template[0].pValue = &obj_key; -+ a_key_template[1].pValue = &key_type; -+ a_key_template[5].pValue = (void *) key; -+ a_key_template[5].ulValueLen = (unsigned long) ctx->key_len; -+ -+ rv = pFuncList->C_CreateObject(session, -+ a_key_template, ul_key_attr_count, &h_key); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT, -+ rv); -+ goto err; -+ } -+ -+ /* -+ * Save the key information used in this session. -+ * The max can be saved is PK11_KEY_LEN_MAX. -+ */ -+ sp->opdata_key_len = ctx->key_len > PK11_KEY_LEN_MAX ? -+ PK11_KEY_LEN_MAX : ctx->key_len; -+ (void) memcpy(sp->opdata_key, key, sp->opdata_key_len); -+err: -+ -+ return (h_key); -+ } -+ -+static int -+md_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_DIGEST_MAX; i++) -+ if (digests[i].nid == nid) -+ return (digests[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_digest_init(EVP_MD_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_MECHANISM mech; -+ int index; -+ PK11_SESSION *sp; -+ PK11_DIGEST *pdp; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ state->sp = NULL; -+ -+ index = md_nid_to_pk11(ctx->digest->type); -+ if (index < 0 || index >= PK11_DIGEST_MAX) -+ return (0); -+ -+ pdp = &digests[index]; -+ if ((sp = pk11_get_session(OP_DIGEST)) == NULL) -+ return (0); -+ -+ /* at present, no parameter is needed for supported digests */ -+ mech.mechanism = pdp->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ rv = pFuncList->C_DigestInit(sp->session, &mech); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv); -+ pk11_return_session(sp, OP_DIGEST); -+ return (0); -+ } -+ -+ state->sp = sp; -+ -+ return (1); -+ } -+ -+static int -+pk11_digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) -+ { -+ CK_RV rv; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ /* 0 length message will cause a failure in C_DigestFinal */ -+ if (count == 0) -+ return (1); -+ -+ if (state == NULL || state->sp == NULL) -+ return (0); -+ -+ rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data, -+ count); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+static int -+pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md) -+ { -+ CK_RV rv; -+ unsigned long len; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ len = ctx->digest->md_size; -+ -+ if (state == NULL || state->sp == NULL) -+ return (0); -+ -+ rv = pFuncList->C_DigestFinal(state->sp->session, md, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return (0); -+ } -+ -+ if (ctx->digest->md_size != len) -+ return (0); -+ -+ /* -+ * Final is called and digest is returned, so return the session -+ * to the pool -+ */ -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ -+ return (1); -+ } -+ -+static int -+pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) -+ { -+ CK_RV rv; -+ int ret = 0; -+ PK11_CIPHER_STATE *state, *state_to; -+ CK_BYTE_PTR pstate = NULL; -+ CK_ULONG ul_state_len; -+ -+ /* The copy-from state */ -+ state = (PK11_CIPHER_STATE *) from->md_data; -+ if (state == NULL || state->sp == NULL) -+ goto err; -+ -+ /* Initialize the copy-to state */ -+ if (!pk11_digest_init(to)) -+ goto err; -+ state_to = (PK11_CIPHER_STATE *) to->md_data; -+ -+ /* Get the size of the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, NULL, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ if (ul_state_len == 0) -+ { -+ goto err; -+ } -+ -+ pstate = OPENSSL_malloc(ul_state_len); -+ if (pstate == NULL) -+ { -+ PK11err(PK11_F_DIGEST_COPY, PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ -+ /* Get the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, pstate, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ -+ /* Set the operation state of the copy-to session */ -+ rv = pFuncList->C_SetOperationState(state_to->sp->session, pstate, -+ ul_state_len, 0, 0); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, -+ PK11_R_SET_OPERATION_STATE, rv); -+ goto err; -+ } -+ -+ ret = 1; -+err: -+ if (pstate != NULL) -+ OPENSSL_free(pstate); -+ -+ return (ret); -+ } -+ -+/* Return any pending session state to the pool */ -+static int -+pk11_digest_cleanup(EVP_MD_CTX *ctx) -+ { -+ PK11_CIPHER_STATE *state = ctx->md_data; -+ unsigned char buf[EVP_MAX_MD_SIZE]; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * If state->sp is not NULL then pk11_digest_final() has not -+ * been called yet. We must call it now to free any memory -+ * that might have been allocated in the token when -+ * pk11_digest_init() was called. pk11_digest_final() -+ * will return the session to the cache. -+ */ -+ if (!pk11_digest_final(ctx, buf)) -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+/* -+ * Check if the new key is the same as the key object in the session. If the key -+ * is the same, no need to create a new key object. Otherwise, the old key -+ * object needs to be destroyed and a new one will be created. Return 1 for -+ * cache hit, 0 for cache miss. Note that we must check the key length first -+ * otherwise we could end up reusing a different, longer key with the same -+ * prefix. -+ */ -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len) -+ { -+ if (sp->opdata_key_len != key_len || -+ memcmp(sp->opdata_key, key, key_len) != 0) -+ { -+ (void) pk11_destroy_cipher_key_objects(sp); -+ return (0); -+ } -+ return (1); -+ } -+ -+/* Destroy one or more secret key objects. */ -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session) -+ { -+ int ret = 0; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ (void) pthread_mutex_lock(session_cache[OP_CIPHER].lock); -+ local_free_session = session_cache[OP_CIPHER].head; -+ } -+ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ if (sp->opdata_cipher_key != CK_INVALID_HANDLE) -+ { -+ /* -+ * The secret key object is created in the -+ * global_session. See pk11_get_cipher_key(). -+ */ -+ if (pk11_destroy_object(global_session, -+ sp->opdata_cipher_key, CK_FALSE) == 0) -+ goto err; -+ sp->opdata_cipher_key = CK_INVALID_HANDLE; -+ } -+ } -+ ret = 1; -+err: -+ -+ if (session == NULL) -+ (void) pthread_mutex_unlock(session_cache[OP_CIPHER].lock); -+ -+ return (ret); -+ } -+ -+ -+/* -+ * Public key mechanisms optionally supported -+ * -+ * CKM_RSA_X_509 -+ * CKM_RSA_PKCS -+ * CKM_DSA -+ * -+ * The first slot that supports at least one of those mechanisms is chosen as a -+ * public key slot. -+ * -+ * Symmetric ciphers optionally supported -+ * -+ * CKM_DES3_CBC -+ * CKM_DES_CBC -+ * CKM_AES_CBC -+ * CKM_DES3_ECB -+ * CKM_DES_ECB -+ * CKM_AES_ECB -+ * CKM_AES_CTR -+ * CKM_RC4 -+ * CKM_BLOWFISH_CBC -+ * -+ * Digests optionally supported -+ * -+ * CKM_MD5 -+ * CKM_SHA_1 -+ * CKM_SHA224 -+ * CKM_SHA256 -+ * CKM_SHA384 -+ * CKM_SHA512 -+ * -+ * The output of this function is a set of global variables indicating which -+ * mechanisms from RSA, DSA, DH and RAND are present, and also two arrays of -+ * mechanisms, one for symmetric ciphers and one for digests. Also, 3 global -+ * variables carry information about which slot was chosen for (a) public key -+ * mechanisms, (b) random operations, and (c) symmetric ciphers and digests. -+ */ -+static int -+pk11_choose_slots(int *any_slot_found) -+ { -+ CK_SLOT_ID_PTR pSlotList = NULL_PTR; -+ CK_ULONG ulSlotCount = 0; -+ CK_MECHANISM_INFO mech_info; -+ CK_TOKEN_INFO token_info; -+ int i; -+ CK_RV rv; -+ CK_SLOT_ID best_slot_sofar; -+ CK_BBOOL found_candidate_slot = CK_FALSE; -+ int slot_n_cipher = 0; -+ int slot_n_digest = 0; -+ CK_SLOT_ID current_slot = 0; -+ int current_slot_n_cipher = 0; -+ int current_slot_n_digest = 0; -+ -+ int local_cipher_nids[PK11_CIPHER_MAX]; -+ int local_digest_nids[PK11_DIGEST_MAX]; -+ -+ /* let's initialize the output parameter */ -+ if (any_slot_found != NULL) -+ *any_slot_found = 0; -+ -+ /* Get slot list for memory allocation */ -+ rv = pFuncList->C_GetSlotList(CK_FALSE, NULL_PTR, &ulSlotCount); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ return (0); -+ } -+ -+ /* it's not an error if we didn't find any providers */ -+ if (ulSlotCount == 0) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: no crypto providers found\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ return (1); -+ } -+ -+ pSlotList = OPENSSL_malloc(ulSlotCount * sizeof (CK_SLOT_ID)); -+ -+ if (pSlotList == NULL) -+ { -+ PK11err(PK11_F_CHOOSE_SLOT, PK11_R_MALLOC_FAILURE); -+ return (0); -+ } -+ -+ /* Get the slot list for processing */ -+ rv = pFuncList->C_GetSlotList(CK_FALSE, pSlotList, &ulSlotCount); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ OPENSSL_free(pSlotList); -+ return (0); -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME); -+ fprintf(stderr, "%s: number of slots: %d\n", PK11_DBG, ulSlotCount); -+ -+ fprintf(stderr, "%s: == checking rand slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ /* Check if slot has random support. */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ if (token_info.flags & CKF_RNG) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ pk11_have_random = CK_TRUE; -+ rand_SLOTID = current_slot; -+ break; -+ } -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ pubkey_SLOTID = pSlotList[0]; -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ CK_BBOOL slot_has_rsa = CK_FALSE; -+ CK_BBOOL slot_has_dsa = CK_FALSE; -+ CK_BBOOL slot_has_dh = CK_FALSE; -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+#ifndef OPENSSL_NO_RSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_RSA_PKCS. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_RSA_PKCS, -+ &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ /* -+ * Check if this slot is capable of encryption, -+ * decryption, sign, and verify with CKM_RSA_X_509. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_RSA_X_509, &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY) && -+ (mech_info.flags & CKF_ENCRYPT) && -+ (mech_info.flags & CKF_VERIFY_RECOVER) && -+ (mech_info.flags & CKF_DECRYPT))) -+ { -+ slot_has_rsa = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_DSA. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_DSA, -+ &mech_info); -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ slot_has_dsa = CK_TRUE; -+ } -+ -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+ /* -+ * Check if this slot is capable of DH key generataion and -+ * derivation. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_KEY_PAIR_GEN, &mech_info); -+ -+ if (rv == CKR_OK && (mech_info.flags & CKF_GENERATE_KEY_PAIR)) -+ { -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_DERIVE, &mech_info); -+ if (rv == CKR_OK && (mech_info.flags & CKF_DERIVE)) -+ { -+ slot_has_dh = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+ if (!found_candidate_slot && -+ (slot_has_rsa || slot_has_dsa || slot_has_dh)) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: potential slot: %d\n", PK11_DBG, current_slot); -+#endif /* DEBUG_SLOT_SELECTION */ -+ best_slot_sofar = current_slot; -+ pk11_have_rsa = slot_has_rsa; -+ pk11_have_dsa = slot_has_dsa; -+ pk11_have_dh = slot_has_dh; -+ found_candidate_slot = CK_TRUE; -+ /* -+ * Cache the flags for later use. We might need those if -+ * RSA keys by reference feature is used. -+ */ -+ pubkey_token_flags = token_info.flags; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: setting found_candidate_slot to CK_TRUE\n", -+ PK11_DBG); -+ fprintf(stderr, -+ "%s: best so far slot: %d\n", PK11_DBG, -+ best_slot_sofar); -+ fprintf(stderr, "%s: pubkey flags changed to " -+ "%lu.\n", PK11_DBG, pubkey_token_flags); -+ } -+ else -+ { -+ fprintf(stderr, -+ "%s: no rsa/dsa/dh\n", PK11_DBG); -+ } -+#else -+ } /* if */ -+#endif /* DEBUG_SLOT_SELECTION */ -+ } /* for */ -+ -+ if (found_candidate_slot == CK_TRUE) -+ { -+ pubkey_SLOTID = best_slot_sofar; -+ } -+ -+ found_candidate_slot = CK_FALSE; -+ best_slot_sofar = 0; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ SLOTID = pSlotList[0]; -+ for (i = 0; i < ulSlotCount; i++) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ current_slot = pSlotList[i]; -+ current_slot_n_cipher = 0; -+ current_slot_n_digest = 0; -+ (void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids)); -+ (void) memset(local_digest_nids, 0, sizeof (local_digest_nids)); -+ -+ pk11_find_symmetric_ciphers(pFuncList, current_slot, -+ ¤t_slot_n_cipher, local_cipher_nids); -+ -+ pk11_find_digests(pFuncList, current_slot, -+ ¤t_slot_n_digest, local_digest_nids); -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: current_slot_n_cipher %d\n", PK11_DBG, -+ current_slot_n_cipher); -+ fprintf(stderr, "%s: current_slot_n_digest %d\n", PK11_DBG, -+ current_slot_n_digest); -+ fprintf(stderr, "%s: best so far cipher/digest slot: %d\n", -+ PK11_DBG, best_slot_sofar); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ /* -+ * If the current slot supports more ciphers/digests than -+ * the previous best one we change the current best to this one, -+ * otherwise leave it where it is. -+ */ -+ if ((current_slot_n_cipher + current_slot_n_digest) > -+ (slot_n_cipher + slot_n_digest)) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: changing best so far slot to %d\n", -+ PK11_DBG, current_slot); -+#endif /* DEBUG_SLOT_SELECTION */ -+ best_slot_sofar = SLOTID = current_slot; -+ cipher_count = slot_n_cipher = current_slot_n_cipher; -+ digest_count = slot_n_digest = current_slot_n_digest; -+ (void) memcpy(cipher_nids, local_cipher_nids, -+ sizeof (local_cipher_nids)); -+ (void) memcpy(digest_nids, local_digest_nids, -+ sizeof (local_digest_nids)); -+ } -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 30 18:49:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Apr 2012 16:49:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[17911] csw/mgar/pkg Message-ID: Revision: 17911 http://gar.svn.sourceforge.net/gar/?rev=17911&view=rev Author: wahwah Date: 2012-04-30 16:49:31 +0000 (Mon, 30 Apr 2012) Log Message: ----------- libpqxx/trunk: Initial commit, doesn't build: connection_base.cxx, line 480: Error: Cannot use std::__reverse_bi_iterator::iterator, std::bidirectional_iterator_tag, pqxx::errorhandler*, pqxx::errorhandler*&, pqxx::errorhandler**, int> to initialize const std::__reverse_bi_iterator::const_iterator, std::bidirectional_iterator_tag, pqxx::errorhandler*, pqxx::errorhandler*const&, pqxx::errorhandler*const*, int> Added Paths: ----------- csw/mgar/pkg/libpqxx/ csw/mgar/pkg/libpqxx/Makefile csw/mgar/pkg/libpqxx/branches/ csw/mgar/pkg/libpqxx/tags/ csw/mgar/pkg/libpqxx/trunk/ csw/mgar/pkg/libpqxx/trunk/Makefile csw/mgar/pkg/libpqxx/trunk/checksums csw/mgar/pkg/libpqxx/trunk/files/ Added: csw/mgar/pkg/libpqxx/Makefile =================================================================== --- csw/mgar/pkg/libpqxx/Makefile (rev 0) +++ csw/mgar/pkg/libpqxx/Makefile 2012-04-30 16:49:31 UTC (rev 17911) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libpqxx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libpqxx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpqxx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libpqxx/trunk/Makefile 2012-04-30 16:49:31 UTC (rev 17911) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libpqxx +VERSION = 4.0 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = C++ client API for PostgreSQL +define BLURB +endef + +MASTER_SITES = http://pqxx.org/download/software/libpqxx/ +DISTFILES = $(DISTNAME).tar.gz + +BUILD_DEP_PKGS = CSWpostgresql-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libpqxx/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libpqxx/trunk/checksums =================================================================== --- csw/mgar/pkg/libpqxx/trunk/checksums (rev 0) +++ csw/mgar/pkg/libpqxx/trunk/checksums 2012-04-30 16:49:31 UTC (rev 17911) @@ -0,0 +1 @@ +bd7541f858400a96cbe2a48cb342ad0e libpqxx-4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.