-diff -ur multitail-5.2.2.orig/mt.c multitail-5.2.2/mt.c
---- multitail-5.2.2.orig/mt.c	2009-03-07 13:52:49.901909226 +0100
-+++ multitail-5.2.2/mt.c	2009-03-07 13:57:53.016591255 +0100
-@@ -2328,7 +2328,7 @@
- 			printf("Could not determine size of file '%s' (which is supposed to be ", mail_spool_file);
- 			printf("your mailfile): mail-check is disabled.\n");
- 			printf("You can prevent this message by adding the line 'check_mail:0' ");
--			printf("in /etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
-+			printf("in /etc/opt/csw/multitail.conf or in .multitailrc in your home-directory.\n\n");
- 			printf("Press enter to continue...");
- 			fflush(NULL);
- 			getchar();
-diff -ur multitail-5.2.2.orig/multitail.conf multitail-5.2.2/multitail.conf
---- multitail-5.2.2.orig/multitail.conf	2009-03-07 13:52:49.490040359 +0100
-+++ multitail-5.2.2/multitail.conf	2009-03-07 13:56:34.117143611 +0100
-@@ -868,7 +868,7 @@
- #              end offset: the position AFTER the last character for which the attributes are
- #              valid
- #              do NOT use spaces in each line!
--colorscript:cscriptexample:/etc/multitail/colors-example.pl:this is a barely functional example script
-+colorscript:cscriptexample:/opt/csw/share/multitail/colors-example.pl:this is a barely functional example script
- #
- #
- # default colorschemes:
-@@ -1009,7 +1009,7 @@
- convert:asterisk:epochtodate:^([0-9]*).([0-9]*)
- convert:nagios.log:epochtodate:^.([0-9]*). 
- convert:qmailtimestr:tai64todate:^(@[^ ]*)
--convert:geoip:script:/etc/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
-+convert:geoip:script:/opt/csw/share/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
- #
- # shell to invoke
- shell:/bin/sh

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 Jan  7 09:19:29 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 08:19:29 +0000
Subject: SF.net SVN: gar:[22794] csw/mgar/pkg/texinfo/trunk
Message-ID: <3dz62N4ycRzrq@mail.opencsw.org>

Revision: 22794
          http://sourceforge.net/p/gar/code/22794
Author:   dmichelsen
Date:     2014-01-07 08:19:29 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
texinfo/trunk: Update to 5.2

Modified Paths:
--------------
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/checksums

Modified: csw/mgar/pkg/texinfo/trunk/Makefile
===================================================================

--- csw/mgar/pkg/texinfo/trunk/Makefile	2014-01-07 08:12:28 UTC (rev 22793)
+++ csw/mgar/pkg/texinfo/trunk/Makefile	2014-01-07 08:19:29 UTC (rev 22794)
@@ -1,5 +1,5 @@
 NAME = texinfo
-VERSION = 4.13a
+VERSION = 5.2
 GARTYPE = v2
 
 DESCRIPTION = The GNU Documentation System
@@ -8,22 +8,35 @@
   on-line information (info, HTML, XML, Docbook) and printed output (DVI, PDF).
 endef
 
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES += $(GNU_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += CSWtexinfo.postinstall
 DISTFILES += mkdirentries
 
-SPKG_SOURCEURL = http://www.gnu.org/software/texinfo/
+VENDOR_URL = http://www.gnu.org/software/texinfo/
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWtexinfo
+SPKG_DESC_CSWtexinfo = The GNU Documentation System
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtexinfo += CSWbash
+RUNTIME_DEP_PKGS_CSWtexinfo += CSWgsed
+RUNTIME_DEP_PKGS_CSWtexinfo += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWtexinfo += CSWlibncurses5
+# Are these really needed? May investigate deeply later.
+CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWgsed
+CHECKPKG_OVERRIDES_CSWtexinfo += missing-dependency|CSWperl
 
-RUNTIME_DEP_PKGS = CSWbash CSWgsed CSWncurses CSWiconv CSWggettextrt
+# These are in fact commented out
+CHECKPKG_OVERRIDES_CSWtexinfo += file-with-bad-content|/usr/local|root/opt/csw/bin/texi2any
+CHECKPKG_OVERRIDES_CSWtexinfo += file-with-bad-content|/usr/local|root/opt/csw/bin/info
+CHECKPKG_OVERRIDES_CSWtexinfo += file-with-bad-content|/usr/share|root/opt/csw/bin/texi2any
+CHECKPKG_OVERRIDES_CSWtexinfo += file-with-bad-content|/usr/share|root/opt/csw/bin/info
+
 # CSWgzip is needed for zdiff
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWgzip
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS)
+BUILD_DEP_PKGS += CSWgzip
 
-DISTNAME = $(NAME)-4.13
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # /opt/csw/lib is added automatically during the build and the
@@ -32,11 +45,6 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
-# Are these really needed? May investigate deeply later.
-CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWbash
-CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWgsed
-CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWiconv
-
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/texinfo/trunk/checksums
===================================================================
--- csw/mgar/pkg/texinfo/trunk/checksums	2014-01-07 08:12:28 UTC (rev 22793)
+++ csw/mgar/pkg/texinfo/trunk/checksums	2014-01-07 08:19:29 UTC (rev 22794)
@@ -1,3 +1 @@
-cedd1943a435e39a6d147680e0693bd1  CSWtexinfo.postinstall
-f5860ae7b0ff06605975c93e2f59fc07  mkdirentries
-71ba711519209b5fb583fed2b3d86fcb  texinfo-4.13a.tar.gz
+1b8f98b80a8e6c50422125e07522e8db  texinfo-5.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  Tue Jan  7 09:31:30 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 08:31:30 +0000
Subject: SF.net SVN: gar:[22795] csw/mgar/pkg/recutils/trunk/Makefile
Message-ID: <3dz6JC5qSSzwh@mail.opencsw.org>

Revision: 22795
          http://sourceforge.net/p/gar/code/22795
Author:   dmichelsen
Date:     2014-01-07 08:31:29 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
recutils/trunk: Add overrides

Modified Paths:
--------------
    csw/mgar/pkg/recutils/trunk/Makefile

Modified: csw/mgar/pkg/recutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/recutils/trunk/Makefile	2014-01-07 08:19:29 UTC (rev 22794)
+++ csw/mgar/pkg/recutils/trunk/Makefile	2014-01-07 08:31:29 UTC (rev 22795)
@@ -26,6 +26,9 @@
 # This is just an emacs mode. It can be used when emacs is installed, no need to force dependency
 CHECKPKG_OVERRIDES_CSWrecutils += missing-dependency|CSWemacs-common
 
+# Only needed on x86
+CHECKPKG_OVERRIDES_CSWrecutils += surplus-dependency|CSWlibgpg-error0
+
 PACKAGES += CSWlibrec0
 SPKG_DESC_CSWlibrec0 = GNU recutils library, librec.so.0
 PKGFILES_CSWlibrec0 += $(call pkgfiles_lib,librec.so.0)
@@ -35,6 +38,9 @@
 RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibuuid1
 
+# Only needed on x86
+CHECKPKG_OVERRIDES_CSWlibrec0 += surplus-dependency|CSWlibgpg-error0
+
 PACKAGES += CSWlibrec-dev
 SPKG_DESC_CSWlibrec-dev = Development files for librec.so.0
 PKGFILES_CSWlibrec-dev += $(PKGFILES_DEVEL)

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 Jan  7 09:40:55 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 08:40:55 +0000
Subject: SF.net SVN: gar:[22796] csw/mgar/pkg/grep/trunk
Message-ID: <3dz6W55R3Mz11N@mail.opencsw.org>

Revision: 22796
          http://sourceforge.net/p/gar/code/22796
Author:   dmichelsen
Date:     2014-01-07 08:40:54 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
grep/trunk: Update to 2.16

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	2014-01-07 08:31:29 UTC (rev 22795)
+++ csw/mgar/pkg/grep/trunk/Makefile	2014-01-07 08:40:54 UTC (rev 22796)
@@ -1,5 +1,5 @@
 NAME = grep
-VERSION = 2.14
+VERSION = 2.16
 GARTYPE = v2
 
 DESCRIPTION = GNU grep
@@ -15,7 +15,7 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-# MASTER_SITES += http://meyering.net/grep/
+MASTER_SITES += http://meyering.net/grep/
 DISTFILES = $(DISTNAME).tar.xz
 
 PACKAGES = CSWggrep
@@ -24,13 +24,16 @@
 RUNTIME_DEP_PKGS_CSWggrep += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWggrep += CSWlibiconv2
 
+NOGITPATCH = 1
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 CONFIGURE_ARGS += --with-included-regex
+CONFIGURE_ARGS += --enable-gcc-warnings
 
-# Use GNUlib for wcscoll as there is an issue with the ru_RU.KOI8-R locale
-# See for details http://lists.gnu.org/archive/html/bug-grep/2013-10/msg00020.html
-EXTRA_CONFIGURE_ENV += ac_cv_func_wcscoll=no
+# Skip tests until this is fixed:
+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16380
+SKIPTEST ?= 1
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 

Modified: csw/mgar/pkg/grep/trunk/checksums
===================================================================
--- csw/mgar/pkg/grep/trunk/checksums	2014-01-07 08:31:29 UTC (rev 22795)
+++ csw/mgar/pkg/grep/trunk/checksums	2014-01-07 08:40:54 UTC (rev 22796)
@@ -1 +1 @@
-d4a3f03849d1e17ce56ab76aa5a24cab  grep-2.14.tar.xz
+502350a6c8f7c2b12ee58829e760b44d  grep-2.16.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  Tue Jan  7 10:17:12 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 09:17:12 +0000
Subject: SF.net SVN: gar:[22797] csw/mgar/pkg/yaz/trunk
Message-ID: <3dz7K54vJ1z16H@mail.opencsw.org>

Revision: 22797
          http://sourceforge.net/p/gar/code/22797
Author:   dmichelsen
Date:     2014-01-07 09:17:11 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
yaz/trunk: Update to 5.0.2

Modified Paths:
--------------
    csw/mgar/pkg/yaz/trunk/Makefile
    csw/mgar/pkg/yaz/trunk/checksums

Modified: csw/mgar/pkg/yaz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yaz/trunk/Makefile	2014-01-07 08:40:54 UTC (rev 22796)
+++ csw/mgar/pkg/yaz/trunk/Makefile	2014-01-07 09:17:11 UTC (rev 22797)
@@ -1,5 +1,5 @@
 NAME = yaz
-VERSION = 4.2.35
+VERSION = 5.0.2
 GARTYPE = v2
 
 DESCRIPTION = Toolkit for Z39.50/SRW/SRU clients and servers
@@ -15,48 +15,45 @@
 
 # File splitting taken from yaz.spec
 
-PACKAGES += CSWlibyaz4
-SPKG_DESC_CSWlibyaz4 = Toolkit for Z39.50/SRW/SRU clients and servers, libyaz.so.4
-PKGFILES_CSWlibyaz4 = $(call pkgfiles_lib,libyaz.so.4)
-# These are always bumped together
-CHECKPKG_OVERRIDES_CSWlibyaz4 += shared-lib-pkgname-mismatch
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibgpg-error0
+PACKAGES += CSWlibyaz5
+SPKG_DESC_CSWlibyaz5 = Toolkit for Z39.50/SRW/SRU clients and servers, libyaz.so.5
+PKGFILES_CSWlibyaz5 = $(call pkgfiles_lib,libyaz.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWlibyaz5 += CSWlibgcrypt11
 
+PACKAGES += CSWlibyaz-icu5
+SPKG_DESC_CSWlibyaz-icu5 += $(DESCRIPTION), libyaz_icu.so.5
+PKGFILES_CSWlibyaz-icu5 += $(call pkgfiles_lib,libyaz_icu.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibyaz4
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibyaz-icu5 += CSWlibicudata52
 
-PACKAGES += CSWlibyaz-icu4
-PKGFILES_CSWlibyaz-icu4 += $(call pkgfiles_lib,libyaz_icu.so.4)
-SPKG_DESC_CSWlibyaz-icu4 += $(DESCRIPTION), libyaz_icu.so.4
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicudata48
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibyaz-icu4 += CSWlibicui18n48
+PACKAGES += CSWlibyaz-server5
+SPKG_DESC_CSWlibyaz-server5 += $(DESCRIPTION), libyaz_server.so.5
+PKGFILES_CSWlibyaz-server5 += $(call pkgfiles_lib,libyaz_server.so.5)
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibyaz4
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibyaz-server5 += CSWlibgcrypt11
 
-PACKAGES += CSWlibyaz-server4
-PKGFILES_CSWlibyaz-server4 += $(call pkgfiles_lib,libyaz_server.so.4)
-SPKG_DESC_CSWlibyaz-server4 += $(DESCRIPTION), libyaz_server.so.4
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibyaz-server4 += CSWlibgcrypt11
-
 PACKAGES += CSWlibyaz-dev
 SPKG_DESC_CSWlibyaz-dev = Development files for libyaz
 PKGFILES_CSWlibyaz-dev += $(PKGFILES_DEVEL)
@@ -64,17 +61,11 @@
 PKGFILES_CSWlibyaz-dev += $(sharedstatedir)/yaz/.*
 PKGFILES_CSWlibyaz-dev += $(docdir)/yaz/.*
 PKGFILES_CSWlibyaz-dev += $(mandir)/man7/.*
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-icu4
-RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-server4
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-icu5
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz-server5
+RUNTIME_DEP_PKGS_CSWlibyaz-dev += CSWlibyaz5
 OBSOLETED_BY_CSWlibyaz-dev += CSWlibyaz-devel
 
-# These are default locations for docbook files, they can be specified with a --with-* option
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/yaz.m4
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/share|root/opt/csw/share/aclocal/yaz.m4
-# These are the default on configuration
-CHECKPKG_OVERRIDES_CSWlibyaz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/yaz/installation.unix.html
-
 # %{_bindir}/yaz-config
 # %{_bindir}/yaz-asncomp
 # %{_includedir}/yaz
@@ -90,23 +81,15 @@
 
 PACKAGES += CSWyaz
 SPKG_DESC_CSWyaz = Toolkit for Z39.50/SRW/SRU clients and servers
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz4
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-icu4
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-server4
+# PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWyaz += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibz1
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-server5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibicui18n52
 RUNTIME_DEP_PKGS_CSWyaz += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWyaz += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibhistory6
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicui18n48
-RUNTIME_DEP_PKGS_CSWyaz += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-icu5
+RUNTIME_DEP_PKGS_CSWyaz += CSWlibicuuc52
 
 REINPLACE_USRLOCAL += doc/yaz-config.1
 
@@ -129,13 +112,4 @@
 BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-# Skip tests for now.
-# There is one test failing:
-# Entity: line 1: parser error : Extra content at the end of the document
-# DY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93IHRvIHByb2dyYW0gYSBjb21wdXRlch4d
-#                                                                                ^
-# test_embed_record.c:187: FAILED: test_render( "xml; base64=/my/text()", 0, "" "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw" "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93" "IHRvIHByb2dyYW0gYSBjb21wdXRlch4d" "", "\n" "\n" "  00138nam a22000738a 4500\n" "     11224466 \n" "  DLC\n" "  \n" "    Jack Collins\n" "  \n" "  \n" "    How to program a computer\n" "  \n" "\n")
-
-SKIPTEST ?= 1
-
 include gar/category.mk

Modified: csw/mgar/pkg/yaz/trunk/checksums
===================================================================
--- csw/mgar/pkg/yaz/trunk/checksums	2014-01-07 08:40:54 UTC (rev 22796)
+++ csw/mgar/pkg/yaz/trunk/checksums	2014-01-07 09:17:11 UTC (rev 22797)
@@ -1 +1 @@
-0392d5fdbb5bda53b055e35a166adc56  yaz-4.2.35.tar.gz
+56b40086f9aa251d3cf4d8f8acee3570  yaz-5.0.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  Tue Jan  7 10:22:51 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 09:22:51 +0000
Subject: SF.net SVN: gar:[22798] csw/mgar/pkg/bison/trunk
Message-ID: <3dz7RT1djwz19j@mail.opencsw.org>

Revision: 22798
          http://sourceforge.net/p/gar/code/22798
Author:   dmichelsen
Date:     2014-01-07 09:22:47 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
bison/trunk: Update to 3.0.2

Modified Paths:
--------------
    csw/mgar/pkg/bison/trunk/Makefile
    csw/mgar/pkg/bison/trunk/checksums

Modified: csw/mgar/pkg/bison/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bison/trunk/Makefile	2014-01-07 09:17:11 UTC (rev 22797)
+++ csw/mgar/pkg/bison/trunk/Makefile	2014-01-07 09:22:47 UTC (rev 22798)
@@ -1,5 +1,5 @@
 NAME = bison
-VERSION = 2.5
+VERSION = 3.0.2
 GARTYPE = v2
 
 DESCRIPTION = GNU Project parser generator (yacc replacement)
@@ -25,8 +25,8 @@
 CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWgm4
 CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWiconv
 
-# Skip tests as some fail due to problems in CSWlibgnugetopt includes
-SKIPTEST ?= 1
+# Tests 217-222 use zero-sized structs
+EXTRA_CFLAGS += -features=extensions
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/bison/trunk/checksums
===================================================================
--- csw/mgar/pkg/bison/trunk/checksums	2014-01-07 09:17:11 UTC (rev 22797)
+++ csw/mgar/pkg/bison/trunk/checksums	2014-01-07 09:22:47 UTC (rev 22798)
@@ -1 +1 @@
-687e1dcd29452789d34eaeea4c25abe4  bison-2.5.tar.gz
+72c66879187c128d04f4ab7422e8072d  bison-3.0.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  Tue Jan  7 10:40:20 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 09:40:20 +0000
Subject: SF.net SVN: gar:[22799] csw/mgar/pkg/yaz/trunk/Makefile
Message-ID: <3dz7qq72Qjz1GV@mail.opencsw.org>

Revision: 22799
          http://sourceforge.net/p/gar/code/22799
Author:   dmichelsen
Date:     2014-01-07 09:40:19 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
yaz/trunk: Add overrides

Modified Paths:
--------------
    csw/mgar/pkg/yaz/trunk/Makefile

Modified: csw/mgar/pkg/yaz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yaz/trunk/Makefile	2014-01-07 09:22:47 UTC (rev 22798)
+++ csw/mgar/pkg/yaz/trunk/Makefile	2014-01-07 09:40:19 UTC (rev 22799)
@@ -91,6 +91,25 @@
 RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz-icu5
 RUNTIME_DEP_PKGS_CSWyaz += CSWlibicuuc52
 
+# These are usually not needed, but -z ignore does not work the way it used to
+CHECKPKG_OVERRIDES_CSWlibyaz5 += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWlibyaz5 += surplus-dependency|CSWlibgcrypt11
+CHECKPKG_OVERRIDES_CSWlibyaz5 += surplus-dependency|CSWlibgpg-error0
+CHECKPKG_OVERRIDES_CSWyaz += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibgcrypt11
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibgpg-error0
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibexslt0
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWlibyaz-server5 += surplus-dependency|CSWlibxslt1
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibgcrypt11
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibicudata52
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibgpg-error0
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibexslt0
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWlibyaz-icu5 += surplus-dependency|CSWlibxslt1
+
 REINPLACE_USRLOCAL += doc/yaz-config.1
 
 REINPLACEMENTS += usrlocalshare

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 Jan  7 11:10:21 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 10:10:21 +0000
Subject: SF.net SVN: gar:[22800] csw/mgar/pkg/bison/trunk/Makefile
Message-ID: <3dz8VF0Tbsz1M6@mail.opencsw.org>

Revision: 22800
          http://sourceforge.net/p/gar/code/22800
Author:   dmichelsen
Date:     2014-01-07 10:10:19 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
bison/trunk: Skip testsuite as our gcj does not work, that is not the fault from bison

Modified Paths:
--------------
    csw/mgar/pkg/bison/trunk/Makefile

Modified: csw/mgar/pkg/bison/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bison/trunk/Makefile	2014-01-07 09:40:19 UTC (rev 22799)
+++ csw/mgar/pkg/bison/trunk/Makefile	2014-01-07 10:10:19 UTC (rev 22800)
@@ -28,6 +28,9 @@
 # Tests 217-222 use zero-sized structs
 EXTRA_CFLAGS += -features=extensions
 
+# Our gcj just does not work cleanly
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 # Must use GNU grep during test

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 Jan  7 11:30:15 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  7 Jan 2014 10:30:15 +0000
Subject: SF.net SVN: gar:[22801] csw/mgar/pkg/xterm/trunk
Message-ID: <3dz8xH73djz5G@mail.opencsw.org>

Revision: 22801
          http://sourceforge.net/p/gar/code/22801
Author:   dmichelsen
Date:     2014-01-07 10:30:15 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
xterm/trunk: Update to 300

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/xterm/trunk/files/COPYING

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1,6 +1,6 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 NAME = xterm
-VERSION = 267
+VERSION = 300
 GARTYPE = v2
 
 DESCRIPTION = Terminal emulator for the X Window System
@@ -12,18 +12,22 @@
   the control sequences for VT220.
 endef
 
-VENDOR_URL    = http://invisible-island.net/xterm/
-MASTER_SITES  = ftp://invisible-island.net/xterm/
-DISTFILES     = $(NAME)-$(VERSION).tgz
-UFILES_REGEX  = $(NAME)-(\d+(?:\.\d+)*).tgz
-DISTFILES    += COPYING
+MASTER_SITES += ftp://invisible-island.net/xterm/
+DISTFILES += $(NAME)-$(VERSION).tgz
 
-RUNTIME_DEP_PKGS  = CSWfconfig
-RUNTIME_DEP_PKGS += CSWlibxft2
+VENDOR_URL = http://invisible-island.net/xterm/
+LICENSE = INSTALL
 
-# xterm Makefile doesn't have a test target
-TEST_TARGET =
+PACKAGES += CSWxterm
+SPKG_DESC_CSWxterm = Terminal emulator for the X Window System
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibxpm4
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibfontconfig1
 
+PIXMAPDIR = $(sharedstatedir)/pixmaps/xterm
+EXTRA_CPPFLAGS += -DPIXMAP_ROOTDIR=\\\"$(PIXMAPDIR)\\\"
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-setuid
 CONFIGURE_ARGS += --disable-setgid
@@ -38,22 +42,24 @@
 CONFIGURE_ARGS += --enable-warnings
 CONFIGURE_ARGS += --enable-wide-chars
 CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink
+CONFIGURE_ARGS += --with-pixmapdir=$(PIXMAPDIR)
 
 # Specify freetype linker flags, otherwise /opt/csw/X11/bin/xft-config is used
 CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2"
 CONFIGURE_ARGS += --with-freetype-libs="-lXft -lfontconfig -lfreetype"
 
-#GARFLAVOR = DBG
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings
 
 # luit comes with snv_85 
 #   http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431
-#CONFIGURE_ARGS += --enable-luit
+CONFIGURE_ARGS += --enable-luit
 
 # xterm doesn't rely on optimized libs, fasten startup
 NOISALIST = 1
 
+# xterm Makefile doesn't have a test target
+TEST_TARGET =
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/checksums	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1 +1 @@
-3945ab70cfa2a9e95804157ee1b0f8e8  xterm-267.tgz
+6adc7c7f39ab2a71fd83747049d60358  xterm-300.tgz

Deleted: csw/mgar/pkg/xterm/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/COPYING	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/files/COPYING	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1,27 +0,0 @@
-Copyright 1999-2009,2010 by Thomas E. Dickey
-
-                        All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization.

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 Jan  7 12:47:30 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue,  7 Jan 2014 11:47:30 +0000
Subject: SF.net SVN: gar:[22802] csw/mgar/pkg/lang-python/django/trunk/Makefile
Message-ID: <3dzBfR63BqzMP@mail.opencsw.org>

Revision: 22802
          http://sourceforge.net/p/gar/code/22802
Author:   cgrzemba
Date:     2014-01-07 11:47:27 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
lang-python/django/trunk: do not excude directoy test, see  https://code.djangoproject.com/ticket/20349

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/django/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/django/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django/trunk/Makefile	2014-01-07 10:30:15 UTC (rev 22801)
+++ csw/mgar/pkg/lang-python/django/trunk/Makefile	2014-01-07 11:47:27 UTC (rev 22802)
@@ -2,10 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# A known issue: There's a problem with getpass.getpass() on Solaris, in which
-# it echoes the entered password.
-# http://bugs.python.org/issue7208
-
 NAME = django
 VERSION = 1.6.1
 CATEGORIES = python
@@ -31,7 +27,10 @@
 PACKAGES = CSWpy-django
 CATALOGNAME_CSWpy-django = py_django
 ARCHALL = 1
-PYCOMPILE = 1
+# /opt/csw/lib/python2.6/site-packages/django/contrib/auth/hashers.py 
+# likes to import test/signals.py
+# https://code.djangoproject.com/ticket/20349
+MERGE_EXCLUDE_CATEGORY = 
 
 RUNTIME_DEP_PKGS =
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpython-dev

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From pfelecan at users.sourceforge.net  Tue Jan  7 12:54:02 2014
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Tue,  7 Jan 2014 11:54:02 +0000
Subject: SF.net SVN: gar:[22803]
	csw/mgar/pkg/mplayer/branches/snapshot/checksums
Message-ID: <3dzBnx671pzR2@mail.opencsw.org>

Revision: 22803
          http://sourceforge.net/p/gar/code/22803
Author:   pfelecan
Date:     2014-01-07 11:53:59 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
mplayer/branches/snapshot: new snapshot

Modified Paths:
--------------
    csw/mgar/pkg/mplayer/branches/snapshot/checksums

Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/checksums	2014-01-07 11:47:27 UTC (rev 22802)
+++ csw/mgar/pkg/mplayer/branches/snapshot/checksums	2014-01-07 11:53:59 UTC (rev 22803)
@@ -1,2 +1,2 @@
-06c8a1df9b356749c74b5e5f92006e3b  ffmpeg-snapshot.tar.bz2
-14d25df83c7e8b87063106e8c05d0635  mplayer-export-snapshot.tar.bz2
+5ebb4e45b9c76b95f3f1e580bb6b9724  ffmpeg-snapshot.tar.bz2
+952c5d63346a993947f934702383afe2  mplayer-export-snapshot.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jonbcraig at users.sourceforge.net  Tue Jan  7 22:42:53 2014
From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net)
Date: Tue,  7 Jan 2014 21:42:53 +0000
Subject: SF.net SVN: gar:[22804] csw/mgar/pkg/ntop/trunk/Makefile
Message-ID: <3dzRsN1xFjz15n@mail.opencsw.org>

Revision: 22804
          http://sourceforge.net/p/gar/code/22804
Author:   jonbcraig
Date:     2014-01-07 21:42:51 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Fixed up checkpkg overides and runtime dependency issue
---This line, and those below, will be ignored--

M    trunk/Makefile

Modified Paths:
--------------
    csw/mgar/pkg/ntop/trunk/Makefile

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 11:53:59 UTC (rev 22803)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 21:42:51 UTC (rev 22804)
@@ -44,6 +44,8 @@
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpython2-6-1-0
+CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWpython
+RUNTIME_DEP_PKGS_CSWntop += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWntop += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWntop += CSWlibrrd-th4
@@ -52,6 +54,7 @@
 RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm4
 RUNTIME_DEP_PKGS_CSWntop += CSWlibz1
 
+
 ## Following package enables optional functionality
 #RUNTIME_DEP_PKGS_CSWntop += CSWgraphviz
 #CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWgraphviz
@@ -70,7 +73,6 @@
 CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.0.3.so
 
-
 CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh
 
 sysconfdir = /etc/opt/csw
@@ -108,19 +110,19 @@
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch
 
 # Bad content files - Documentation
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/faq.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/share|root/opt/csw/share/ntop/html/faq.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/ntop.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/faq.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/share|root/opt/csw/share/ntop/html/faq.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/ntop.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
 
 # Bad content files - Shared libraries (Captured Build Info for Version Output)
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/sflowPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/cpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/rrdPlugin.so

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jonbcraig at users.sourceforge.net  Tue Jan  7 23:10:33 2014
From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net)
Date: Tue,  7 Jan 2014 22:10:33 +0000
Subject: SF.net SVN: gar:[22805] csw/mgar/pkg/ntop/trunk/Makefile
Message-ID: <3dzSTH4Q9Zz1Cc@mail.opencsw.org>

Revision: 22805
          http://sourceforge.net/p/gar/code/22805
Author:   jonbcraig
Date:     2014-01-07 22:10:31 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Added and override for libiconv2 to checkpkg

Modified Paths:
--------------
    csw/mgar/pkg/ntop/trunk/Makefile

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 21:42:51 UTC (rev 22804)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 22:10:31 UTC (rev 22805)
@@ -46,6 +46,7 @@
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpython2-6-1-0
 CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWpython
 RUNTIME_DEP_PKGS_CSWntop += CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWntop += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWntop += CSWlibrrd-th4

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 Jan  8 09:30:18 2014
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Wed,  8 Jan 2014 08:30:18 +0000
Subject: SF.net SVN: gar:[22806] csw/mgar/pkg/apt-mirror/trunk
Message-ID: <3dzkDl3f9Rz7q@mail.opencsw.org>

Revision: 22806
          http://sourceforge.net/p/gar/code/22806
Author:   pfelecan
Date:     2014-01-08 08:30:16 +0000 (Wed, 08 Jan 2014)
Log Message:
-----------
apt-mirror/trunk: version bump; upstream changed repository

Modified Paths:
--------------
    csw/mgar/pkg/apt-mirror/trunk/Makefile
    csw/mgar/pkg/apt-mirror/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/apt-mirror/trunk/files/0001-Adapt-to-OpenCSW-file-system-layout.patch

Removed Paths:
-------------
    csw/mgar/pkg/apt-mirror/trunk/files/0001-From-private-recipe.patch
    csw/mgar/pkg/apt-mirror/trunk/files/0002-Adapt-to-OpenCSW-file-system-layout.patch
    csw/mgar/pkg/apt-mirror/trunk/files/COPYING

Modified: csw/mgar/pkg/apt-mirror/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/Makefile	2014-01-07 22:10:31 UTC (rev 22805)
+++ csw/mgar/pkg/apt-mirror/trunk/Makefile	2014-01-08 08:30:16 UTC (rev 22806)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = apt-mirror
-VERSION = 0.4.8
+VERSION = 0.4.9
 GARTYPE = v2
 
 DESCRIPTION = Debian and Ubuntu apt sources mirroring tool
@@ -12,11 +12,14 @@
   which typically provided by open source developers.
 endef
 
-MASTER_SITES	=	$(SF_MIRRORS)
-DISTFILES		=	$(NAME)_$(VERSION).orig.tar.gz
-DISTFILES		+=	COPYING
-PATCHFILES		+=	0001-From-private-recipe.patch
-PATCHFILES		+=	0002-Adapt-to-OpenCSW-file-system-layout.patch
+GITHUB_USER		=	$(NAME)
+GITHUB_REFERENCE=	f7254b8
+MASTER_SITES	=	$(GITHUB_MIRROR)
+VENDOR_URL		=	http://apt-mirror.github.com/
+LICENSE			=	LICENSE
+DISTNAME		=	$(GITHUB_USER)-$(NAME)-$(GITHUB_REFERENCE)
+DISTFILES		=	$(NAME)-$(VERSION)$(GITHUB_BALL_EXT)
+PATCHFILES		+=	0001-Adapt-to-OpenCSW-file-system-layout.patch
 
 CONFIGURE_SCRIPTS	=
 BUILD_SCRIPTS		=
@@ -34,7 +37,7 @@
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
+PATH := /opt/csw/gnu:$(PATH)
 
 install-custom: pkgdocdir = $(docdir)/$(NAME)
 install-custom: pkgsysconfdir = $(sysconfdir)/$(NAME)

Modified: csw/mgar/pkg/apt-mirror/trunk/checksums
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/checksums	2014-01-07 22:10:31 UTC (rev 22805)
+++ csw/mgar/pkg/apt-mirror/trunk/checksums	2014-01-08 08:30:16 UTC (rev 22806)
@@ -1 +1 @@
-a3b46493958fe9b6440779fbc64f650e  apt-mirror_0.4.8.orig.tar.gz
+2b89261a91e5cde86a8d61d27a63ecd9  apt-mirror-0.4.9.tar.gz

Added: csw/mgar/pkg/apt-mirror/trunk/files/0001-Adapt-to-OpenCSW-file-system-layout.patch
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/files/0001-Adapt-to-OpenCSW-file-system-layout.patch	                        (rev 0)
+++ csw/mgar/pkg/apt-mirror/trunk/files/0001-Adapt-to-OpenCSW-file-system-layout.patch	2014-01-08 08:30:16 UTC (rev 22806)
@@ -0,0 +1,76 @@
+From a6e093a3f09a8a1903b6ff1d5cf5597df65a08f0 Mon Sep 17 00:00:00 2001
+From: Peter Felecan 
+Date: Wed, 8 Jan 2014 09:25:17 +0100
+Subject: [PATCH] Adapt to OpenCSW file system layout
+
+---
+ apt-mirror | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/apt-mirror b/apt-mirror
+index 989561c..e0123d1 100755
+--- a/apt-mirror
++++ b/apt-mirror
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl -w
+ 
+ =pod
+ 
+@@ -27,7 +27,7 @@ Main features:
+ 
+ =head1 COMMENTS
+ 
+-apt-mirror uses F as a configuration file.
++apt-mirror uses F as a configuration file.
+ By default it is tuned to official Debian or Ubuntu mirrors. Change
+ it for your needs.
+ 
+@@ -39,19 +39,19 @@ Or uncomment line in F to enable daily mirror updates.
+ 
+ =head1 FILES
+ 
+-F
++F
+         Main configuration file
+ 
+ F
+         Cron configuration template
+ 
+-F
++F
+         Mirror places here
+ 
+-F
++F
+         Place for temporarily downloaded indexes
+ 
+-F
++F
+         Log files placed here. URLs and MD5 sums also here.
+ 
+ =head1 CONFIGURATION EXAMPLES
+@@ -96,9 +96,9 @@ use Fcntl qw(:flock);
+ my $config_file;
+ 
+ my %config_variables = (
+-    "defaultarch" => `dpkg --print-installation-architecture 2>/dev/null` || 'i386',
++    "defaultarch" => 'i386',
+     "nthreads"    => 20,
+-    "base_path"   => '/var/spool/apt-mirror',
++    "base_path"   => '/var/opt/csw/apt-mirror',
+     "mirror_path" => '$base_path/mirror',
+     "skel_path"   => '$base_path/skel',
+     "var_path"    => '$base_path/var',
+@@ -125,7 +125,7 @@ my %clean_directory = ();
+ ######################################################################################
+ ## Setting up $config_file variable
+ 
+-$config_file = "/etc/apt/mirror.list";    # Default value
++$config_file = "/etc/opt/csw/apt/mirror.list";    # Default value
+ if ( $_ = shift )
+ {
+     die("apt-mirror: invalid config file specified") unless -f $_;
+-- 
+1.8.4.1
+

Deleted: csw/mgar/pkg/apt-mirror/trunk/files/0001-From-private-recipe.patch
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/files/0001-From-private-recipe.patch	2014-01-07 22:10:31 UTC (rev 22805)
+++ csw/mgar/pkg/apt-mirror/trunk/files/0001-From-private-recipe.patch	2014-01-08 08:30:16 UTC (rev 22806)
@@ -1,63 +0,0 @@
-From 4e4f67cd7ee806be2caf11d9a1a10d0240c3bfbb Mon Sep 17 00:00:00 2001
-From: Peter Felecan 
-Date: Thu, 2 Aug 2012 15:40:34 +0200
-Subject: [PATCH] From private recipe
-
----
- apt-mirror | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/apt-mirror b/apt-mirror
-index d03fe58..f5f54b9 100755
---- a/apt-mirror
-+++ b/apt-mirror
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#! /usr/bin/env perl -w
- 
- =pod
- 
-@@ -90,7 +90,7 @@ use File::Basename;
- my $config_file;
- 
- my %config_variables = (
--    "defaultarch" => `dpkg --print-installation-architecture 2>/dev/null` || 'i386',
-+    "defaultarch" => 'i386',
-     "nthreads"    => 20,
-     "base_path"   => '/var/spool/apt-mirror',
-     "mirror_path" => '$base_path/mirror',
-@@ -235,15 +235,6 @@ sub download_urls {
- }
- 
- ######################################################################################
--## Create the 3 needed directories if they don't exist yet
--my @needed_directories = (get_variable("mirror_path"), get_variable("skel_path"), get_variable("var_path"));
--foreach my $needed_directory (@needed_directories) {
--    unless (-d $needed_directory) {
--        mkdir($needed_directory) or die("apt-mirror: can't create $needed_directory directory");
--    }
--}
--
--######################################################################################
- ## Parse config
- 
- open CONFIG, "<$config_file" or die("apt-mirror: can't open config file ($config_file)");
-@@ -295,6 +286,15 @@ close CONFIG;
- 
- die("Please explicitly specify 'defaultarch' in mirror.list") unless get_variable("defaultarch");
- 
-+######################################################################################
-+## Create the 3 needed directories if they don't exist yet
-+my @needed_directories = (get_variable("mirror_path"), get_variable("skel_path"), get_variable("var_path"));
-+foreach my $needed_directory (@needed_directories) {
-+    unless (-d $needed_directory) {
-+        mkdir($needed_directory) or die("apt-mirror: can't create $needed_directory directory");
-+    }
-+}
-+
- check_lock();
- 
- $SIG{INT} = "unlock_aptmirror";
--- 
-1.7.11.3
-

Deleted: csw/mgar/pkg/apt-mirror/trunk/files/0002-Adapt-to-OpenCSW-file-system-layout.patch
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/files/0002-Adapt-to-OpenCSW-file-system-layout.patch	2014-01-07 22:10:31 UTC (rev 22805)
+++ csw/mgar/pkg/apt-mirror/trunk/files/0002-Adapt-to-OpenCSW-file-system-layout.patch	2014-01-08 08:30:16 UTC (rev 22806)
@@ -1,81 +0,0 @@
-From 4c639c999513024a5f7022da56d7e3beefc642d9 Mon Sep 17 00:00:00 2001
-From: Peter Felecan 
-Date: Thu, 2 Aug 2012 15:57:31 +0200
-Subject: [PATCH] Adapt to OpenCSW file system layout
-
----
- apt-mirror  | 14 +++++++-------
- mirror.list |  2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/apt-mirror b/apt-mirror
-index f5f54b9..8d9e49a 100755
---- a/apt-mirror
-+++ b/apt-mirror
-@@ -27,7 +27,7 @@ Main features:
- 
- =head1 COMMENTS
- 
--apt-mirror uses F as a configuration file.
-+apt-mirror uses F as a configuration file.
- By default it is tuned to official Debian or Ubuntu mirrors. Change
- it for your needs.
- 
-@@ -39,19 +39,19 @@ Or uncomment line in F to enable daily mirror updates.
- 
- =head1 FILES
- 
--F
-+F
-         Main configuration file
- 
- F
-         Cron configuration template
- 
--F
-+F
-         Mirror places here
- 
--F
-+F
-         Place for temporarily downloaded indexes
- 
--F
-+F
-         Log files placed here. URLs and MD5 summs also here.
- 
- =head1 CONFIGURATION EXAMPLES
-@@ -92,7 +92,7 @@ my $config_file;
- my %config_variables = (
-     "defaultarch" => 'i386',
-     "nthreads"    => 20,
--    "base_path"   => '/var/spool/apt-mirror',
-+    "base_path"   => '/var/opt/csw/apt-mirror',
-     "mirror_path" => '$base_path/mirror',
-     "skel_path"   => '$base_path/skel',
-     "var_path"    => '$base_path/var',
-@@ -117,7 +117,7 @@ my %clean_directory = ();
- ######################################################################################
- ## Setting up $config_file variable
- 
--$config_file = "/etc/apt/mirror.list";	# Default value
-+$config_file = "/etc/opt/csw/apt/mirror.list";	# Default value
- if($_ = shift) {
-     die("apt-mirror: invalid config file specified") unless -f $_;
-     $config_file = $_;
-diff --git a/mirror.list b/mirror.list
-index 3b4ee8a..e2230f7 100644
---- a/mirror.list
-+++ b/mirror.list
-@@ -2,7 +2,7 @@
- #
- ## default configuration options (uncomment and change to override)
- #
--#set base_path    /var/spool/apt-mirror
-+#set base_path    /var/opt/csw/apt-mirror
- #
- ## if you change the base path you must create the directories below with write privlages
- #
--- 
-1.7.11.3
-

Deleted: csw/mgar/pkg/apt-mirror/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/apt-mirror/trunk/files/COPYING	2014-01-07 22:10:31 UTC (rev 22805)
+++ csw/mgar/pkg/apt-mirror/trunk/files/COPYING	2014-01-08 08:30:16 UTC (rev 22806)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  , 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

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 Jan  8 10:16:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed,  8 Jan 2014 09:16:05 +0000
Subject: SF.net SVN: gar:[22807] csw/mgar/pkg/sudo/trunk
Message-ID: <3dzlFB6wvLzDs@mail.opencsw.org>

Revision: 22807
          http://sourceforge.net/p/gar/code/22807
Author:   dmichelsen
Date:     2014-01-08 09:16:04 +0000 (Wed, 08 Jan 2014)
Log Message:
-----------
sudo/trunk: Update to 1.8.9p1

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	2014-01-08 08:30:16 UTC (rev 22806)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2014-01-08 09:16:04 UTC (rev 22807)
@@ -2,7 +2,7 @@
 #
 
 NAME = sudo
-VERSION = 1.8.9
+VERSION = 1.8.9p1
 GARTYPE = v2
 
 EXTRA_MODULATORS = LDAP

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2014-01-08 08:30:16 UTC (rev 22806)
+++ csw/mgar/pkg/sudo/trunk/checksums	2014-01-08 09:16:04 UTC (rev 22807)
@@ -1 +1 @@
-4bbe88c40463ce842f4741a6a23e5857  sudo-1.8.9.tar.gz
+03773c373082843211c96df2c9187146  sudo-1.8.9p1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From laurent at opencsw.org  Wed Jan  8 11:59:59 2014
From: laurent at opencsw.org (Laurent Blume)
Date: Wed, 08 Jan 2014 11:59:59 +0100
Subject: SF.net SVN: gar:[22370] csw/mgar/pkg/gtk2/trunk
In-Reply-To: <20140108080717.GA18527@bender.opencsw.org>
References: 
	<52C2E0F5.4030609@opencsw.org>
	
	<20140108080717.GA18527@bender.opencsw.org>
Message-ID: <52CD2FAF.7000806@opencsw.org>

Hello Rafi,

Sure, no problem. I can test easily enough, or even build patched 
versions locally (somewhat faster than on the buildfarm) so don't 
hesitate if you have anything to try.

Thanks!.

Laurent

Le 2014/01/08 11:58 +0100, Rafael Ostertag a ?crit:
> Hi Laurent
>
> Sorry for the late response.
>
> I'll try to figure out what's wrong by the end of the week and let you know of
> the outcome.
>
> cheers
> rafi
>
> On Wed, Jan 01, 2014 at 11:33:54AM +0000, Maciej (Matchek) Blizi??ski wrote:
>> [+raos directly]
>>
>>
>>
>>
>> 2013/12/31 Laurent Blume 
>>
>>> Hello,
>>>
>>> I'm not sure if this is directly related to that commit: I've noticed that
>>> input method doesn't work anymore for me in at least 2 CSW GTK2 apps where
>>> it used to work, gvim and pidgin.
>>>
>>> Ie, when I set the IM to Chinese, nothing happens, input keeps being the
>>> direct key symbols. It still works fine in Solaris 10's GNOME apps.
>>>
>>> I've set this environment variable:
>>> GTK_IM_MODULE=xim
>>>
>>> A little tinkering and some truss shows no attempt at all of using
>>> /etc/opt/csw/gtk-2.0/gtk.immodules.
>>>
>>> Any idea?
>>>
>>> Laurent
>>>
>>>
>>> Le 2013/12/31 16:17 +0100, guengel a ??crit:
>>>
>>>   Revision: 22370
>>>>             http://gar.svn.sourceforge.net/gar/?rev=22370&view=rev
>>>> Author:   guengel
>>>> Date:     2013-11-04 12:15:31 +0000 (Mon, 04 Nov 2013)
>>>> Log Message:
>>>> -----------
>>>> gtk2/trunk: Updated patch files. Fixed error in post-merge, resulting in
>>>> etc/csw/64/64 directory. Minor changes.
>>>>
>>>> Modified Paths:
>>>> --------------
>>>>       csw/mgar/pkg/gtk2/trunk/Makefile
>>>>       csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
>>>>
>>>> Added Paths:
>>>> -----------
>>>>       csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>>>>
>>>> Removed Paths:
>>>> -------------
>>>>       csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-
>>>> line-option.patch
>>>>       csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>>>>
>>>> Modified: csw/mgar/pkg/gtk2/trunk/Makefile
>>>> ===================================================================
>>>> --- csw/mgar/pkg/gtk2/trunk/Makefile    2013-11-04 09:54:03 UTC (rev
>>>> 22369)
>>>> +++ csw/mgar/pkg/gtk2/trunk/Makefile    2013-11-04 12:15:31 UTC (rev
>>>> 22370)
>>>> @@ -26,13 +26,8 @@
>>>>    EXPANDVARS = CSWgtk2.postinstall
>>>>
>>>>    # This makes the tests work in the first place
>>>> -#PATCHFILES += 0002-Use-absolute-path-to-Xvfb.patch
>>>> +PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch
>>>>
>>>> -# This patch adds a command line option `--update-modules` to
>>>> -# gtk-query-immodules-2.0 which has the default location of
>>>> -# gtk.immodules hardcoded and takes 32/64bit ISAs into account.
>>>> -PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch
>>>> -
>>>>    PATCHFILES += 0000-Disable-gtk_test_create_
>>>> widget-g_type_from_name-GtkT.patch
>>>>
>>>>    PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch
>>>> @@ -191,8 +186,6 @@
>>>>    CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibglib2-0-0
>>>>
>>>>
>>>> -
>>>> -
>>>>    PACKAGES += CSWgtk2doc
>>>>    SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation
>>>>    ARCHALL_CSWgtk2doc = 1
>>>> @@ -219,6 +212,9 @@
>>>>    BUILD_DEP_PKGS += CSWlibpng-dev
>>>>    BUILD_DEP_PKGS += CSWfontconfig-dev
>>>>    BUILD_DEP_PKGS += CSWlibfreetype-dev
>>>> +BUILD_DEP_PKGS += CSWlibgcrypt-dev
>>>> +BUILD_DEP_PKGS += CSWlibgpg-error-dev
>>>> +BUILD_DEP_PKGS += CSWlibgnutls-dev
>>>>    # Needed to make a test work
>>>>    BUILD_DEP_PKGS += CSWgamin
>>>>    # Used to adjust documentation
>>>> @@ -244,8 +240,8 @@
>>>>    include gar/category.mk
>>>>
>>>>    post-merge:
>>>> -       ginstall -d $(PKGROOT)$(sysconfdir)/64/gtk-2.0
>>>> -       ginstall $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf
>>>> $(PKGROOT)$(sysconfdir)/64/gtk-2.0/
>>>> +       ginstall -d $(PKGROOT)$(sysconfdir)/gtk-2.0
>>>> +       [ -f $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf ] ||
>>>> ginstall $(PKGROOT)/etc/opt/csw/gtk-2.0/im-multipress.conf
>>>> $(PKGROOT)$(sysconfdir)/gtk-2.0/
>>>>          gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \
>>>>                  -e 's|/usr/lib|$(libdir)|g' \
>>>>                  -e 's|/usr/include|$(includedir)|g' `find
>>>> $(PKGROOT)$(sharedstatedir)/gtk-doc -type f`
>>>>
>>>> Added: csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>>>> ===================================================================
>>>> --- csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>>>>                         (rev 0)
>>>> +++ csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>>>>   2013-11-04 12:15:31 UTC (rev 22370)
>>>> @@ -0,0 +1,1136 @@
>>>> +From ee4b41c24742a456a5d772bb648d2f1c7b5a9c89 Mon Sep 17 00:00:00 2001
>>>> +From: Rafael Ostertag 
>>>> +Date: Mon, 4 Nov 2013 11:01:39 +0100
>>>> +Subject: [PATCH] Use absolute path to Xvfb
>>>> +
>>>> +---
>>>> + Makefile.decl                                        | 6 +++---
>>>> + Makefile.in                                          | 6 +++---
>>>> + build/Makefile.in                                    | 6 +++---
>>>> + build/win32/Makefile.in                              | 6 +++---
>>>> + build/win32/vs10/Makefile.in                         | 6 +++---
>>>> + build/win32/vs9/Makefile.in                          | 6 +++---
>>>> + demos/Makefile.in                                    | 6 +++---
>>>> + demos/gtk-demo/Makefile.in                           | 6 +++---
>>>> + docs/Makefile.in                                     | 6 +++---
>>>> + docs/faq/Makefile.in                                 | 6 +++---
>>>> + docs/reference/Makefile.in                           | 6 +++---
>>>> + docs/reference/gdk/Makefile.in                       | 6 +++---
>>>> + docs/reference/gtk/Makefile.in                       | 6 +++---
>>>> + docs/reference/libgail-util/Makefile.in              | 6 +++---
>>>> + docs/tools/Makefile.in                               | 6 +++---
>>>> + docs/tutorial/Makefile.in                            | 6 +++---
>>>> + gdk/Makefile.in                                      | 6 +++---
>>>> + gdk/directfb/Makefile.in                             | 6 +++---
>>>> + gdk/quartz/Makefile.in                               | 6 +++---
>>>> + gdk/tests/Makefile.in                                | 6 +++---
>>>> + gdk/win32/Makefile.in                                | 6 +++---
>>>> + gdk/win32/rc/Makefile.in                             | 6 +++---
>>>> + gdk/x11/Makefile.in                                  | 6 +++---
>>>> + gtk/Makefile.in                                      | 6 +++---
>>>> + gtk/tests/Makefile.in                                | 6 +++---
>>>> + gtk/theme-bits/Makefile.in                           | 6 +++---
>>>> + m4macros/Makefile.in                                 | 6 +++---
>>>> + modules/Makefile.in                                  | 6 +++---
>>>> + modules/engines/Makefile.in                          | 6 +++---
>>>> + modules/engines/ms-windows/Makefile.in               | 6 +++---
>>>> + modules/engines/ms-windows/Theme/Makefile.in         | 6 +++---
>>>> + modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in | 6 +++---
>>>> + modules/engines/pixbuf/Makefile.in                   | 6 +++---
>>>> + modules/input/Makefile.in                            | 6 +++---
>>>> + modules/other/Makefile.in                            | 6 +++---
>>>> + modules/other/gail/Makefile.in                       | 6 +++---
>>>> + modules/other/gail/libgail-util/Makefile.in          | 6 +++---
>>>> + modules/other/gail/tests/Makefile.in                 | 6 +++---
>>>> + modules/printbackends/Makefile.in                    | 6 +++---
>>>> + modules/printbackends/cups/Makefile.in               | 6 +++---
>>>> + modules/printbackends/file/Makefile.in               | 6 +++---
>>>> + modules/printbackends/lpr/Makefile.in                | 6 +++---
>>>> + modules/printbackends/test/Makefile.in               | 6 +++---
>>>> + perf/Makefile.in                                     | 6 +++---
>>>> + tests/Makefile.in                                    | 6 +++---
>>>> + 45 files changed, 135 insertions(+), 135 deletions(-)
>>>> +
>>>> +diff --git a/Makefile.decl b/Makefile.decl
>>>> +index 2f6c579..46a9864 100644
>>>> +--- a/Makefile.decl
>>>> ++++ b/Makefile.decl
>>>> +@@ -9,8 +9,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -25,7 +25,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> + # call as: $(XVFB_START) && someprogram
>>>> +
>>>> +diff --git a/Makefile.in b/Makefile.in
>>>> +index 14be894..144c7bd 100644
>>>> +--- a/Makefile.in
>>>> ++++ b/Makefile.in
>>>> +@@ -531,8 +531,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -549,7 +549,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SRC_SUBDIRS = gdk gtk modules demos tests perf
>>>> +diff --git a/build/Makefile.in b/build/Makefile.in
>>>> +index 76c8e1f..c3f8dc2 100644
>>>> +--- a/build/Makefile.in
>>>> ++++ b/build/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = \
>>>> +diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
>>>> +index 8a82342..7ea9e7f 100644
>>>> +--- a/build/win32/Makefile.in
>>>> ++++ b/build/win32/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = \
>>>> +diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in
>>>> +index f0981dc..a42270f 100644
>>>> +--- a/build/win32/vs10/Makefile.in
>>>> ++++ b/build/win32/vs10/Makefile.in
>>>> +@@ -361,8 +361,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -379,7 +379,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + all: all-am
>>>> +diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in
>>>> +index 00013d5..8f49c62 100644
>>>> +--- a/build/win32/vs9/Makefile.in
>>>> ++++ b/build/win32/vs9/Makefile.in
>>>> +@@ -357,8 +357,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -375,7 +375,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + all: all-am
>>>> +diff --git a/demos/Makefile.in b/demos/Makefile.in
>>>> +index 6e896b4..66ac0ee 100644
>>>> +--- a/demos/Makefile.in
>>>> ++++ b/demos/Makefile.in
>>>> +@@ -476,8 +476,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -494,7 +494,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = gtk-demo
>>>> +diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
>>>> +index 25ba622..bd320c5 100644
>>>> +--- a/demos/gtk-demo/Makefile.in
>>>> ++++ b/demos/gtk-demo/Makefile.in
>>>> +@@ -457,8 +457,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -475,7 +475,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + democodedir = $(datadir)/gtk-2.0/demo
>>>> +diff --git a/docs/Makefile.in b/docs/Makefile.in
>>>> +index adceca2..7eae1b6 100644
>>>> +--- a/docs/Makefile.in
>>>> ++++ b/docs/Makefile.in
>>>> +@@ -419,8 +419,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -437,7 +437,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = tutorial faq reference tools
>>>> +diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in
>>>> +index 6f896a7..aaea95f 100644
>>>> +--- a/docs/faq/Makefile.in
>>>> ++++ b/docs/faq/Makefile.in
>>>> +@@ -355,8 +355,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -373,7 +373,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + all: all-am
>>>> +diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
>>>> +index 86aa70f..46c1dc4 100644
>>>> +--- a/docs/reference/Makefile.in
>>>> ++++ b/docs/reference/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = gdk gtk libgail-util
>>>> +diff --git a/docs/reference/gdk/Makefile.in
>>>> b/docs/reference/gdk/Makefile.in
>>>> +index 0a5771c..4cb237f 100644
>>>> +--- a/docs/reference/gdk/Makefile.in
>>>> ++++ b/docs/reference/gdk/Makefile.in
>>>> +@@ -362,8 +362,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -380,7 +380,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + AUTOMAKE_OPTIONS = 1.6
>>>> +diff --git a/docs/reference/gtk/Makefile.in
>>>> b/docs/reference/gtk/Makefile.in
>>>> +index c4e031d..399da26 100644
>>>> +--- a/docs/reference/gtk/Makefile.in
>>>> ++++ b/docs/reference/gtk/Makefile.in
>>>> +@@ -393,8 +393,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -411,7 +411,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + AUTOMAKE_OPTIONS = 1.6
>>>> +diff --git a/docs/reference/libgail-util/Makefile.in
>>>> b/docs/reference/libgail-util/Makefile.in
>>>> +index ea6f06a..9be07c9 100644
>>>> +--- a/docs/reference/libgail-util/Makefile.in
>>>> ++++ b/docs/reference/libgail-util/Makefile.in
>>>> +@@ -362,8 +362,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -380,7 +380,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + AUTOMAKE_OPTIONS = 1.7
>>>> +diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in
>>>> +index 77d105a..72951ee 100644
>>>> +--- a/docs/tools/Makefile.in
>>>> ++++ b/docs/tools/Makefile.in
>>>> +@@ -409,8 +409,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -427,7 +427,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INCLUDES = \
>>>> +diff --git a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in
>>>> +index d606fc0..5300503 100644
>>>> +--- a/docs/tutorial/Makefile.in
>>>> ++++ b/docs/tutorial/Makefile.in
>>>> +@@ -366,8 +366,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -384,7 +384,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + all: all-am
>>>> +diff --git a/gdk/Makefile.in b/gdk/Makefile.in
>>>> +index 954c755..6ea19a5 100644
>>>> +--- a/gdk/Makefile.in
>>>> ++++ b/gdk/Makefile.in
>>>> +@@ -752,8 +752,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -770,7 +770,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INTROSPECTION_GIRS = $(am__append_1) $(am__append_2)
>>>> +diff --git a/gdk/directfb/Makefile.in b/gdk/directfb/Makefile.in
>>>> +index ccda1b7..34dc589 100644
>>>> +--- a/gdk/directfb/Makefile.in
>>>> ++++ b/gdk/directfb/Makefile.in
>>>> +@@ -445,8 +445,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -463,7 +463,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>>>> +diff --git a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in
>>>> +index 159a437..60ae58a 100644
>>>> +--- a/gdk/quartz/Makefile.in
>>>> ++++ b/gdk/quartz/Makefile.in
>>>> +@@ -444,8 +444,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -462,7 +462,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>>>> +diff --git a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in
>>>> +index 8506730..7c6a383 100644
>>>> +--- a/gdk/tests/Makefile.in
>>>> ++++ b/gdk/tests/Makefile.in
>>>> +@@ -560,8 +560,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -578,7 +578,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + NULL =
>>>> +diff --git a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in
>>>> +index 996acda..3bbb565 100644
>>>> +--- a/gdk/win32/Makefile.in
>>>> ++++ b/gdk/win32/Makefile.in
>>>> +@@ -486,8 +486,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -504,7 +504,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>>>> +diff --git a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in
>>>> +index a994aae..6280f98 100644
>>>> +--- a/gdk/win32/rc/Makefile.in
>>>> ++++ b/gdk/win32/rc/Makefile.in
>>>> +@@ -357,8 +357,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -375,7 +375,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @USE_WIN32_TRUE at noinst_DATA = gdk-win32-res.o
>>>> +diff --git a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
>>>> +index 72fa239..cef6cd0 100644
>>>> +--- a/gdk/x11/Makefile.in
>>>> ++++ b/gdk/x11/Makefile.in
>>>> +@@ -652,8 +652,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -670,7 +670,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>>>> +diff --git a/gtk/Makefile.in b/gtk/Makefile.in
>>>> +index 61491c3..d6908a8 100644
>>>> +--- a/gtk/Makefile.in
>>>> ++++ b/gtk/Makefile.in
>>>> +@@ -1464,8 +1464,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -1482,7 +1482,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INTROSPECTION_GIRS = $(am__append_16)
>>>> +diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
>>>> +index 072995f..2c4735d 100644
>>>> +--- a/gtk/tests/Makefile.in
>>>> ++++ b/gtk/tests/Makefile.in
>>>> +@@ -476,8 +476,8 @@ TEST_PROGS = testing liststore treestore treeview
>>>> treeview-scrolling \
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -494,7 +494,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INCLUDES = \
>>>> +diff --git a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in
>>>> +index 9f17ee0..4539c32 100644
>>>> +--- a/gtk/theme-bits/Makefile.in
>>>> ++++ b/gtk/theme-bits/Makefile.in
>>>> +@@ -407,8 +407,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -425,7 +425,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INCLUDES = \
>>>> +diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
>>>> +index 7d4364a..25a250b 100644
>>>> +--- a/m4macros/Makefile.in
>>>> ++++ b/m4macros/Makefile.in
>>>> +@@ -385,8 +385,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -403,7 +403,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + installed_m4 = gtk-2.0.m4
>>>> +diff --git a/modules/Makefile.in b/modules/Makefile.in
>>>> +index d096963..4eb8a3f 100644
>>>> +--- a/modules/Makefile.in
>>>> ++++ b/modules/Makefile.in
>>>> +@@ -416,8 +416,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -434,7 +434,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = input engines other $(am__append_1)
>>>> +diff --git a/modules/engines/Makefile.in b/modules/engines/Makefile.in
>>>> +index 61cd1f8..dc71eec 100644
>>>> +--- a/modules/engines/Makefile.in
>>>> ++++ b/modules/engines/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @USE_WIN32_TRUE at wimp = ms-windows
>>>> +diff --git a/modules/engines/ms-windows/Makefile.in
>>>> b/modules/engines/ms-windows/Makefile.in
>>>> +index 06b02a3..64db751 100644
>>>> +--- a/modules/engines/ms-windows/Makefile.in
>>>> ++++ b/modules/engines/ms-windows/Makefile.in
>>>> +@@ -481,8 +481,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -499,7 +499,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = Theme
>>>> +diff --git a/modules/engines/ms-windows/Theme/Makefile.in
>>>> b/modules/engines/ms-windows/Theme/Makefile.in
>>>> +index 4d4ea1e..5add436 100644
>>>> +--- a/modules/engines/ms-windows/Theme/Makefile.in
>>>> ++++ b/modules/engines/ms-windows/Theme/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = gtk-2.0
>>>> +diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>>>> b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>>>> +index a88fa10..d2f9145 100644
>>>> +--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>>>> ++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>>>> +@@ -385,8 +385,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -403,7 +403,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + themedir = $(datadir)/themes/MS-Windows/gtk-2.0
>>>> +diff --git a/modules/engines/pixbuf/Makefile.in
>>>> b/modules/engines/pixbuf/Makefile.in
>>>> +index 78cbc0a..0f71891 100644
>>>> +--- a/modules/engines/pixbuf/Makefile.in
>>>> ++++ b/modules/engines/pixbuf/Makefile.in
>>>> +@@ -440,8 +440,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -458,7 +458,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/input/Makefile.in b/modules/input/Makefile.in
>>>> +index 6c1bf95..241dea7 100644
>>>> +--- a/modules/input/Makefile.in
>>>> ++++ b/modules/input/Makefile.in
>>>> +@@ -657,8 +657,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -675,7 +675,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/other/Makefile.in b/modules/other/Makefile.in
>>>> +index 27fc352..c308000 100644
>>>> +--- a/modules/other/Makefile.in
>>>> ++++ b/modules/other/Makefile.in
>>>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -433,7 +433,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = gail
>>>> +diff --git a/modules/other/gail/Makefile.in
>>>> b/modules/other/gail/Makefile.in
>>>> +index 5d0c421..2b30e1f 100644
>>>> +--- a/modules/other/gail/Makefile.in
>>>> ++++ b/modules/other/gail/Makefile.in
>>>> +@@ -516,8 +516,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -534,7 +534,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = libgail-util tests
>>>> +diff --git a/modules/other/gail/libgail-util/Makefile.in
>>>> b/modules/other/gail/libgail-util/Makefile.in
>>>> +index 662d504..39ffa49 100644
>>>> +--- a/modules/other/gail/libgail-util/Makefile.in
>>>> ++++ b/modules/other/gail/libgail-util/Makefile.in
>>>> +@@ -446,8 +446,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -464,7 +464,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/other/gail/tests/Makefile.in
>>>> b/modules/other/gail/tests/Makefile.in
>>>> +index 7b1bedc..9bfc526 100644
>>>> +--- a/modules/other/gail/tests/Makefile.in
>>>> ++++ b/modules/other/gail/tests/Makefile.in
>>>> +@@ -584,8 +584,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -602,7 +602,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/printbackends/Makefile.in b/modules/printbackends/
>>>> Makefile.in
>>>> +index b391ee5..4d1a604 100644
>>>> +--- a/modules/printbackends/Makefile.in
>>>> ++++ b/modules/printbackends/Makefile.in
>>>> +@@ -417,8 +417,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -435,7 +435,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + SUBDIRS = file lpr $(am__append_1) $(am__append_2) $(am__append_3)
>>>> +diff --git a/modules/printbackends/cups/Makefile.in
>>>> b/modules/printbackends/cups/Makefile.in
>>>> +index dda693b..7d2db62 100644
>>>> +--- a/modules/printbackends/cups/Makefile.in
>>>> ++++ b/modules/printbackends/cups/Makefile.in
>>>> +@@ -444,8 +444,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -462,7 +462,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/printbackends/file/Makefile.in
>>>> b/modules/printbackends/file/Makefile.in
>>>> +index b3ed091..7457181 100644
>>>> +--- a/modules/printbackends/file/Makefile.in
>>>> ++++ b/modules/printbackends/file/Makefile.in
>>>> +@@ -443,8 +443,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -461,7 +461,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/printbackends/lpr/Makefile.in
>>>> b/modules/printbackends/lpr/Makefile.in
>>>> +index f353313..616a0e9 100644
>>>> +--- a/modules/printbackends/lpr/Makefile.in
>>>> ++++ b/modules/printbackends/lpr/Makefile.in
>>>> +@@ -441,8 +441,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -459,7 +459,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/modules/printbackends/test/Makefile.in
>>>> b/modules/printbackends/test/Makefile.in
>>>> +index a31655a..66a2df5 100644
>>>> +--- a/modules/printbackends/test/Makefile.in
>>>> ++++ b/modules/printbackends/test/Makefile.in
>>>> +@@ -442,8 +442,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -460,7 +460,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>>>> +diff --git a/perf/Makefile.in b/perf/Makefile.in
>>>> +index a1d3491..2a33017 100644
>>>> +--- a/perf/Makefile.in
>>>> ++++ b/perf/Makefile.in
>>>> +@@ -410,8 +410,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -428,7 +428,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INCLUDES = \
>>>> +diff --git a/tests/Makefile.in b/tests/Makefile.in
>>>> +index 8b937c9..2629d74 100644
>>>> +--- a/tests/Makefile.in
>>>> ++++ b/tests/Makefile.in
>>>> +@@ -933,8 +933,8 @@ TEST_PROGS =
>>>> +
>>>> + ### testing rules
>>>> +
>>>> +-# Xvfb based test rules
>>>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> ++# /usr/X11/bin/Xvfb based test rules
>>>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> +    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> +    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> +@@ -951,7 +951,7 @@ XVFB_START = \
>>>> +       && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>>>> $$id; exit 0; }; done; exit 1` \
>>>> +       && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>>>> /dev/null >/dev/null 2>&1 & \
>>>> +              trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>>>> } \
>>>> +-      || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>>>> X11 target tests."; exit 1; } \
>>>> ++      || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>>>> environment for X11 target tests."; exit 1; } \
>>>> +       && DISPLAY=:$$XID && export DISPLAY
>>>> +
>>>> + INCLUDES = \
>>>> +--
>>>> +1.8.4.1
>>>> +
>>>>
>>>> Deleted: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-
>>>> line-option.patch
>>>> ===================================================================
>>>> --- csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
>>>> 2013-11-04 09:54:03 UTC (rev 22369)
>>>> +++ csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
>>>> 2013-11-04 12:15:31 UTC (rev 22370)
>>>> @@ -1,109 +0,0 @@
>>>> -From 12dfaa24cf6f26d7293d68e5b0ad3c1ce1504ea6 Mon Sep 17 00:00:00 2001
>>>> -From: Rafael Ostertag 
>>>> -Date: Mon, 4 Nov 2013 08:43:08 +0100
>>>> -Subject: [PATCH] Add --update-modules cmd line option
>>>> -
>>>> ----
>>>> - gtk/queryimmodules.c | 55 ++++++++++++++++++++++++++++++
>>>> ++++++++++++++++++----
>>>> - 1 file changed, 51 insertions(+), 4 deletions(-)
>>>> -
>>>> -diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
>>>> -index a91ea47..69d89df 100644
>>>> ---- a/gtk/queryimmodules.c
>>>> -+++ b/gtk/queryimmodules.c
>>>> -@@ -23,6 +23,7 @@
>>>> -
>>>> - #include 
>>>> - #include 
>>>> -+#include 
>>>> - #include 
>>>> -
>>>> - #include 
>>>> -@@ -30,6 +31,8 @@
>>>> - #ifdef HAVE_UNISTD_H
>>>> - #include 
>>>> - #endif
>>>> -+#include 
>>>> -+#include 
>>>> -
>>>> - #ifdef USE_LA_MODULES
>>>> - #define SOEXT ".la"
>>>> -@@ -162,27 +165,71 @@ query_module (const char *dir, const char *name,
>>>> GString *contents)
>>>> - int main (int argc, char **argv)
>>>> - {
>>>> -   char *cwd;
>>>> --  int i;
>>>> -+  int i, fd, retval;
>>>> -   char *path;
>>>> -+  char *gtk_immodules;
>>>> -   gboolean error = FALSE;
>>>> -   gchar *cache_file = NULL;
>>>> -   gint first_file = 1;
>>>> -   GString *contents;
>>>> -
>>>> -+
>>>> -+
>>>> -   if (argc > 1 && strcmp (argv[1], "--update-cache") == 0)
>>>> -     {
>>>> -       cache_file = gtk_rc_get_im_module_file ();
>>>> -       first_file = 2;
>>>> -     }
>>>> -
>>>> -+  /*
>>>> -+   * Quick an dirty hack.
>>>> -+   *
>>>> -+   * This will allow us to create the gtk.immodules in the default
>>>> -+   * place by providing `--update-modules' as cmd line argument,
>>>> -+   * without worrying where this might be when calling
>>>> -+   * gtk-query-immodules-2.0 from a postinstall script.
>>>> -+   *
>>>> -+   * The basic idea is to redirect STDOUT to the default file and then
>>>> -+   * let the normal flow of the program continue like there was no cmd
>>>> -+   * line argument. Be aware, that this only works when no other cmd
>>>> -+   * line options were passed.
>>>> -+   */
>>>> -+  if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
>>>> -+    {
>>>> -+      gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>>>> "gtk.immodules", NULL);
>>>> -+      fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR
>>>> | S_IWUSR | S_IRGRP | S_IROTH);
>>>> -+      if ( fd == -1 )
>>>> -+        {
>>>> -+          g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules);
>>>> -+          exit(1);
>>>> -+        }
>>>> -+
>>>> -+      if ( dup2(fd, STDOUT_FILENO) == -1 )
>>>> -+        {
>>>> -+          g_fprintf(stderr, "Unable to redirect STDOUT.\n");
>>>> -+          exit(1);
>>>> -+        }
>>>> -+
>>>> -+      /*
>>>> -+       * cheat, to make it think there are no arguments given
>>>> -+       */
>>>> -+      first_file = 2;
>>>> -+    }
>>>> -+
>>>> -+
>>>> -   contents = g_string_new ("");
>>>> -   g_string_append_printf (contents,
>>>> -                           "# GTK+ Input Method Modules file\n"
>>>> -                           "# Automatically generated file, do not
>>>> edit\n"
>>>> --                          "# Created by %s from gtk+-%d.%d.%d\n"
>>>> --                          "#\n",
>>>> -+                          "# Created by %s from gtk+-%d.%d.%d (OpenCSW
>>>> Patch)\n"
>>>> -+                          "#\n"
>>>> -+                        "#\n"
>>>> -+                        "# DefaultFile = %s\n"
>>>> -+                        "# DefaultDir = %s\n",
>>>> -                           argv[0],
>>>> --                          GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
>>>> GTK_MICRO_VERSION);
>>>> -+                          GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
>>>> GTK_MICRO_VERSION,
>>>> -+                        g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>>>> "gtk.immodules", NULL),
>>>> -+                        g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>>>> NULL));
>>>> -
>>>> -   if (argc == first_file)  /* No file arguments given */
>>>> -     {
>>>> ---
>>>> -1.8.3.4
>>>> -
>>>>
>>>> Deleted: csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-
>>>> Xvfb.patch
>>>> ===================================================================
>>>> --- csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>>>>   2013-11-04 09:54:03 UTC (rev 22369)
>>>> +++ csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>>>>   2013-11-04 12:15:31 UTC (rev 22370)
>>>> @@ -1,25 +0,0 @@
>>>> -From 8f4ed5e421c668213e57da64ee73eb4de443b727 Mon Sep 17 00:00:00 2001
>>>> -From: Rafael Ostertag 
>>>> -Date: Mon, 4 Nov 2013 08:55:28 +0100
>>>> -Subject: [PATCH] Use absolute path to Xvfb
>>>> -
>>>> ----
>>>> - tests/Makefile.in | 2 +-
>>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>>> -
>>>> -diff --git a/tests/Makefile.in b/tests/Makefile.in
>>>> -index 8b937c9..a1b316e 100644
>>>> ---- a/tests/Makefile.in
>>>> -+++ b/tests/Makefile.in
>>>> -@@ -934,7 +934,7 @@ TEST_PROGS =
>>>> - ### testing rules
>>>> -
>>>> - # Xvfb based test rules
>>>> --XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>>>> -+XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>>>> - XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>>>> 310 311 \
>>>> -    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>>>> 508 509 \
>>>> -    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>>>> 1006 1007 \
>>>> ---
>>>> -1.8.3.4
>>>> -
>>>>
>>>> Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
>>>> ===================================================================
>>>> --- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall   2013-11-04
>>>> 09:54:03 UTC (rev 22369)
>>>> +++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall   2013-11-04
>>>> 12:15:31 UTC (rev 22370)
>>>> @@ -41,11 +41,10 @@
>>>>    echo "** Done Updating Icon cache"
>>>>
>>>>    BIN=gtk-query-immodules-2.0
>>>> -BIN_OPTS="--update-modules"
>>>> +BIN_OPTS="--update-cache"
>>>>
>>>>    echo "** Querying IM Modules"
>>>>
>>>> -# Now, do all other
>>>>    for i in @NEEDED_ISAS@
>>>>    do
>>>>        # The default ISA is removed
>>>> @@ -60,10 +59,6 @@
>>>>                /usr/bin/printf "- ${isa} ISA... "
>>>>            fi
>>>>
>>>> -       # Figure out the default file path (binary has to be patched for
>>>> this)
>>>> -       gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print
>>>> $4 }`"
>>>> -
>>>> -
>>>>          /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS}
>>>>> /dev/null 2>&1
>>>>          if [ $? -ne 0 ]
>>>>          then
>>>> @@ -77,4 +72,4 @@
>>>>
>>>>    /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
>>>>
>>>> -echo "** Done querying IM Modules"
>>>> \ No newline at end of file
>>>> +echo "** Done querying IM Modules"
>>>>
>>>> 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 Jan  9 10:38:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 09:38:38 +0000
Subject: SF.net SVN: opencsw:[670] web/wordpresscsw/wp-content/themes/opencsw/
	package.php
Message-ID: <3f0Mhs5fVPzGd@mail.opencsw.org>

Revision: 670
          http://sourceforge.net/p/opencsw/code/670
Author:   dmichelsen
Date:     2014-01-09 09:38:37 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
Adjustments for new SF repo location

Modified Paths:
--------------
    web/wordpresscsw/wp-content/themes/opencsw/package.php

Modified: web/wordpresscsw/wp-content/themes/opencsw/package.php
===================================================================
--- web/wordpresscsw/wp-content/themes/opencsw/package.php	2013-11-14 10:00:13 UTC (rev 669)
+++ web/wordpresscsw/wp-content/themes/opencsw/package.php	2014-01-09 09:38:37 UTC (rev 670)
@@ -32,9 +32,10 @@
     	$maintainerContact = $maintainerLogin;
     }
 
-    $repositoryUrl        = $pkgInfo[6]; 
-    $repositoryUrlBase    = "http://sourceforge.net/apps/trac/gar/browser/";
-    $repositoryUrlSuffix  = "?rev=";
+    // $repositoryUrl should only contain the path inside the filetree without the repo location prefix,
+    // strip anything at the beginning that is repo-specific
+    $repositoryUrl        = $pkgInfo[6];
+    $repositoryUrl        = preg_replace( "/^https:\/\/svn.code.sf.net\/p\/gar\/code\//", "", $repositoryUrl );
     $arrayPkg             = $pkgDAO->getDependencyList($pkgName);
     $arrayReverse         = $pkgDAO->getReverseDependencyList($pkgName);
     $arrayDepends         = $pkgDAO->getListOfPackagesDependingOnLibsOfPackageFile($packageName);
@@ -88,7 +89,20 @@
     if ( strlen($repositoryUrl) < 1) {
             print             "Not available" ;
     } else {
-            print             "" . $repositoryUrl . "\n" ;
+            // print             "" . $repositoryUrl . "\n" ;
+            list ($base,$rev) = preg_split("/\@/", $repositoryUrl);
+            if( $rev == "" ) {
+              $sfrev = "HEAD";
+            } else {
+              $sfrev = $rev;
+            }
+            if( $rev == "" ) {
+              $ogrev = "";
+            } else {
+              $ogrev = "?r=" . $rev;
+            }
+            print             "$repositoryUrl (SourceForge, " ;
+            print             " OpenGrok)" ;
     }
         print         "\n" ;
         print     "\n" ;

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 Jan  9 12:05:35 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 11:05:35 +0000
Subject: SF.net SVN: opencsw:[671] gar-wrapper
Message-ID: <3f0Pd46FzyzR2@mail.opencsw.org>

Revision: 671
          http://sourceforge.net/p/opencsw/code/671
Author:   dmichelsen
Date:     2014-01-09 11:05:35 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mgar: Update to new repo URLs

Modified Paths:
--------------
    gar-wrapper/mgar
    gar-wrapper/mgar.5.txt

Modified: gar-wrapper/mgar
===================================================================
--- gar-wrapper/mgar	2014-01-09 09:38:37 UTC (rev 670)
+++ gar-wrapper/mgar	2014-01-09 11:05:35 UTC (rev 671)
@@ -62,9 +62,9 @@
 DEF_BUILDTREE=~/opencsw
 DEF_GARTYPE=v2
 
-SVN_SELF=https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper/mgar
-GAR_REPO=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/
-PKG_REPO=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/
+SVN_SELF=https://svn.code.sf.net/p/opencsw/code/gar-wrapper/mgar
+GAR_REPO=https://svn.code.sf.net/p/gar/code/csw/mgar/gar/
+PKG_REPO=https://svn.code.sf.net/p/gar/code/csw/mgar/pkg/
 
 REQ_TOOLS="ack gfind ggrep gmake gxargs mknmz namazu svn"
 REQ_PKGS="ack findutils ggrep gmake namazu subversion"

Modified: gar-wrapper/mgar.5.txt
===================================================================
--- gar-wrapper/mgar.5.txt	2014-01-09 09:38:37 UTC (rev 670)
+++ gar-wrapper/mgar.5.txt	2014-01-09 11:05:35 UTC (rev 671)
@@ -13,7 +13,7 @@
 
 EXAMPLES
 --------
-- https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/template/trunk/Makefile
+- https://svn.code.sf.net/p/gar/code/csw/mgar/pkg/template/trunk/Makefile
 - http://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
 
 SEE ALSO

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 Jan  9 13:53:54 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 12:53:54 +0000
Subject: SF.net SVN: gar:[22808] csw/mgar/pkg/zabbix/trunk
Message-ID: <3f0S272CN5zdT@mail.opencsw.org>

Revision: 22808
          http://sourceforge.net/p/gar/code/22808
Author:   dmichelsen
Date:     2014-01-09 12:53:53 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
zabbix/trunk: Update to 2.2.1 and move to sqlite3 for now

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile
    csw/mgar/pkg/zabbix/trunk/checksums

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-08 09:16:04 UTC (rev 22807)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 12:53:53 UTC (rev 22808)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = zabbix
-VERSION = 2.0.9rc2
+VERSION = 2.2.1
 GARTYPE = v2
 
 DESCRIPTION = Zabbix monitoring system
@@ -32,7 +32,7 @@
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp25
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2
@@ -47,7 +47,7 @@
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2
@@ -74,6 +74,9 @@
 CONFIGURE_ARGS += --with-ssh2=$(prefix)
 CONFIGURE_ARGS += --with-ldap
 
+CONFIGURE_ARGS += --without-mysql
+CONFIGURE_ARGS += --with-sqlite3
+
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
 PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
 

Modified: csw/mgar/pkg/zabbix/trunk/checksums
===================================================================
--- csw/mgar/pkg/zabbix/trunk/checksums	2014-01-08 09:16:04 UTC (rev 22807)
+++ csw/mgar/pkg/zabbix/trunk/checksums	2014-01-09 12:53:53 UTC (rev 22808)
@@ -1 +1 @@
-cb7237e9dae1eee974b6f5754f902c4d  zabbix-2.0.9rc2.tar.gz
+558497839b13a548f533eb2fc951a4e3  zabbix-2.2.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Thu Jan  9 13:55:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 12:55:38 +0000
Subject: SF.net SVN: gar:[22809] csw/mgar/pkg/mgar/trunk/Makefile
Message-ID: <3f0S442npvzhv@mail.opencsw.org>

Revision: 22809
          http://sourceforge.net/p/gar/code/22809
Author:   dmichelsen
Date:     2014-01-09 12:55:36 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mgar: Update to latest version

Modified Paths:
--------------
    csw/mgar/pkg/mgar/trunk/Makefile

Modified: csw/mgar/pkg/mgar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mgar/trunk/Makefile	2014-01-09 12:53:53 UTC (rev 22808)
+++ csw/mgar/pkg/mgar/trunk/Makefile	2014-01-09 12:55:36 UTC (rev 22809)
@@ -2,17 +2,14 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mgar
-VERSION = 0.95
+VERSION = 671
 GARTYPE = v2
 
 DESCRIPTION = Command line interface to the OpenCSW build system
-define BLURB
-  Long description
-endef
 
 VENDOR_URL = http://gar.opencsw.org
-SVNROOT    = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper
-SVNREV     = 597
+SVNROOT    = svn+proxy://svn.code.sf.net/p/opencsw/code/gar-wrapper
+SVNREV     = $(VERSION)
 
 ARCHALL = 1
 
@@ -23,6 +20,7 @@
 RUNTIME_DEP_PKGS += CSWgmake
 RUNTIME_DEP_PKGS += CSWsvn
 RUNTIME_DEP_PKGS += CSWbashcmplt
+RUNTIME_DEP_PKGS += CSWpy-mako
 RUNTIME_DEP_PKGS += CSWgar-dev # Meta pkg. Pulls in deps required by GAR.
 
 CHECKPKG_OVERRIDES_CSWmgar += surplus-dependency
@@ -37,6 +35,7 @@
 build-custom:
 	svn export --force -r $(SVNREV) $(SVNROOT)/ $(WORKSRC)
 	a2x -d manpage -f manpage $(WORKSRC)/mgar.1.txt
+	a2x -d manpage -f manpage $(WORKSRC)/mgar.5.txt
 	$(MAKECOOKIE)
 
 install-custom:
@@ -45,6 +44,7 @@
 	mkdir -p $(DESTDIR)$(prefix)/etc/bash_completion.d
 	cp $(WORKSRC)/mgar $(DESTDIR)$(bindir)
 	cp $(WORKSRC)/mgar.1 $(DESTDIR)$(mandir)/man1/
+	cp $(WORKSRC)/mgar.5 $(DESTDIR)$(mandir)/man5/
 	cp $(WORKSRC)/bash_completion.mgar \
 		$(DESTDIR)$(prefix)/etc/bash_completion.d/mgar
 	$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Thu Jan  9 15:10:30 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu,  9 Jan 2014 14:10:30 +0000
Subject: SF.net SVN: gar:[22810]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <3f0TkR3ZH0z16d@mail.opencsw.org>

Revision: 22810
          http://sourceforge.net/p/gar/code/22810
Author:   lblume
Date:     2014-01-09 14:10:29 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: mysql_config should not be isaexec; remove compiler parameters from it

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 12:55:36 UTC (rev 22809)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 14:10:29 UTC (rev 22810)
@@ -93,6 +93,7 @@
 # The daemon to launch is selected by script, should not be automatic
 # Some other files too should probably not be isaexec'd
 EXTRA_ISAEXEC_EXCLUDE_FILES  = /opt/csw/libexec/mysqld
+EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysql_config
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_safe
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_multi
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/my_print_defaults
@@ -394,6 +395,27 @@
 				$(DESTDIR)$(bindir)/$$file; \
 		done; \
 	fi
+
+	# Remove compiler-specific parameters
+	gsed -i \
+		-e '/^[^#]/s/-xO[0-5][^ ]* *//g' \
+		-e '/^[^#]/s/-xarch=[^ ]* *//g' \
+		-e '/^[^#]/s/-xchip=[^ ]* *//g' \
+		-e '/^[^#]/s/-norunpath[^ ]* *//g' \
+		-e '/^[^#]/s/-lCrun[^ ]* *//g' \
+		-e '/^[^#]/s/-lCstd[^ ]* *//g' \
+		-e '/^[^#]/s/-mtune=[^ ]* *//g' \
+		-e '/^[^#]/s/-march=[^ ]* *//g' \
+		-e '/^[^#]/s/-Wall *//g' \
+		-e '/^[^#]/s/-pipe *//g' \
+		-e '/^[^#]/s/-KPIC/-fPIC/g' \
+		-e '/^[^#]/s/-mno-app-regs//g' \
+		-e '/^[^#]/s/-fno-omit-frame-pointer//g' \
+		-e '/^[^#]/s/-fno-strict-aliasing//g' \
+		-e '/^[^#]/s/-Wa,-xarch=[^ ]*//g' \
+		-e '/^[^#]/s/-static-libgcc//g' \
+		$(DESTDIR)$(bindir)/mysql_config
+
 	@$(MAKECOOKIE)
 
 post-merge:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Thu Jan  9 16:37:40 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu,  9 Jan 2014 15:37:40 +0000
Subject: SF.net SVN: gar:[22811]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <3f0Wg44zFSz2R@mail.opencsw.org>

Revision: 22811
          http://sourceforge.net/p/gar/code/22811
Author:   lblume
Date:     2014-01-09 15:37:40 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Regexp was not catching -Wa correctly

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 14:10:29 UTC (rev 22810)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 15:37:40 UTC (rev 22811)
@@ -412,7 +412,7 @@
 		-e '/^[^#]/s/-mno-app-regs//g' \
 		-e '/^[^#]/s/-fno-omit-frame-pointer//g' \
 		-e '/^[^#]/s/-fno-strict-aliasing//g' \
-		-e '/^[^#]/s/-Wa,-xarch=[^ ]*//g' \
+		-e '/^[^#]/s/-Wa[^ ]*//g' \
 		-e '/^[^#]/s/-static-libgcc//g' \
 		$(DESTDIR)$(bindir)/mysql_config
 

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 Jan  9 17:08:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 16:08:05 +0000
Subject: SF.net SVN: gar:[22812] csw/mgar/pkg/zabbix/trunk/Makefile
Message-ID: <3f0XL65VGyz7s@mail.opencsw.org>

Revision: 22812
          http://sourceforge.net/p/gar/code/22812
Author:   dmichelsen
Date:     2014-01-09 16:08:01 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
zabbix/trunk: Reenable mysql and net-snmp

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 15:37:40 UTC (rev 22811)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 16:08:01 UTC (rev 22812)
@@ -32,7 +32,7 @@
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp25
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2
@@ -47,7 +47,7 @@
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2
@@ -74,9 +74,16 @@
 CONFIGURE_ARGS += --with-ssh2=$(prefix)
 CONFIGURE_ARGS += --with-ldap
 
-CONFIGURE_ARGS += --without-mysql
-CONFIGURE_ARGS += --with-sqlite3
+# We need the latest Solaris 10 for the mysql bindings
+LINKER_MAP_RELEASE =
+CONFIGURE_ARGS += --with-mysql
 
+# CONFIGURE_ARGS += --with-sqlite3
+# CONFIGURE_ARGS += --with-postgresql
+CONFIGURE_ARGS += --with-libcurl=$(bindir)/curl-config
+
+CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config
+
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
 PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Thu Jan  9 17:12:10 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 16:12:10 +0000
Subject: SF.net SVN: gar:[22813] csw/mgar/pkg
Message-ID: <3f0XQx1B22zCg@mail.opencsw.org>

Revision: 22813
          http://sourceforge.net/p/gar/code/22813
Author:   dmichelsen
Date:     2014-01-09 16:12:07 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
iksemel/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/iksemel/
    csw/mgar/pkg/iksemel/Makefile
    csw/mgar/pkg/iksemel/branches/
    csw/mgar/pkg/iksemel/tags/
    csw/mgar/pkg/iksemel/trunk/
    csw/mgar/pkg/iksemel/trunk/Makefile
    csw/mgar/pkg/iksemel/trunk/checksums
    csw/mgar/pkg/iksemel/trunk/files/
    csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch

Added: csw/mgar/pkg/iksemel/Makefile
===================================================================
--- csw/mgar/pkg/iksemel/Makefile	                        (rev 0)
+++ csw/mgar/pkg/iksemel/Makefile	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/iksemel/trunk
===================================================================
--- csw/mgar/pkg/iksemel/trunk	2014-01-09 16:08:01 UTC (rev 22812)
+++ csw/mgar/pkg/iksemel/trunk	2014-01-09 16:12:07 UTC (rev 22813)

Property changes on: csw/mgar/pkg/iksemel/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/iksemel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iksemel/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/Makefile	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,35 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = iksemel
+VERSION = 1.4
+GARTYPE = v2
+
+DESCRIPTION = Fast and portable XML parser and Jabber protocol library
+
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Adjust-alignment.patch
+
+PACKAGES += CSWlibiksemel3
+SPKG_DESC_CSWlibiksemel3 = Fast and portable XML parser and Jabber protocol library, libiksemel.so.3
+PKGFILES_CSWlibiksemel3 += $(call pkgfiles_lib,libiksemel.so.3)
+
+PACKAGES += CSWlibiksemel-dev
+SPKG_DESC_CSWlibiksemel-dev = Development files for libiksemel.so.3
+PKGFILES_CSWlibiksemel-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibiksemel-dev += CSWlibiksemel3
+
+PACKAGES += CSWiksemel
+SPKG_DESC_CSWiksemel = Jabber protocol utilities
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWiksemel += CSWlibiksemel3
+
+BUILD64 = 1
+ISAEXEC = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/iksemel/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/iksemel/trunk/checksums
===================================================================
--- csw/mgar/pkg/iksemel/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/checksums	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1 @@
+532e77181694f87ad5eb59435d11c1ca  iksemel-1.4.tar.gz

Added: csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch
===================================================================
--- csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch	                        (rev 0)
+++ csw/mgar/pkg/iksemel/trunk/files/0001-Adjust-alignment.patch	2014-01-09 16:12:07 UTC (rev 22813)
@@ -0,0 +1,61 @@
+From a120c658914d3941bd1c82d73e13e1aad256e942 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Thu, 9 Jan 2014 16:43:00 +0100
+Subject: [PATCH] Adjust alignment
+
+---
+ src/ikstack.c      | 24 ++++++++++++++++++++----
+ test/tst-ikstack.c | 12 ++++++++++--
+ 2 files changed, 30 insertions(+), 6 deletions(-)
+
+diff --git a/src/ikstack.c b/src/ikstack.c
+index bed4656..9c46cc7 100644
+--- a/src/ikstack.c
++++ b/src/ikstack.c
+@@ -7,9 +7,18 @@
+ #include "common.h"
+ #include "iksemel.h"
+ 
+-struct align_test { char a; double b; };
+-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++// struct align_test { char a; double b; };
++struct align_test {
++	struct ikschunk_struct *next;
++	size_t size;
++	size_t used;
++	size_t last;
++	char data[4];
++};
++// #define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &(((struct align_test *) 0)->data) - (char *) &(((struct align_test *) 0)->last)))
+ #define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
++
+ #define MIN_CHUNK_SIZE ( DEFAULT_ALIGNMENT * 8 )
+ #define MIN_ALLOC_SIZE DEFAULT_ALIGNMENT
+ #define ALIGN(x) ( (x) + (DEFAULT_ALIGNMENT - ( (x) & ALIGN_MASK)) )
+diff --git a/test/tst-ikstack.c b/test/tst-ikstack.c
+index aba36af..77179b4 100644
+--- a/test/tst-ikstack.c
++++ b/test/tst-ikstack.c
+@@ -10,8 +10,16 @@
+ 
+ #include "iksemel.h"
+ 
+-struct align_test { char a; double b; };
+-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++// struct align_test { char a; double b; };
++// #define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
++struct align_test {
++        struct ikschunk_struct *next;
++        size_t size;
++        size_t used;
++        size_t last;
++        char data[4];
++};
++#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &(((struct align_test *) 0)->data) - (char *) &(((struct align_test *) 0)->last)))
+ #define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
+ 
+ const char buf[] = "1234567890abcdefghijklmnopqrstuv";
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Thu Jan  9 17:50:50 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 16:50:50 +0000
Subject: SF.net SVN: gar:[22814] csw/mgar/pkg/zabbix/trunk/Makefile
Message-ID: <3f0YHS4ymVzQJ@mail.opencsw.org>

Revision: 22814
          http://sourceforge.net/p/gar/code/22814
Author:   dmichelsen
Date:     2014-01-09 16:50:49 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
zabbix/trunk: Enable Jabber

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 16:12:07 UTC (rev 22813)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 16:50:49 UTC (rev 22814)
@@ -26,6 +26,8 @@
 BUILD64 = $(BUILD64-$(GAROSREL))
 ISAEXEC = 1
 
+BUILD_DEP_PKGS += CSWlibiksemel-dev
+
 PACKAGES += CSWzabbix-agent
 SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent
 # PKGFILES is catchall
@@ -54,6 +56,7 @@
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp25
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
@@ -84,6 +87,8 @@
 
 CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config
 
+CONFIGURE_ARGS += --with-jabber
+
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
 PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Thu Jan  9 22:23:00 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu,  9 Jan 2014 21:23:00 +0000
Subject: SF.net SVN: gar:[22815]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <3f0gKT43jGzn2@mail.opencsw.org>

Revision: 22815
          http://sourceforge.net/p/gar/code/22815
Author:   lblume
Date:     2014-01-09 21:22:59 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: remove -pthread from mysql_config

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 16:50:49 UTC (rev 22814)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 21:22:59 UTC (rev 22815)
@@ -414,6 +414,7 @@
 		-e '/^[^#]/s/-fno-strict-aliasing//g' \
 		-e '/^[^#]/s/-Wa[^ ]*//g' \
 		-e '/^[^#]/s/-static-libgcc//g' \
+		-e '/^[^#]/s/-pthread//g' \
 		$(DESTDIR)$(bindir)/mysql_config
 
 	@$(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  Thu Jan  9 22:32:17 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  9 Jan 2014 21:32:17 +0000
Subject: SF.net SVN: gar:[22816] csw/mgar/pkg/zabbix/trunk/Makefile
Message-ID: <3f0gX93t7lzrq@mail.opencsw.org>

Revision: 22816
          http://sourceforge.net/p/gar/code/22816
Author:   dmichelsen
Date:     2014-01-09 21:32:16 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
zabbix/trunk: Switch to gcc

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 21:22:59 UTC (rev 22815)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2014-01-09 21:32:16 UTC (rev 22816)
@@ -58,6 +58,9 @@
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3
 
+# MySQL uses gcc, so we need to do also or the compiler flags bust
+GARCOMPILER = GCC4
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
 CONFIGURE_ARGS += --with-libcurl

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 Jan 10 22:03:25 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 10 Jan 2014 21:03:25 +0000
Subject: SF.net SVN: gar:[22817] csw/mgar/pkg/mc/trunk
Message-ID: <3f1GrV5zlyzbm@mail.opencsw.org>

Revision: 22817
          http://sourceforge.net/p/gar/code/22817
Author:   dmichelsen
Date:     2014-01-10 21:03:22 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
mc/trunk: Update to 4.8.11

Modified Paths:
--------------
    csw/mgar/pkg/mc/trunk/Makefile
    csw/mgar/pkg/mc/trunk/checksums

Modified: csw/mgar/pkg/mc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mc/trunk/Makefile	2014-01-09 21:32:16 UTC (rev 22816)
+++ csw/mgar/pkg/mc/trunk/Makefile	2014-01-10 21:03:22 UTC (rev 22817)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = mc
-VERSION = 4.8.8
+VERSION = 4.8.11
 GARTYPE = v2
 
 DESCRIPTION = A curses-based visual shell and file manager

Modified: csw/mgar/pkg/mc/trunk/checksums
===================================================================
--- csw/mgar/pkg/mc/trunk/checksums	2014-01-09 21:32:16 UTC (rev 22816)
+++ csw/mgar/pkg/mc/trunk/checksums	2014-01-10 21:03:22 UTC (rev 22817)
@@ -1 +1 @@
-14231665535fc80cc654b6ccfd070995  mc-4.8.8.tar.xz
+1a2d74b75ddbff0b0d6cdc04bf4a7d31  mc-4.8.11.tar.xz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jonbcraig at users.sourceforge.net  Sat Jan 11 22:53:42 2014
From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net)
Date: Sat, 11 Jan 2014 21:53:42 +0000
Subject: SF.net SVN: gar:[22818] csw/mgar/pkg/ntop/trunk
Message-ID: <3f1vwL3kqLz3J@mail.opencsw.org>

Revision: 22818
          http://sourceforge.net/p/gar/code/22818
Author:   jonbcraig
Date:     2014-01-11 21:53:38 +0000 (Sat, 11 Jan 2014)
Log Message:
-----------
Updated to support build of ntop v4.1.0

This is the last build before nDPI was introduced.  This feature does not
currently support solaris / sparc processors due to a number of specific
linux includes and its inability to determine the endianess of the 
system.

Modified Paths:
--------------
    csw/mgar/pkg/ntop/trunk/Makefile
    csw/mgar/pkg/ntop/trunk/checksums
    csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
    csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch

Added Paths:
-----------
    csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch
    csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch
    csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
    csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
    csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch
    csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,5 +1,5 @@
 NAME = ntop
-VERSION = 4.0.3
+VERSION = 4.1.0
 GARTYPE = v2
 
 DESCRIPTION = A network traffic usage monitor
@@ -13,7 +13,7 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tgz
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 DISTFILES  += cswntop
 EXPANDVARS += cswntop
@@ -24,19 +24,15 @@
 
 INITSMF = /etc/opt/csw/init.d/cswntop
 
-PATCHFILES  = 0001-Fix-misplaced-endif.patch
-PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch
-PATCHFILES += 0003-Check-for-uint_-in-addition-to-u_int_.patch
-PATCHFILES += 0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
-PATCHFILES += 0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
-PATCHFILES += 0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch
-PATCHFILES += 0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
 
-# Added by bwalton to make auto* happy again; These should likely be
-# upstreamed.
 PATCHFILES += 0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
-PATCHFILES += 0002-Modernize-a-few-macros-in-configure.in.patch
-PATCHFILES += 0003-Add-an-extra-automake-option-for-per-target-compiler.patch
+PATCHFILES += 0002-Do-not-redeclare-__builtin_alloca.patch
+PATCHFILES += 0003-Modernize-a-few-macros-in-configure.in.patch
+PATCHFILES += 0004-Add-an-extra-automake-option-for-per-target-compiler.patch
+PATCHFILES += 0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
+PATCHFILES += 0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
+PATCHFILES += 0007-Update-the-URL-for-etter.finger.os.patch
+PATCHFILES += 0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233

Modified: csw/mgar/pkg/ntop/trunk/checksums
===================================================================
--- csw/mgar/pkg/ntop/trunk/checksums	2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/checksums	2014-01-11 21:53:38 UTC (rev 22818)
@@ -1 +1 @@
-f064393a2090e5bda102cd49c2707789  ntop-4.0.3.tgz
+116df99cf548431393991ea15443c52f  ntop-4.1.0.tar.gz

Modified: csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch	2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,21 +1,19 @@
-From 7208317da489838e604ca975bf9eb2fad1a2c49f Mon Sep 17 00:00:00 2001
-From: Ben Walton 
-Date: Sat, 27 Apr 2013 16:13:13 +0200
-Subject: [PATCH 1/3] Update macros used in Makefile.am for modern convention
+From 2ff00646912b06c45ce45b9b525ae09c3500fcc0 Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:38:04 +0100
+Subject: [PATCH] Update macros used in Makefile.am for modern convention
 
 INCLUDES is a deprecated name in Makefile.am.  Use AM_CPPFLAGS instead.
-
-Signed-off-by: Ben Walton 
 ---
  Makefile.am         | 2 +-
  plugins/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 5a6f022..646b8bd 100644
+index e4b0fc1..a8709f2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -33,7 +33,7 @@ PROGRAM  = $(PKGNAME)-$(VERSION)
+@@ -26,7 +26,7 @@ PROGRAM  = $(PKGNAME)-$(VERSION)
  DEFS      = @DEFS@
  INCS      = @INCS@
  
@@ -38,5 +36,5 @@
  #
  # The meat for ntop
 -- 
-1.8.1.4
+1.8.4.1
 

Modified: csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch	2014-01-10 21:03:22 UTC (rev 22817)
+++ csw/mgar/pkg/ntop/trunk/files/0002-Do-not-redeclare-__builtin_alloca.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -1,24 +1,25 @@
-From b41a4c15c708ee01cf91a9d20dca3b6ae095370a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Thu, 11 Nov 2010 10:50:20 +0100
-Subject: [PATCH 2/4] Do not redeclare __builtin_alloca
+From 381e8a4c6a56a7142e896be2f67dfaab57b6566a Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:42:12 +0100
+Subject: [PATCH 3/3] Do not redeclare __builtin_alloca
 
 ---
- argv.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ argv.c | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/argv.c b/argv.c
-index 9212e85..84b02c6 100644
+index 7b75130..db0d7e5 100644
 --- a/argv.c
 +++ b/argv.c
-@@ -28,6 +28,7 @@ Cambridge, MA 02139, USA.  */
+@@ -28,8 +28,6 @@ Cambridge, MA 02139, USA.  */
  #else /* not __GNUC__ */
  #ifdef sparc
  #include 
-+/* This is declared at least on Solaris 9, maybe this should better be detected during configure-time?
- extern char *__builtin_alloca();  /* Stupid include file doesn't declare it */
+-/* This is declared at least on Solaris 9, maybe this should better be detected during configure-time? */
+-extern char *__builtin_alloca();  /* Stupid include file doesn't declare it */
  #else
  #ifdef _AIX
+  #pragma alloca
 -- 
-1.7.3
+1.8.4.1
 

Added: csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0003-Modernize-a-few-macros-in-configure.in.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,46 @@
+From faa52dcdbb20e4882f1f6d093c0fbab1fd04dce1 Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:46:57 +0100
+Subject: [PATCH 5/5] Modernize a few macros in configure.in
+
+Use the recommended macro names for modern autoconf/automake.
+
+Also, don't call AC_PROG_CC early, call it when the script will
+indicate that it's checking for cc, etc.
+---
+ configure.in | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d7b7979..67a3869 100644
+--- a/configure.in
++++ b/configure.in
+@@ -56,7 +56,7 @@ dnl>
+ dnl> generate the config header
+ dnl>
+ umask 002
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ HAS_ERROR=
+ HAS_WARNING=
+@@ -151,7 +151,6 @@ dnl> NTOPCONFIGDEBUG_SETTINGS([ntop defaults])
+ # Checks for programs.
+ 
+ AC_PROG_CPP
+-AC_PROG_CC
+ dnl> AC_PROG_CXX no c++ code (yet?)
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -324,7 +323,7 @@ dnl>
+ echo
+ echo "Checking C compiler program and features..."
+ echo
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+     echo
+     echo "*******************************************************************"
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0004-Add-an-extra-automake-option-for-per-target-compiler.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,29 @@
+From 1f889ae4c183fe172097d4461f3b0d8cb025bfa5 Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:48:57 +0100
+Subject: [PATCH 7/7] Add an extra automake option for per-target compiler
+ options
+
+This squashes an automake warning and allows the compiler to be
+reliably called with both -c and -o.
+---
+ configure.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 67a3869..2fcfa86 100644
+--- a/configure.in
++++ b/configure.in
+@@ -341,6 +341,9 @@ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+     HAS_WARNING="yes"
+ fi
+ 
++dnl> For per-target flags; must be called after AC_PROG_CC
++AM_PROG_CC_C_O
++
+ dnl> NTOPCONFIGDEBUG_SETTINGS([After cc stdc test])
+ 
+ dnl> Any common settings required to support a specific OS, distribution or release
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0005-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,35 @@
+From 234af0e2534c6edc955b7689425a094ced4fcfab Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:53:02 +0100
+Subject: [PATCH 9/9] Strip default Solaris library pathes as we set our own
+
+---
+ configureextra/SOLARIS10 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configureextra/SOLARIS10 b/configureextra/SOLARIS10
+index 5e12960..6f1a6ea 100644
+--- a/configureextra/SOLARIS10
++++ b/configureextra/SOLARIS10
+@@ -5,9 +5,9 @@
+ #
+ 
+ echo "        Setting Solaris 10 specific flag values"
+-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
++#LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
+ LIBS="-lnsl -lsocket ${LIBS}"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
++#CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
+ 
+ . configureextra/functions
+ 
+@@ -28,4 +28,4 @@ echo "- cd /usr/local/lib"
+ echo "- ln -s libpcap.so.0.X.Y libpcap.so"
+ echo "- rm libpcap.a"
+ echo ""
+-echo "*************************************************"
+\ No newline at end of file
++echo "*************************************************"
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,25 @@
+From 34570a310386716b6b0f41de8071d944cb10c34d Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:55:10 +0100
+Subject: [PATCH 11/11] Change default PID file location to /var/opt/csw/ntop
+
+---
+ globals-defines.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/globals-defines.h b/globals-defines.h
+index 4acb19f..e78dbc5 100644
+--- a/globals-defines.h
++++ b/globals-defines.h
+@@ -1874,7 +1874,7 @@
+  * default file and directories
+  */
+ #define DEFAULT_NTOP_PIDFILE                "ntop.pid"
+-#define DEFAULT_NTOP_PID_DIRECTORY          "/var/run"
++#define DEFAULT_NTOP_PID_DIRECTORY          "/var/opt/csw/run"
+ 
+ /*
+  * default configuration parameters  -- the comment gives the (short getopt) name
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0007-Update-the-URL-for-etter.finger.os.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,36 @@
+From 05f0b44e903151d06bc87c5b34dfaac6e57e9d04 Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 21:58:21 +0100
+Subject: [PATCH 13/13] Update the URL for etter.finger.os
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a8709f2..520446a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -61,8 +61,8 @@ SUBDIRS = . @PLUGINS@
+ 
+ ETTER_PASSIVE_FILE = etter.finger.os
+ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
+-ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
+-ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
++#ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
++ETTER_PASSIVE_DOWNLOAD_FROM = "https://github.com/Ettercap/ettercap/blob/master/share"
+ 
+ NTOPDATA = ntop-cert.pem \
+            $(ETTER_PASSIVE) \
+@@ -416,7 +416,7 @@ dnetter:
+ 	@echo ""
+ 	@echo "...Downloading new file..."
+ 	@wget -O $(ETTER_PASSIVE_FILE) \
+-		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
++		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)
+ 	@echo ""
+ 	@echo "gziping downloaded file..."
+ 	@gzip $(ETTER_PASSIVE_FILE)
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch	2014-01-11 21:53:38 UTC (rev 22818)
@@ -0,0 +1,44 @@
+From 11f8b368573d570e49bdb071f3e092c7e4caded2 Mon Sep 17 00:00:00 2001
+From: Jon Craig 
+Date: Sat, 11 Jan 2014 22:03:23 +0100
+Subject: [PATCH 15/15] Update defaults from /usr/local to /opt/csw -
+ /etc/opt/csw
+
+---
+ globals-defines.h | 6 +++---
+ report.c          | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/globals-defines.h b/globals-defines.h
+index e78dbc5..8ec0032 100644
+--- a/globals-defines.h
++++ b/globals-defines.h
+@@ -2696,9 +2696,9 @@ struct ip6_hdr
+ 
+ /* *************************** */
+ 
+-#define DEFAULT_NTOP_PLUGINS_INSTALL    "/usr/local/lib/ntop/plugins"
+-#define DEFAULT_NTOP_HTML_INSTALL       "/usr/local/share/ntop"
+-#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/usr/local/etc/ntop"
++#define DEFAULT_NTOP_PLUGINS_INSTALL    "/opt/csw/lib/ntop/plugins"
++#define DEFAULT_NTOP_HTML_INSTALL       "/opt/csw/share/ntop"
++#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/etc/opt/csw/ntop"
+ 
+ #define DOMAIN_VIEW          0
+ #define NETWORK_VIEW         1
+diff --git a/report.c b/report.c
+index a0cc174..0ea16b0 100644
+--- a/report.c
++++ b/report.c
+@@ -2091,7 +2091,7 @@ void makeDot() {
+   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
+     snprintf(dotPath, sizeof(dotPath), "%s", buf);
+   } else {
+-    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
++    snprintf(dotPath, sizeof(dotPath), "/opt/csw/bin/dot");
+     storePrefsValue("dot.path", dotPath); /* Set the default */
+   }
+ 
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jonbcraig at users.sourceforge.net  Sat Jan 11 22:57:04 2014
From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net)
Date: Sat, 11 Jan 2014 21:57:04 +0000
Subject: SF.net SVN: gar:[22819] csw/mgar/pkg/ntop/trunk/files
Message-ID: <3f1w1b2cm4z7K@mail.opencsw.org>

Revision: 22819
          http://sourceforge.net/p/gar/code/22819
Author:   jonbcraig
Date:     2014-01-11 21:57:01 +0000 (Sat, 11 Jan 2014)
Log Message:
-----------
Dropping a number of patches which were made obsolete

Removed Paths:
-------------
    csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch
    csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch
    csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch
    csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch
    csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
    csw/mgar/pkg/ntop/trunk/files/0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
    csw/mgar/pkg/ntop/trunk/files/0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch
    csw/mgar/pkg/ntop/trunk/files/0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
    csw/mgar/pkg/ntop/trunk/files/etter.finger.os

Deleted: csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0001-Fix-misplaced-endif.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,27 +0,0 @@
-From 7ba230598efb6fc4636c0bb18b0d340d723e3d75 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Thu, 11 Nov 2010 10:46:42 +0100
-Subject: [PATCH 1/4] Fix misplaced #endif
-
----
- address.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/address.c b/address.c
-index 73d8046..59436e1 100644
---- a/address.c
-+++ b/address.c
-@@ -239,9 +239,9 @@ void* dequeueAddress(void *_i) {
- 	    he = &_hp;
- 	  else
- 	    he = NULL;
--#endif
- 	} else
- 	  he = NULL;
-+#endif
- #else
- 	he = gethostbyaddr(theAddr, size, family);
- #endif
--- 
-1.7.3
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,54 +0,0 @@
-From 444f0b6a7d993ff28cf93dab9f60b4bbf53fd109 Mon Sep 17 00:00:00 2001
-From: Ben Walton 
-Date: Sat, 27 Apr 2013 16:15:31 +0200
-Subject: [PATCH 2/3] Modernize a few macros in configure.in
-
-Use the recommended macro names for modern autoconf/automake.
-
-Also, don't call AC_PROG_CC early, call it when the script will
-indicate that it's checking for cc, etc.
-
-Signed-off-by: Ben Walton 
----
- configure.in | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 5c6fa98..5d23209 100644
---- a/configure.in
-+++ b/configure.in
-@@ -56,7 +56,7 @@ dnl>
- dnl> generate the config header
- dnl>
- umask 002
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- HAS_ERROR=
- HAS_WARNING=
-@@ -187,13 +187,11 @@ AC_ARG_ENABLE(void,
- # Checks for programs.
- 
- AC_PROG_CPP
--AC_PROG_CC
- dnl> AC_PROG_CXX no c++ code (yet?)
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
--
- AM_ENABLE_SHARED
- AM_PROG_LIBTOOL
- 
-@@ -369,7 +367,7 @@ dnl>
- echo
- echo "Checking C compiler program and features..."
- echo
--AM_PROG_CC_STDC
-+AC_PROG_CC
- if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
-     echo
-     echo "*******************************************************************"
--- 
-1.8.1.4
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,31 +0,0 @@
-From 4bd66226376c98171e01c9cd00c3a35b32c6e0ac Mon Sep 17 00:00:00 2001
-From: Ben Walton 
-Date: Sat, 27 Apr 2013 16:16:34 +0200
-Subject: [PATCH 3/3] Add an extra automake option for per-target compiler
- options
-
-This squashes an automake warning and allows the compiler to be
-reliably called with both -c and -o.
-
-Signed-off-by: Ben Walton 
----
- configure.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 5d23209..5f1420c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -385,6 +385,9 @@ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
-     HAS_WARNING="yes"
- fi
- 
-+dnl> For per-target flags; must be called after AC_PROG_CC
-+AM_PROG_CC_C_O
-+
- dnl> NTOPCONFIGDEBUG_SETTINGS([After cc stdc test])
- 
- dnl> Any common settings required to support a specific OS, distribution or release
--- 
-1.8.1.4
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0003-Check-for-uint_-in-addition-to-u_int_.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,95 +0,0 @@
-From a4b0c017045180b7fb5ddcd9a1b7433f2a7b55ea Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Thu, 11 Nov 2010 12:34:45 +0100
-Subject: [PATCH 3/4] Check for uint_* in addition to u_int_*
-
----
- configure.in          |    6 ++++++
- globals-structtypes.h |   20 ++++++++++++++++++++
- 2 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 652e409..5c6fa98 100644
---- a/configure.in
-+++ b/configure.in
-@@ -207,7 +207,10 @@ AH_TEMPLATE([HAVE_INT16_T],   [Define for int16 typedef])
- AH_TEMPLATE([HAVE_INT32_T],   [Define for int32 typedef])
- AH_TEMPLATE([HAVE_INT64_T],   [Define for int64 typedef])
- AH_TEMPLATE([HAVE_INT8_T],    [Define for int8 typedef])
-+AH_TEMPLATE([HAVE_UINT16_T],  [Define for unsigned int 16 typedef])
-+AH_TEMPLATE([HAVE_UINT32_T],  [Define for unsigned int 32 typedef])
- AH_TEMPLATE([HAVE_UINT64_T],  [Define for unsigned int 64 typedef])
-+AH_TEMPLATE([HAVE_UINT8_T],   [Define for unsigned int 8 typedef])
- AH_TEMPLATE([HAVE_U_INT16_T], [Define for unsigned int 16 typedef])
- AH_TEMPLATE([HAVE_U_INT32_T], [Define for unsigned int 32 typedef])
- AH_TEMPLATE([HAVE_U_INT64_T], [Define for unsigned int 64 typedef])
-@@ -1122,8 +1125,11 @@ AC_STRUCT_TIMEZONE
- AC_CHECK_TYPEDEF(u_int64_t, sys/types.h)
- AC_CHECK_TYPEDEF(uint64_t, sys/types.h)
- AC_CHECK_TYPEDEF(u_int32_t, sys/types.h)
-+AC_CHECK_TYPEDEF(uint32_t, sys/types.h)
- AC_CHECK_TYPEDEF(u_int16_t, sys/types.h)
-+AC_CHECK_TYPEDEF(uint16_t, sys/types.h)
- AC_CHECK_TYPEDEF(u_int8_t, sys/types.h)
-+AC_CHECK_TYPEDEF(uint8_t, sys/types.h)
- AC_CHECK_TYPEDEF(int64_t, sys/types.h)
- AC_CHECK_TYPEDEF(int32_t, sys/types.h)
- AC_CHECK_TYPEDEF(int16_t, sys/types.h)
-diff --git a/globals-structtypes.h b/globals-structtypes.h
-index 2de7c6f..61a1632 100644
---- a/globals-structtypes.h
-+++ b/globals-structtypes.h
-@@ -71,22 +71,38 @@ typedef u_int   u_int32_t;
- #if defined(HAVE_u_int64_T)
- #define u_int64_t u_int64_t
- #else
-+#if defined(HAVE_UINT64_T)
-+#define u_int64_t uint64_t
-+#else
- #error "Sorry, I'm unable to define u_int64_t on your platform"
- #endif
- #endif
- #endif
-+#endif
- 
- #if !defined(HAVE_U_INT32_T)
-+#if defined(HAVE_UINT32_T)
-+#define u_int32_t uint32_t
-+#else
- typedef unsigned int u_int32_t;
- #endif
-+#endif
- 
- #if !defined(HAVE_U_INT16_T)
-+#if defined(HAVE_UINT16_T)
-+#define u_int16_t uint16_t
-+#else
- typedef unsigned short u_int16_t;
- #endif
-+#endif
- 
- #if !defined(HAVE_U_INT8_T)
-+#if defined(HAVE_UINT8_T)
-+#define u_int8_t uint8_t
-+#else
- typedef unsigned char u_int8_t;
- #endif
-+#endif
- 
- #if !defined(HAVE_INT32_T)
- typedef int int32_t;
-@@ -312,7 +328,11 @@ typedef struct protocolsList {
- #define pthread_rwlock_wrlock    pthread_mutex_lock
- #define pthread_rwlock_unlock    pthread_mutex_unlock
- #define pthread_rwlock_destroy   pthread_mutex_destroy
-+#ifdef SOLARIS
-+#define pthread_rwlock_trywrlock pthread_mutex_trylock
-+#else /* SOLARIS */
- #define pthread_rwlock_trywrlock pthread_mutex_trywrlock
-+#endif /* SOLARIS */
- #endif
- #endif
- 
--- 
-1.7.3
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0004-Strip-default-Solaris-library-pathes-as-we-set-our-o.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,52 +0,0 @@
-From ef3ce9708fb1625f97fd8eff7665052602bb6429 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Thu, 11 Nov 2010 12:35:04 +0100
-Subject: [PATCH 4/4] Strip default Solaris library pathes as we set our own
-
----
- configureextra/SOLARIS10 |    6 +++---
- configureextra/SOLARIS9  |    4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configureextra/SOLARIS10 b/configureextra/SOLARIS10
-index 5e12960..6f1a6ea 100644
---- a/configureextra/SOLARIS10
-+++ b/configureextra/SOLARIS10
-@@ -5,9 +5,9 @@
- #
- 
- echo "        Setting Solaris 10 specific flag values"
--LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
-+#LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
- LIBS="-lnsl -lsocket ${LIBS}"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
-+#CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
- 
- . configureextra/functions
- 
-@@ -28,4 +28,4 @@ echo "- cd /usr/local/lib"
- echo "- ln -s libpcap.so.0.X.Y libpcap.so"
- echo "- rm libpcap.a"
- echo ""
--echo "*************************************************"
-\ No newline at end of file
-+echo "*************************************************"
-diff --git a/configureextra/SOLARIS9 b/configureextra/SOLARIS9
-index f968ea1..4323773 100755
---- a/configureextra/SOLARIS9
-+++ b/configureextra/SOLARIS9
-@@ -1,9 +1,9 @@
- #!/bin/sh
- 
- echo "        Setting Solaris 9 specific flag values"
--LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
-+# LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
- LIBS="-lnsl -lsocket ${LIBS}"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
-+# CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
- 
- . configureextra/functions
- 
--- 
-1.7.3
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0005-Change-default-PID-file-location-to-var-opt-csw-ntop.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,25 +0,0 @@
-From fd367fac4e7fb554cc3ad4d2a00d24a71ba36832 Mon Sep 17 00:00:00 2001
-From: Jon Craig 
-Date: Tue, 8 Feb 2011 22:42:30 +0100
-Subject: [PATCH] Change default PID file location to /var/opt/csw/ntop
-
----
- globals-defines.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/globals-defines.h b/globals-defines.h
-index a54d736..a412617 100644
---- a/globals-defines.h
-+++ b/globals-defines.h
-@@ -1929,7 +1929,7 @@
-  * default file and directories
-  */
- #define DEFAULT_NTOP_PIDFILE                "ntop.pid"
--#define DEFAULT_NTOP_PID_DIRECTORY          "/var/run"
-+#define DEFAULT_NTOP_PID_DIRECTORY          "/var/opt/csw/ntop"
- 
- /*
-  * default configuration parameters  -- the comment gives the (short getopt) name
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,28 +0,0 @@
-From a1b397956f69cd33847b8cfa38eb08b46d287bc0 Mon Sep 17 00:00:00 2001
-From: Jon Craig 
-Date: Tue, 8 Feb 2011 22:56:40 +0100
-Subject: [PATCH 7/7] Temporary Fix for Broken sourceforge CVS access
-
----
- Makefile.am |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 46b102c..1ca4aa6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -423,8 +423,9 @@ dnetter:
-         done
- 	@echo ""
- 	@echo "...Downloading new file..."
--	@wget -O $(ETTER_PASSIVE_FILE) \
--		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
-+#	@wget -O $(ETTER_PASSIVE_FILE) \
-+#		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
-+	@cp ../../../../files/etter.finger.os .
- 	@echo ""
- 	@echo "gziping downloaded file..."
- 	@gzip $(ETTER_PASSIVE_FILE)
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/ntop/trunk/files/0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,43 +0,0 @@
-From 22dd84d99aea4bfb4868e4e08df255d615a4733e Mon Sep 17 00:00:00 2001
-From: Jon Craig 
-Date: Thu, 10 Feb 2011 06:24:08 +0100
-Subject: [PATCH] Update defaults from /usr/local to /opt/csw - /etc/opt/csw
-
----
- globals-defines.h |    6 +++---
- report.c          |    2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/globals-defines.h b/globals-defines.h
-index a412617..7096add 100644
---- a/globals-defines.h
-+++ b/globals-defines.h
-@@ -2767,9 +2767,9 @@ struct ip6_hdr
- 
- /* *************************** */
- 
--#define DEFAULT_NTOP_PLUGINS_INSTALL    "/usr/local/lib/ntop/plugins"
--#define DEFAULT_NTOP_HTML_INSTALL       "/usr/local/share/ntop"
--#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/usr/local/etc/ntop"
-+#define DEFAULT_NTOP_PLUGINS_INSTALL    "/opt/csw/lib/ntop/plugins"
-+#define DEFAULT_NTOP_HTML_INSTALL       "/opt/csw/share/ntop"
-+#define DEFAULT_NTOP_CFG_CONFIGFILE_DIR "/etc/opt/csw/ntop"
- 
- #define DOMAIN_VIEW          0
- #define NETWORK_VIEW         1
-diff --git a/report.c b/report.c
-index 0e62c8d..cbe6b7b 100644
---- a/report.c
-+++ b/report.c
-@@ -2353,7 +2353,7 @@ void makeDot() {
-   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
-     snprintf(dotPath, sizeof(dotPath), "%s", buf);
-   } else {
--    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
-+    snprintf(dotPath, sizeof(dotPath), "/opt/csw/bin/dot");
-     storePrefsValue("dot.path", dotPath); /* Set the default */
-   }
- 
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/ntop/trunk/files/etter.finger.os
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/etter.finger.os	2014-01-11 21:53:38 UTC (rev 22818)
+++ csw/mgar/pkg/ntop/trunk/files/etter.finger.os	2014-01-11 21:57:01 UTC (rev 22819)
@@ -1,1747 +0,0 @@
-############################################################################
-#                                                                          #
-#  ettercap -- etter.finger.os -- passive OS fingerprint database          #
-#                                                                          #
-#  Copyright (C) 2001-2004  ALoR & NaGA                                    #
-#                                                                          #
-#  This program is free software; you can redistribute it and/or modify    #
-#  it under the terms of the GNU General Public License as published by    #
-#  the Free Software Foundation; either version 2 of the License, or       #
-#  (at your option) any later version.                                     #
-#                                                                          #
-############################################################################
-#                                                                          #
-#  Version         : $Revision: 1.21 $                                     # 
-#  Last updated on : $Date: 2004/11/05 10:21:03 $                          #
-#  Total entries   : 1697                                                  #
-#                                                                          #
-############################################################################
-#                                                                          #
-# The fingerprint database has the following structure:                    #
-#                                                                          #
-# WWWW:MSS:TTL:WS:S:N:D:T:F:LEN:OS                                         #
-#                                                                          #
-# WWWW: 4 digit hex field indicating the TCP Window Size                   #
-# MSS : 4 digit hex field indicating the TCP Option Maximum Segment Size   #
-#       if omitted in the packet or unknown it is "_MSS"                   #
-# TTL : 2 digit hex field indicating the IP Time To Live                   #
-# WS  : 2 digit hex field indicating the TCP Option Window Scale           #
-#       if omitted in the packet or unknown it is "WS"                     #
-# S   : 1 digit field indicating if the TCP Option SACK permitted is true  #
-# N   : 1 digit field indicating if the TCP Options contain a NOP          #
-# D   : 1 digit field indicating if the IP Don't Fragment flag is set      #
-# T   : 1 digit field indicating if the TCP Timestamp is present           #
-# F   : 1 digit ascii field indicating the flag of the packet              #
-#       S = SYN                                                            #
-#       A = SYN + ACK                                                      #
-# LEN : 2 digit hex field indicating the length of the packet              #
-#       if irrilevant or unknown it is "LT"                                #
-# OS  : an ascii string representing the OS                                #
-#                                                                          #
-# IF YOU FIND A NEW FINGERPRING, PLEASE MAIL IT US WITH THE RESPECTIVE OS  #
-# or use the appropriate form at:                                          #
-#    http://ettercap.sourceforge.net/index.php?s=stuff&p=fingerprint       #
-#                                                                          #
-# TO GET THE LATEST DATABASE:                                              #
-#                                                                          #
-#    ettercap -U                                                           #
-#                                                                          #
-############################################################################
-
-0000:05B4:80:WS:0:0:1:0:S:2C:Novell netware 5.00
-0000:_MSS:80:WS:0:0:0:0:A:LT:3Com Access Builder 4000 7.2
-0000:_MSS:FF:WS:0:0:0:0:A:28:Windows XP
-0008:_MSS:40:WS:0:0:0:0:S:28:Red Hat Linux 7.2 Kernel 2.4.7-10
-0010:_MSS:40:WS:0:0:0:0:S:28:Gentoo Linux (Kernel 2.6.6-rc1)
-0017:05B4:40:00:0:1:0:1:A:3C:Gestetner printer 
-0040:_MSS:80:WS:0:0:0:0:A:LT:Gold Card Ethernet Interface Firm. Ver. 3.19 (95.01.16)
-0046:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter
-0096:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter V 1.2.4
-0100:0218:FF:WS:0:0:0:0:A:2C:Allied Hub
-0100:_MSS:80:WS:0:0:0:0:A:LT:Allied Telesyn AT-S10 version 3.0 on an AT-TS24TR hub
-0100:_MSS:80:WS:0:0:1:0:A:LT:Xyplex Network9000
-0109:0109:40:00:0:1:0:1:A:3C:Debian Potato (2.2), Linux 2.2.17
-0200:0000:40:WS:0:0:0:0:S:LT:Linux 2.0.35 - 2.0.37
-0200:0200:40:00:0:1:0:0:A:30:Linux 
-0200:0200:40:WS:0:0:0:0:A:2C:Ascend MAX 1800
-0200:05B4:40:00:0:0:0:0:S:2C:Linux 2.0.35 - 2.0.38
-0200:05B4:40:00:0:0:0:0:S:LT:Linux 2.0.38
-0200:05B4:40:34:0:0:0:0:S:LT:Linux 2.0.33
-0200:05B4:40:WS:0:0:0:0:S:2C:Linux 2.0.34-38
-0200:05B4:40:WS:0:0:0:0:S:LT:Linux 2.0.36
-0200:05B4:FF:WS:0:0:0:0:A:2C:Router 3Com 812 ADSL
-0200:_MSS:40:WS:0:0:0:0:S:28:Windows XP
-0200:_MSS:40:WS:0:0:1:0:A:28:ESESA TCP/IP Stack
-0200:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
-0200:_MSS:80:00:0:1:0:0:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
-0200:_MSS:80:00:0:1:0:1:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
-0200:_MSS:80:WS:0:0:0:0:A:LT:3COM / USR TotalSwitch Firmware: 02.02.00R
-0212:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
-0212:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-0212:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-0212:_MSS:80:WS:0:0:0:0:A:LT:CacheOS (CacheFlow 2000 proxy cache)
-0212:_MSS:80:WS:0:0:1:0:A:LT:Linux 2.2.5 - 2.2.13 SMP
-0212:_MSS:80:WS:0:1:0:0:A:LT:NetBSD 1.4 running on a SPARC IPX
-0212:_MSS:80:WS:0:1:0:1:A:LT:NetBSD 1.4 running on a SPARC IPX
-0212:_MSS:80:WS:0:1:1:0:A:LT:NetBSD 1.4 / Generic mac68k (Quadra 610)
-0212:_MSS:80:WS:0:1:1:1:A:LT:NetBSD 1.4 / Generic mac68k (Quadra 610)
-0218:0218:40:00:0:1:0:1:A:LT:NetBSD
-0218:0218:40:WS:0:0:0:0:A:2C:Windows 98
-0244:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRouter/PC
-03CA:_MSS:80:WS:0:0:0:0:A:LT:MPE/iX 5.5
-03E0:0550:40:05:1:1:1:1:S:LT:Windows 2000
-03E0:05B4:20:05:1:1:1:1:S:40:Windows 2000 server
-03F2:_MSS:80:00:0:0:0:0:A:LT:Lexmark Optra S Printer
-03F2:_MSS:80:WS:0:0:0:0:A:LT:Lexmark Optra S Printer
-03F6:0218:FF:WS:0:0:0:0:A:2C:Lexmark Optra SC Printer
-03F6:_MSS:80:WS:0:0:0:0:A:LT:Lexmark Optra S Printer
-0400:0109:40:10:0:1:0:1:S:3C:Linux
-0400:0200:FF:WS:0:0:0:0:A:2C:Zyxel Prestige 10
-0400:0218:FF:WS:0:0:0:0:A:2C:3Com Superstack II
-0400:0400:20:WS:0:0:0:0:A:2C:Windows 2000
-0400:0400:40:00:1:1:0:1:A:3C:ElsaLanCom (SoHo ISDN Router)
-0400:0400:80:WS:0:0:0:0:A:2C:Prime SharePH-1UNW (hardware printserver)
-0400:0400:80:WS:0:0:0:0:S:2C:NCSA 2.3.07
-0400:0500:80:WS:0:0:0:0:A:2C:ITC Version i7.13 of 02-07-99 (embedded device)
-0400:0594:FF:WS:0:0:0:0:A:2C:3Com SuperStack 3 Switch 4400
-0400:059C:FF:WS:0:0:0:0:A:18:3Com SuperStack 3300xm version 2.71 prom 1.00 
-0400:059C:FF:WS:0:0:0:0:A:2C:3Com SuperStack II 3300
-0400:05A4:FF:WS:0:0:0:0:A:2C:3Com SuperStack II 3000 
-0400:05B4:40:00:0:1:0:1:S:3C:Windows 44
-0400:05B4:40:WS:0:0:0:0:A:2C:FORE ES-2810 Switch
-0400:05B4:FF:WS:0:0:0:0:A:2C:3Com 812 ADSL ROUTER
-0400:05C8:20:WS:0:0:0:0:A:2C:Nortel BayStack Access Node
-0400:0901:40:10:0:1:0:1:S:3C:Mac OS X 102.4
-0400:_MSS:40:WS:0:0:0:0:S:28:Linux 2.4.18
-0400:_MSS:80:00:0:1:0:0:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
-0400:_MSS:80:00:0:1:0:1:A:LT:Bay Networks BLN-2 Network Router or ASN Processor rev 9
-0400:_MSS:80:WS:0:0:0:0:A:LT:3com Office Connect Router 810
-0400:_MSS:80:WS:0:0:1:0:A:LT:Aironet 630-2400 V3.3P Wireless LAN bridge
-0420:0114:40:00:1:1:1:1:A:3C:Linux 2.4.18-rc4
-0424:_MSS:80:WS:0:0:0:0:A:LT:Intel InBusiness Print Station
-0430:_MSS:80:WS:0:0:0:0:A:LT:PacketShaper 4000 v4.1.3b2 2000-04-05
-052A:052A:40:00:1:1:0:1:A:3C:Debian Potato (2.2), Linux 2.2.20
-0534:0534:80:WS:0:0:1:0:A:2C:Netware
-0550:0550:40:WS:0:0:0:0:A:2C:Linux 2.4
-0564:0564:40:WS:0:0:0:0:A:2C:Linux
-0564:0564:40:WS:1:0:1:1:A:38:Linux 2.4 
-0564:0564:80:WS:1:1:1:0:A:LT:Windows 2000
-0564:6405:40:00:0:1:1:1:A:3C:Solaris
-0564:6405:40:WS:0:1:1:1:A:38:Mac OS
-0578:0578:08:WS:0:0:0:0:A:2C:Minix 16-bit/Intel 2.0.3
-0578:0578:40:WS:0:0:0:0:A:2C:CVP Telsey
-0578:0578:40:WS:0:0:0:0:S:2C:Windows 2000
-0578:_MSS:40:WS:0:0:0:0:A:28:Elsa Router 
-0578:_MSS:80:WS:0:0:0:0:A:LT:Minix 32-bit/Intel 2.0.0
-0584:0584:80:00:1:1:1:1:A:3C:Red Hat Linux 8.0 (Psyche)
-0584:0584:FF:00:0:1:1:1:A:3C:OpenBSD
-05AC:0218:40:WS:0:0:0:0:A:2C:AXIS Printer
-05B4:052A:40:00:0:1:0:1:A:3C:NetBSD 1.6.1
-05B4:052A:40:00:1:1:0:1:A:3C:Debian Sarge, Linux 2.4.24-1
-05B4:0564:40:01:0:1:1:1:A:3C:FreeBSD 5.1-RELEASE 
-05B4:0564:40:WS:1:1:0:0:A:30:Red Hat Linux 9.0 
-05B4:0564:80:WS:1:1:0:0:A:30:Windows 2000 
-05B4:05B4:20:WS:0:0:0:0:A:2C:Windows XP
-05B4:05B4:40:00:0:1:0:1:S:3C:HP LaserJet 4550 Printer 
-05B4:05B4:40:00:0:1:1:1:A:3C:FreeBSD
-05B4:05B4:40:00:1:1:1:1:A:3C:Red Hat Linux release 6.2 (Zoot) Kernel 2.2.14-5.0
-05B4:05B4:40:00:1:1:1:1:A:40:SunOS 5.8 
-05B4:05B4:40:01:1:1:1:1:A:40:Solaris 8 
-05B4:05B4:40:WS:1:1:1:0:A:30:Windows 2000 Server
-05B4:05B4:40:WS:1:1:1:0:S:30:Windows XP SP1
-05B4:05B4:80:WS:0:0:0:0:A:2C:Zebra ZPL 
-05B4:05B4:80:WS:1:1:1:0:A:30:Windows 2000 Server 
-05B4:05B4:FF:00:1:1:1:1:A:40:Solaris 7 
-05B4:05B4:FF:WS:0:0:0:0:A:2C:FreeBSD/i386
-05B4:B405:40:00:0:1:1:1:A:LT:Red Hat 7.1  (kernel 2.4.3)
-05B4:B405:80:00:0:1:1:1:A:LT:Windows 2000 Server
-05B4:_MSS:80:00:0:1:0:0:A:LT:HP JetDirect Card (J4169A) in an HP LaserJet 8150
-05B4:_MSS:80:WS:0:0:0:0:A:LT:TOPS-20 Monitor 7(102540)-1,TD-1
-05B4:_MSS:80:WS:0:1:1:0:A:LT:Network Appliance NetCache 5.1D4
-05B4:_MSS:80:WS:0:1:1:1:A:LT:Network Appliance NetCache 5.1D4
-05DC:0FD8:40:WS:0:0:0:0:A:2C:D-Link dsl604 wireless router 
-05DC:_MSS:80:WS:0:0:0:0:A:LT:Gandalf LanLine Router
-0600:0300:20:WS:0:0:0:0:S:2C:Chase IOLAN Terminal Server v3.3.09 - TCP 
-0600:_MSS:80:WS:0:0:0:0:A:LT:Chase IOLAN Terminal Server v3.5.02 CDi
-0640:05B4:40:WS:0:0:0:0:A:2C:APC MasterSwitch Network Power Controller
-0640:_MSS:80:WS:0:0:0:0:A:LT:APC MasterSwitch Network Power Controller
-0648:0218:40:WS:0:0:0:0:A:2C:HP Printer
-0648:_MSS:80:WS:0:0:0:0:A:LT:FastComm FRAD F9200-DS-DNI -- Ver. 4.2.3A
-06C2:_MSS:80:WS:0:0:0:0:A:LT:Cyclades PathRAS Remote Access Server v1.1.8 - 1.3.12
-0700:_MSS:80:00:0:0:0:0:A:LT:Lantronix ETS16P Version V3.5/2(970721)
-0700:_MSS:80:WS:0:0:0:0:A:LT:Lantronix ETS16P Version V3.5/2(970721)
-073F:_MSS:80:00:0:0:0:0:A:LT:Novell NetWare 3.12 or 386 TCP/IP
-073F:_MSS:80:WS:0:0:0:0:A:LT:CLIX R3.1 Vr.7.6.20 6480
-07D0:_MSS:80:00:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-07D0:_MSS:80:WS:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-0800:0109:40:10:0:1:0:1:S:3C:Linux
-0800:0200:FF:WS:0:0:0:0:A:2C:Cisco
-0800:0578:FF:WS:0:0:0:0:A:2C:NetGear Hardware Router
-0800:_MSS:40:WS:0:0:0:0:A:28:Connexa 
-0800:_MSS:40:WS:0:0:0:0:S:28:Window 2000 SP3
-0800:_MSS:80:00:0:0:0:0:A:LT:KA9Q
-0800:_MSS:80:00:0:0:0:1:A:LT:KA9Q
-0800:_MSS:80:WS:0:0:0:0:A:LT:3Com Access Builder 4000 7.2
-0800:_MSS:80:WS:0:0:1:0:A:LT:HP Procurve Routing Switch 9304M
-0808:_MSS:80:WS:0:0:0:0:A:LT:Siemens HICOM 300 Phone switch (WAML LAN card)
-0834:0578:FF:WS:0:0:0:0:A:2C:BeWan 2.3.6 
-0834:7805:FF:WS:0:0:0:0:A:2C:Vigor 2900G 
-0848:_MSS:80:WS:0:0:0:0:A:LT:Intergraph Workstation (2000 Series) running CLiX R3.1
-0860:0218:40:00:1:1:1:0:S:30:Windows 9x
-0860:0218:40:00:1:1:1:0:S:3C:Windows 9x
-0860:0218:40:00:1:1:1:0:S:LT:Windows 9x
-0860:0218:40:WS:0:0:0:0:A:2C:Windows 98
-0860:0218:80:WS:0:0:1:0:A:2C:Windows 98
-0860:0218:FF:WS:0:0:0:0:S:LT:Cisco IGS 3000 IOS 11.x(16), 2500 IOS 11.2(3)P
-0860:05B4:40:WS:0:0:1:0:A:2C:Windows 98
-0860:05B4:40:WS:1:1:1:0:S:30:Windows 98
-0860:05B4:80:00:0:1:1:1:A:3C:Windows ME
-0860:05B4:FF:WS:0:0:0:0:A:LT:IOS Version 10.3(15) - 11.1(20)
-0860:_MSS:80:00:0:0:0:0:A:LT:HP JetDirect  Firmware Rev. H.06.00
-0860:_MSS:80:00:0:1:1:0:A:LT:Windows NT4 / Win95 / Win98
-0860:_MSS:80:00:0:1:1:1:A:LT:Windows NT4 / Win95 / Win98
-0860:_MSS:80:WS:0:0:0:0:A:LT:Chase IOLan Terminal Server
-09C8:02F8:FF:WS:0:0:0:0:A:2C:Windows
-0A28:_MSS:80:WS:0:0:0:0:A:LT:Apple Color LaserWrite 600 Printer
-0AF0:0578:80:WS:1:1:1:0:A:30:Windows 2000
-0B18:058C:40:WS:0:0:0:0:S:2C:HNC 91849
-0B63:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-0B63:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-0B68:05B4:40:00:1:1:1:1:S:3C:Linux 2.4.21 
-0B68:05B4:40:WS:0:0:0:0:A:2C:DLink DP-300 Printserver
-0B68:05B4:40:WS:1:1:1:0:A:30:Linux 2.2.19
-0B68:05B4:FF:WS:1:1:1:0:A:LT:Lexmark T520 Network Printer
-0B68:_MSS:40:WS:0:0:1:0:A:LT:Linux 2.0.32 - 2.0.34
-0B68:_MSS:80:00:0:1:1:0:A:LT:Sun Solaris 8 early acces beta through actual release
-0B68:_MSS:80:00:0:1:1:1:A:LT:Sun Solaris 8 early acces beta through actual release
-0B68:_MSS:80:WS:0:0:0:0:A:LT:D-Link Print Server
-0BB8:05B0:20:WS:0:0:0:0:A:2C:VMS/VAX 5.5
-0BB8:_MSS:80:00:0:1:0:0:A:LT:OpenVMS 7.1 Alpha running Digital's UCX v4.1ECO2
-0C00:0109:40:10:0:1:0:1:S:3C:Linux Mandrake 9.1
-0C00:052A:40:WS:0:0:0:0:A:2C:NetGear Router
-0C00:05A0:40:WS:0:0:0:0:A:2C:Trendnet TEW 431 BRP
-0C00:_MSS:40:WS:0:0:0:0:S:28:Slackware 8.0
-0C00:_MSS:40:WS:0:0:0:0:S:LT:Linux Slakware 8.0
-0C00:_MSS:80:WS:0:0:0:0:A:LT:Canon photocopier/fax/scanner/printer GP30F
-0C1C:05B4:FF:WS:0:0:0:0:A:2C:Nokia M1122 Adsl Router
-0C90:0218:40:WS:0:0:0:0:A:2C:HP Printer
-0C90:05B4:40:00:1:1:1:0:S:34:Windows 
-0C90:05B4:40:WS:1:1:1:0:S:30:Windows XP
-0C90:_MSS:80:WS:0:0:0:0:A:LT:HP JetDirect Print Server
-0E00:_MSS:80:WS:0:0:0:0:A:LT:Lantronix EPS1 Version V3.5/1(970325)
-0F87:_MSS:80:00:0:0:0:0:A:LT:Novell NetWare 3.12 or 386 TCP/IP
-0F87:_MSS:80:WS:0:0:0:0:A:LT:A/UX 3.1.1 SVR2 or OpenStep 4.2
-0F87:_MSS:80:WS:0:0:1:0:A:LT:AIX 4.3
-0FA0:_MSS:80:WS:0:0:0:0:A:LT:MultiTech CommPlete (modem server) RAScard
-0FFF:0400:20:WS:0:0:0:0:A:2C:ASMAX Broadband router
-1000:0002:40:WS:0:0:0:0:A:2C:Alcatel Modem
-1000:0004:FF:WS:0:0:0:0:A:2C:Cisco PIX
-1000:0109:40:10:0:1:0:1:S:LT:FreeBSD 4.5
-1000:0200:40:00:0:1:0:1:A:3C:Alcatel Router ADSL Speed Touch Pro
-1000:0200:40:WS:0:0:0:0:A:2C:Alcatel Speedtouch Pro ADSL modem
-1000:0200:40:WS:0:0:0:0:S:LT:CISCO IOS
-1000:0200:FF:WS:0:0:0:0:A:2C:Alcatel Speed Touch Home/Pro
-1000:0400:1E:F5:0:0:0:0:S:LT:Alcatel (Xylan) OmniStack 5024 v3.4.5
-1000:0400:1E:WS:0:0:0:0:S:LT:Chorus MiX V.3.2 r4.1.5 COMP-386
-1000:0400:20:F5:0:0:0:0:S:LT:Alcatel (Xylan) OmniStack 5024
-1000:0400:20:WS:0:0:0:0:A:2C:Alcatel LSS 210-Stack Version 3.4.8
-1000:0400:40:WS:0:0:0:0:A:2C:HP J2603A Ethernet SNMP Module
-1000:0400:40:WS:0:0:0:0:S:2C:Trumpet TCP 2.01 / DOS
-1000:05AC:FF:WS:0:0:0:0:A:2C:QMS4060
-1000:05B0:80:00:0:1:0:0:S:30:VMS
-1000:05B4:10:WS:0:0:0:0:A:2C:Extreme Gigabit switch
-1000:05B4:20:WS:0:0:0:0:A:2C:StorageWorks SAN switch (FabricOS v2.1.7)
-1000:05B4:40:WS:0:0:0:0:A:18:DWL1000 802.11b Access Pointrt.com
-1000:05B4:40:WS:0:0:0:0:A:2C:iPath Cable Media Access Hub
-1000:05B4:40:WS:0:0:0:0:S:2C:Solaris
-1000:05B4:FF:WS:0:0:0:0:A:2C:Cisco Pix 515
-1000:0901:40:10:0:1:0:1:S:LT:Mac os X 10.1
-1000:AC05:40:WS:0:0:0:0:A:2C:HP Procurve Switch
-1000:_MSS:20:WS:0:0:0:0:A:28:Motorola SurfBoard SB4100 CableModem
-1000:_MSS:20:WS:0:0:0:0:S:28:Linux RedHat 9 (kernel 2.4.20)
-1000:_MSS:40:WS:0:0:0:0:A:LT:SCO UnixWare 2.1.2
-1000:_MSS:40:WS:0:0:0:0:S:28:SunOS 4.1.4
-1000:_MSS:40:WS:0:0:0:0:S:LT:Linux
-1000:_MSS:80:00:0:0:1:0:A:LT:OpenVMS/Alpha 7.1 using Process Software's TCPWare V5.3-4
-1000:_MSS:80:00:0:1:0:0:A:LT:Alcatel 1000 ADSL (modem)
-1000:_MSS:80:00:0:1:0:1:A:LT:Alcatel 1000 ADSL (modem)
-1000:_MSS:80:WS:0:0:0:0:A:28:Aironet AP4800E v8.07 11 Mbps wireless access poinit
-1000:_MSS:80:WS:0:0:1:0:A:LT:VirtualAccess LinxpeedPro 120 running Software 7.4.33CM
-1020:0218:FF:WS:0:0:0:0:A:2C:Cisco 2600 IOS 12.0
-1020:0218:FF:WS:0:0:0:0:S:2C:Cisco 3660 IOS 12.2(x)
-1020:022C:FF:00:0:0:0:0:S:LT:Cisco 1750 IOS 12.0(5), Cisco 2500 IOS 11.3(1)
-1020:022C:FF:WS:0:0:0:0:A:2C:Cisco IOS 12.0(5)
-1020:0564:FF:WS:0:0:0:0:A:2C:IOS (tm) C2600 Software (C2600-IS-M), Version 12.2(8)T4,R 
-1020:05B4:FF:WS:0:0:0:0:A:2C:Cisco IOS 12.1.5-12.2.13a
-1020:05B4:FF:WS:0:0:0:0:S:LT:Cisco 2611 IOS 11.3(2)XA4
-1020:6405:FF:WS:0:0:0:0:A:2C:Cisco IOS 
-1020:B405:FF:WS:0:0:0:0:A:2C:AIRONET1200 
-1020:_MSS:80:WS:0:0:0:0:A:LT:AS5200
-1020:_MSS:FF:WS:0:0:1:0:A:LT:Cisco IOS
-10C0:0218:80:WS:1:1:1:0:S:30:Windows 2000 Advanced Server SP2
-10C0:0218:FF:WS:0:0:0:0:A:2C:Cisco IOS
-10C0:0218:FF:WS:0:0:0:0:S:LT:Cisco 1600 IOS 11.2(15)P
-10C0:055E:80:WS:1:1:1:0:S:30:Windows 98
-10C0:05B4:40:00:1:1:1:1:S:40:Windows XP
-10C0:05B4:80:WS:1:1:1:0:S:30:Windows NT SP3
-10C0:05B4:FF:WS:0:0:0:0:A:2C:Cisco IOS 11.2
-10C0:05B4:FF:WS:0:0:0:0:S:LT:Cisco 3620 IOS 11.2(17)P
-10C0:_MSS:80:WS:0:0:0:0:A:LT:Cisco 1600/3640/7513 Router (IOS 11.2(14)P)
-111C:0218:40:WS:0:0:0:0:A:2C:Ascend MAX 1800
-111C:05B4:20:WS:0:0:0:0:A:2C:Linksys PSUS4 Printserver
-111C:05B4:40:WS:0:0:0:0:A:2C:OpenVMS
-111C:05B4:40:WS:0:0:1:0:A:2C:Ascend MAX6000
-111C:05B4:40:WS:0:0:1:0:A:LT:SCO Openserver 502
-111C:_MSS:80:WS:0:0:0:0:A:LT:Ascend/Lucent Max (HP,4000-6000) version 6.1.3 - 7.0.2+
-111C:_MSS:80:WS:0:0:1:0:A:LT:Apple LaserWriter 16/600 PS, HP 6P, or HP 5 Printer
-1140:05CC:40:00:1:1:1:1:A:3C:Linux 2.4.8
-1146:05C2:40:00:1:1:1:1:S:3C:Debian 3.0 woody (2.4.18)
-1164:05B4:40:01:1:1:1:1:S:3C:Fedora Red Hat
-1234:_MSS:FF:WS:0:0:0:0:S:28:Knoppix based L.A.S 
-12CC:0650:40:00:1:1:1:1:A:3C:Debian Woody
-12D8:1802:FF:WS:0:0:0:0:S:2C:Palm OS 
-1490:0524:40:00:1:1:1:1:S:3C:Linux Suse 8.1
-14B8:052E:40:00:1:1:1:1:S:3C:Linux RedHat 7
-14F0:0218:80:WS:1:1:1:0:A:LT:Windows 2000 Professional
-14F0:05B4:80:WS:1:1:1:0:S:LT:Windows ME 
-1520:0548:40:00:1:1:1:1:S:3C:Linux Red Hat
-1540:0550:40:00:1:1:1:1:S:3C:Linux
-1540:0550:40:WS:0:0:1:0:A:2C:Linux RedHat - 2.4.18
-1540:0550:40:WS:1:1:1:0:A:30:Linux 2.4.x
-159F:05B4:40:00:0:1:1:0:S:3C:FreeBSD 2.2.1 - 4.1
-15B8:057A:40:00:1:1:1:1:A:3C:Linux 2.4.10
-15E0:0584:40:00:0:1:1:1:A:3C:Linux 2.4.20
-1608:0582:40:WS:1:1:1:0:A:30:Linux
-1610:0584:40:00:1:1:1:1:S:3C:Linux 2.4.20
-1618:0578:40:00:1:1:1:1:S:3C:Linux 2.4.13
-1640:0590:40:00:1:1:1:1:S:3C:Linux 2.4.23
-165C:_MSS:80:WS:0:0:1:0:A:LT:SCO Release 5
-1678:05AA:40:00:1:1:1:1:A:3C:Linux 2.6.1
-1680:0584:40:00:1:1:1:1:A:3C:Linux 2.4.18 2.4.19
-1680:05AC:40:00:1:1:1:1:A:3C:Linux 2.4.20 (X86)
-1680:_MSS:80:00:0:1:1:1:A:LT:Linux 2.4.7 (X86)
-16A0:01F4:40:00:1:1:1:1:A:3C:Linux 
-16A0:0564:40:00:0:1:1:1:A:3C:Linux 2.6.x
-16A0:0564:40:00:1:1:0:1:A:3C:Linux Redhat 7.2 (Enigma) - Linux
-16A0:0564:40:00:1:1:1:1:A:3C:Linux 2.4.xx
-16A0:0564:40:WS:0:1:1:1:A:38:Linux
-16A0:0564:40:WS:1:0:1:1:A:38:Linux 2.4.21 
-16A0:0578:40:00:1:1:1:1:A:3C:Linux 2.4.7
-16A0:057A:40:00:1:1:1:1:A:3C:Debian Linux
-16A0:057A:40:02:1:1:1:1:A:3C:Debian GNU/Linux
-16A0:0584:40:00:1:1:1:1:A:3C:Linux 
-16A0:0586:40:00:1:1:1:1:A:3C:Linux
-16A0:059C:40:00:1:1:1:1:A:3C:Linux fw 2.4.7-10
-16A0:05AC:20:00:1:1:1:1:A:3C:Linux
-16A0:05AC:40:00:0:1:1:1:A:3C:Linux 2.4.20 RedHat 9 
-16A0:05AC:40:00:1:1:0:1:A:3C:Linux
-16A0:05AC:40:00:1:1:1:1:A:3C:Linux 2.4.18-686 (Debia GNU/Linux)
-16A0:05AC:80:00:1:1:1:1:A:3C:Linux 2.4.12 
-16A0:05AC:FF:00:1:1:1:1:A:3C:Linux 2.4.12 
-16A0:05B4:40:00:0:1:1:1:A:3C:Linux 2.4.4-4GB
-16A0:05B4:40:00:1:1:0:1:A:3C:Windows XP
-16A0:05B4:40:00:1:1:1:0:A:LT:Linux 2.4.2
-16A0:05B4:40:00:1:1:1:1:A:3C:Linux 2.4.xx
-16A0:05B4:40:01:1:1:1:1:A:LT:Linux Kernel 2.4.17 (with MOSIX patch)
-16A0:05B4:40:03:1:1:0:1:A:3C:Linux Kernel 2.4.xx
-16A0:05B4:40:07:1:1:1:1:A:3C:Linux.2.4.20-web100
-16A0:05B4:40:WS:0:1:1:1:A:38:Windows
-16A0:05B4:40:WS:1:0:1:1:A:38:Linux 
-16A0:05B4:80:00:0:1:1:0:A:3C:Linux Kernel 2.4.xx
-16A0:05B4:80:00:0:1:1:1:A:3C:Linux Kernel 2.4.xx
-16A0:05B4:80:00:1:1:1:1:A:3C:Linux Kernel 2.4.12
-16A0:05B4:FF:00:1:1:0:1:A:3C:Linux Kernel 2.4.18
-16A0:05B4:FF:00:1:1:1:1:A:3C:Linux 2.4.12
-16A0:2A05:40:00:1:1:0:1:A:3C:Linux 2.4.22
-16A0:5C05:40:00:0:1:1:1:A:3C:Linux 2.4.19 Knoppix
-16A0:6405:40:02:0:1:1:1:A:3C:RedHat Enterprise 3.0 ES
-16A0:7A05:40:00:0:1:1:1:A:3C:Redhat Linux
-16A0:8C05:40:00:0:1:1:1:A:3C:Linux RedHat 9 
-16A0:B405:40:00:0:1:1:1:A:3C:Linux version 2.4.2-2 (Red Hat Linux 7.1)
-16A0:B405:40:00:0:1:1:1:A:LT:Linux Kernel 2.4.24 (ppc)
-16A0:B405:40:00:1:1:1:1:A:3C:Linux Debian Unstable 2.4.26
-16A8:05AA:40:WS:1:1:1:0:A:30:Debian GNU/Linux (unstable) - 2.4.xx Series Kernel
-16B0:051E:40:WS:1:1:1:0:A:30:Linux 2.4.19
-16B0:0584:40:00:1:1:1:1:S:3C:Linux 2.2.x 
-16B0:0584:40:WS:0:0:1:0:A:2C:Slackware 8.0 Linux 2.2.20
-16B0:0584:40:WS:1:1:1:0:A:30:Redhat 7.0 (linux 2.2.16)
-16B0:05AC:40:00:1:1:1:0:S:3C:Linux 2.4.10
-16B0:05AC:40:00:1:1:1:1:S:3C:Linux 2.4.18-6mdk
-16B0:05AC:40:6F:1:1:1:0:S:3C:Linux 2.4.10
-16D0:0218:80:00:1:1:1:0:S:30:Windows 95
-16D0:0218:80:WS:1:1:1:0:A:30:Windows 2000
-16D0:052A:40:00:1:1:0:1:S:3C:Linux 2.4.23
-16D0:0550:80:WS:1:1:1:0:S:30:Windows XP
-16D0:055C:40:00:1:1:1:1:S:3C:Linux 2.6.7-gentoo-r7
-16D0:0564:40:00:0:1:1:0:A:30:Phlak 0.2 
-16D0:0564:40:00:1:1:1:0:A:34:Linux 2.4.2
-16D0:0564:40:00:1:1:1:1:S:3C:Linux RedHat 
-16D0:0564:40:WS:0:0:1:0:A:2C:Linux 2.4
-16D0:0564:40:WS:1:1:1:0:A:30:Linux 2.4.19
-16D0:0564:40:WS:1:1:1:1:S:3C:Slackware Linux 8.1
-16D0:0584:40:00:1:1:1:1:S:3C:Linux 2.4.8
-16D0:0584:40:WS:0:0:1:0:A:2C:Linux 2.4.18 
-16D0:0584:40:WS:1:1:1:0:A:30:Linux 2.4.17
-16D0:0584:80:WS:0:0:1:0:A:2C:RedHat Linux
-16D0:0594:40:WS:0:0:0:0:A:2C:Linux 
-16D0:0598:40:WS:0:0:1:0:A:2C:Linux
-16D0:0598:40:WS:1:1:0:0:A:30:Linux
-16D0:059C:40:WS:1:1:1:0:A:30:Red Hat Linux
-16D0:05AC:40:00:1:1:1:1:S:3C:Debian - Linux 2.4.18 
-16D0:05AC:40:WS:0:0:1:0:A:2C:Linux 2.4.xx 
-16D0:05AC:40:WS:1:1:0:0:A:30:Windows .NET 
-16D0:05AC:40:WS:1:1:1:0:A:30:Linux 2.4.18-3 (IServ/RedHat)
-16D0:05B4:01:WS:1:1:1:0:A:30:Linux
-16D0:05B4:20:00:1:1:1:1:S:3C:Linux 2.4.20
-16D0:05B4:20:00:1:1:1:1:S:LT:Linux 2.4.10-GR Security Patch 1.8.1
-16D0:05B4:40:00:0:1:0:0:A:30:Slackware 2.4.17
-16D0:05B4:40:00:0:1:0:1:A:3C:HP psc 2500 network Printer 
-16D0:05B4:40:00:0:1:1:0:A:30:Linux Slackware 8 - kernel 2.4.17
-16D0:05B4:40:00:0:1:1:0:S:30:Mandrake 8.2
-16D0:05B4:40:00:0:1:1:0:S:3C:Linux 2.4.13-ac7
-16D0:05B4:40:00:0:1:1:1:S:3C:Linux 2.4.19-pre10-ac2
-16D0:05B4:40:00:1:1:0:0:S:34:Linux 2.4.xx
-16D0:05B4:40:00:1:1:0:1:S:3C:Linux 2.6.0
-16D0:05B4:40:00:1:1:1:0:A:34:Linux 2.4.xx
-16D0:05B4:40:00:1:1:1:0:S:30:Linux 2.4.1-14
-16D0:05B4:40:00:1:1:1:0:S:34:Linux 2.4.23-grsec 
-16D0:05B4:40:00:1:1:1:0:S:34:Linux Debian Woody
-16D0:05B4:40:00:1:1:1:0:S:3C:Linux 2.4.xx
-16D0:05B4:40:00:1:1:1:1:S:3C:Linux 2.4.xx
-16D0:05B4:40:01:1:1:1:1:S:3C:Linux 2.4.10 - 2.4.16
-16D0:05B4:40:01:1:1:1:1:S:LT:Linux Red Hat 9 
-16D0:05B4:40:03:1:1:1:0:A:34:Windows 
-16D0:05B4:40:07:1:1:1:1:S:3C:Debian Linux 
-16D0:05B4:40:07:1:1:1:1:S:3C:Linux Fedora Core 2 2.6.8-1.521 
-16D0:05B4:40:WS:0:0:0:0:A:2C:HP LaserJet 2100 Series
-16D0:05B4:40:WS:0:0:0:0:A:LT:Intel PRO/Wireless LAN Acess Point Version 02.00-04
-16D0:05B4:40:WS:0:0:0:0:S:2C:Linux
-16D0:05B4:40:WS:0:0:1:0:A:2C:Linux 2.4.xx
-16D0:05B4:40:WS:0:0:1:0:A:LT:Linux
-16D0:05B4:40:WS:0:0:1:0:A:LT:Linux 
-16D0:05B4:40:WS:0:0:1:0:S:2C:Linux 2.4.18
-16D0:05B4:40:WS:0:1:1:1:S:38:SuSE Linux 8.0 Kernel 2.4.18-4GB (i686)
-16D0:05B4:40:WS:1:1:0:0:A:30:Linux
-16D0:05B4:40:WS:1:1:1:0:A:1C:Linux 2.4.22-gentoo-r5 
-16D0:05B4:40:WS:1:1:1:0:A:30:Linux 2.4.xx
-16D0:05B4:40:WS:1:1:1:0:A:30:Linux Fedora Core 1 
-16D0:05B4:40:WS:1:1:1:0:A:30:Mandrake 9.2 (Linux 2.4.xx) 
-16D0:05B4:80:00:1:1:1:1:S:3C:Linux 2.4.14 - 2.4.22
-16D0:05B4:80:WS:0:0:0:0:A:2C:Linux
-16D0:05B4:80:WS:0:0:1:0:A:2C:Windows XP / 2000
-16D0:05B4:80:WS:0:0:1:0:S:2C:FreeBSD
-16D0:05B4:80:WS:1:1:0:0:A:30:Linux
-16D0:05B4:80:WS:1:1:1:0:A:30:Windows 95
-16D0:05B4:80:WS:1:1:1:0:S:30:Windows 95
-16D0:05B4:80:WS:1:1:1:0:S:LT:Windows 98 / 2000
-16D0:05B4:FF:00:1:1:1:1:S:3C:Slackware Linux
-16D0:05B4:FF:WS:0:0:0:0:A:2C:Linksys BEFSR11 1 Port Router/HUB
-16D0:05B4:FF:WS:0:0:1:0:S:2C:Linux 2.4 
-16D0:05B4:FF:WS:1:1:0:0:S:30:Windows 98
-16D0:05B4:FF:WS:1:1:1:0:A:LT:Linux 2.4.10
-16D0:05B4:FF:WS:1:1:1:0:S:30:Windows 98
-16D0:9C05:40:WS:1:1:1:0:A:30:Linux 2.4.18
-16D0:B405:40:00:1:1:1:1:S:3C:Linux 2.4.18
-16D0:B405:40:00:1:1:1:1:S:LT:Redhat Linux 7.1 (Kernel 2.4.2)
-16D0:B405:40:01:1:1:1:1:S:LT:SuSe 8.0 Linux 2.4.18
-16D0:B405:40:WS:0:0:0:0:A:2C:HP LaserJet 4050N
-16D0:B405:40:WS:0:0:0:0:A:LT:SMC Broadband / MacSense Router
-16D0:B405:40:WS:0:0:1:0:A:2C:RedHat Linux 7.3 (2.4.18)
-16D0:B405:FF:WS:0:0:0:0:A:2C:LinkSys Router
-16D0:_MSS:80:00:0:0:0:0:A:LT:HP Color LaserJet 4500N, Jet Direct J3113A/2100
-16D0:_MSS:80:00:0:1:1:0:A:LT:Windows NT4 / Win95 / Win98
-16D0:_MSS:80:00:0:1:1:1:A:LT:Windows NT4 / Win95 / Win98
-16D0:_MSS:80:WS:0:0:0:0:A:LT:HP Color LaserJet 4500N, Jet Direct J3113A/2100
-16D0:_MSS:80:WS:0:0:1:0:A:LT:Linux 2.4.7 (X86)
-1770:0578:40:WS:0:0:1:0:A:2C:SMC Router SMC7004VBR 
-1800:04EC:80:WS:1:1:0:0:A:30:NetWare 6 SP3 
-1800:0558:80:WS:0:0:1:0:A:LT:Novell Netware 5.1 SP3
-1800:0558:80:WS:0:0:1:0:S:2C:Novel Netware 4.0
-1800:05B4:40:00:0:1:1:1:S:3C:VMS
-1800:05B4:80:00:0:1:1:0:A:30:Novel Netware 5.1 
-1800:05B4:80:00:1:1:1:0:A:34:Novell Netware 5.1
-1800:05B4:80:00:1:1:1:0:S:34:Novell Netware 6.0
-1800:05B4:80:WS:0:0:1:0:A:2C:Novell Netware 4.0 / 5.0
-1800:05B4:80:WS:0:0:1:0:S:2C:Novell Netware 5.1
-1800:05B4:80:WS:1:1:1:0:A:30:Netware 5.1 SP5
-1800:5805:80:WS:0:0:1:0:A:LT:Novell Netware 5.1
-1800:_MSS:40:WS:0:0:1:0:A:LT:VMS MultiNet V4.2(16) / OpenVMS V7.1-2
-1800:_MSS:80:00:0:1:0:0:A:LT:OpenVMS 6.2 - 7.2-1 on VAX or AXP
-1800:_MSS:80:00:0:1:0:1:A:LT:OpenVMS 6.2 - 7.2-1 on VAX or AXP
-1800:_MSS:80:00:0:1:1:0:A:LT:VMS MultiNet V4.2(16)/ OpenVMS V7.1-2
-1800:_MSS:80:00:0:1:1:1:A:LT:VMS MultiNet V4.2(16)/ OpenVMS V7.1-2
-1800:_MSS:80:WS:0:0:0:0:A:LT:IPAD Model 5000 or V.1.52
-1800:_MSS:80:WS:0:0:1:0:A:LT:Novell Netware 5.0 SP5
-1860:05B4:80:WS:1:1:1:0:A:30:Windows XP Pro
-1920:05B4:40:WS:1:1:0:0:S:30:Windows 98
-192F:_MSS:80:00:0:0:0:0:A:LT:Mac OS 7.0-7.1 With MacTCP 1.1.1 - 2.0.6
-192F:_MSS:80:WS:0:0:0:0:A:LT:Mac OS 7.0-7.1 With MacTCP 1.1.1 - 2.0.6
-1AB8:0564:40:WS:1:1:1:0:A:LT:IRIX
-1C52:05AA:40:00:1:1:1:1:S:40:Windows XP Pro
-1C84:05B4:40:WS:0:0:1:0:A:2C:Linux
-1C84:_MSS:80:WS:0:0:0:0:A:LT:Instant Internet box
-1D4C:_MSS:80:WS:0:0:0:0:A:LT:Sega Dreamcast
-1F0E:_MSS:80:WS:0:0:0:0:A:LT:AmigaOS AmiTCP/IP 4.3
-1FB0:0FD8:40:WS:0:0:0:0:A:2C:Actiontec ADSL modem 
-1FB0:0FD8:40:WS:0:0:0:0:A:2C:Actiontec ADSL mom 
-1FE0:0550:80:WS:1:1:1:0:S:30:Windows
-1FFE:0218:FF:WS:0:0:0:0:A:2C:Linux Debian 
-1FFE:0546:FF:WS:0:0:0:0:A:2C:Linux Debian 2.4
-1FFE:055C:FF:WS:0:0:0:0:A:2C:Linux Debian woody
-1FFE:0584:FF:WS:0:0:0:0:A:2C:Linux Debian 
-1FFE:0596:FF:WS:0:0:0:0:A:2C:Windows
-1FFE:05B4:FF:WS:0:0:0:0:A:2C:Linux Debian
-1FFF:_MSS:80:00:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-1FFF:_MSS:80:WS:0:0:1:0:A:LT:NetWare 4.11 SP7- 5 SP3A BorderManager 3.5
-2000:0002:40:00:0:1:0:0:A:LT:Mac OS 9/Apple ShareIP
-2000:0109:40:WS:0:0:0:0:A:LT:Cisco CacheOS 1.1.0
-2000:0200:40:WS:0:0:0:0:A:2C:ForeThought ASX200BX
-2000:0200:40:WS:0:0:0:0:A:LT:QNX / Amiga OS
-2000:0200:80:WS:1:1:1:0:S:30:Windows XP - Windows 98
-2000:020C:40:00:0:1:0:1:A:LT:OS/400
-2000:0218:20:WS:1:1:0:0:S:30:Windows XP
-2000:0218:40:WS:0:0:0:0:A:LT:OS/400
-2000:0218:80:00:1:1:1:0:S:30:Windows 9x
-2000:0218:80:WS:1:1:1:0:S:30:Windows 9x or 2000
-2000:052A:80:WS:1:1:1:0:S:30:Windows 98
-2000:0534:80:WS:1:1:1:0:S:30:Windows 98
-2000:0550:80:WS:1:1:1:0:S:30:Windows 9x
-2000:0556:80:WS:1:1:1:0:S:30:Windows 98 SE
-2000:0564:40:WS:0:0:0:0:A:2C:Linux
-2000:0564:80:WS:1:1:1:0:S:30:Windows 98
-2000:056C:40:00:0:1:0:1:A:3C:IBM AS400
-2000:0584:40:WS:0:0:0:0:A:2C:Linux (debian 2.0)
-2000:0586:80:WS:1:1:1:0:S:30:Windows 9x or NT4
-2000:0588:80:WS:1:1:1:0:S:30:Windows 98SE
-2000:0598:80:WS:1:1:1:0:S:30:Windows 2000
-2000:059C:40:00:0:1:0:1:A:3C:Windows NT
-2000:059C:80:WS:1:1:1:0:S:30:Windows 98
-2000:05AC:40:00:0:1:0:0:A:30:OS 400
-2000:05AC:40:WS:0:0:0:0:A:2C:Windows
-2000:05AC:40:WS:0:0:1:0:A:2C:AS400 
-2000:05AC:80:WS:0:0:1:0:S:2C:Windows NT 4.0 
-2000:05AC:80:WS:1:1:1:0:S:30:Windows 98 SE
-2000:05B0:20:WS:0:0:1:0:S:2C:Windows 95
-2000:05B0:80:00:1:1:1:0:S:40:Linux 2.2.13
-2000:05B0:80:00:1:1:1:1:S:LT:Windows 95
-2000:05B0:80:WS:0:0:0:0:A:2C:D-Link DI 614v2.2
-2000:05B0:80:WS:1:1:1:0:S:30:Windows NT SP3
-2000:05B4:08:WS:1:1:0:0:S:30:Windows 2000 
-2000:05B4:20:00:0:0:1:0:S:2C:Windows NT 4.0
-2000:05B4:20:WS:0:0:1:0:S:2C:Windows 95
-2000:05B4:20:WS:1:1:0:0:S:LT:Slackware Linux 7.1 Kernel 2.2.16
-2000:05B4:20:WS:1:1:1:0:S:30:Windows 98
-2000:05B4:40:00:0:1:0:0:A:30:SMC Barricade Wireless router
-2000:05B4:40:00:0:1:1:0:S:3C:BSDI BSD/OS 3.1
-2000:05B4:40:00:0:1:1:0:S:LT:BSDI BSD/OS 3.1
-2000:05B4:40:00:0:1:1:1:A:3C:FreebSD 5.0 RELEASE (x86)
-2000:05B4:40:00:1:1:1:0:S:3C:BSDI BSD/OS 3.0-3.1 (or MacOS, NetBSD)
-2000:05B4:40:00:1:1:1:0:S:40:WebTV netcache engine (BSDI)
-2000:05B4:40:WS:0:0:0:0:A:2C:Linux
-2000:05B4:40:WS:0:0:0:0:S:2C:CacheFlow 500x CacheOS 2.1.08 - 2.2.1
-2000:05B4:40:WS:0:0:1:0:S:2C:AXCENT Raptor Firewall Windows NT 4.0/SP3
-2000:05B4:80:00:0:0:1:0:S:2C:Windows NT 4.0
-2000:05B4:80:00:0:0:1:0:S:LT:Windows NT 4.0
-2000:05B4:80:00:1:1:1:0:S:2C:Windows 9x
-2000:05B4:80:00:1:1:1:0:S:30:Windows 9x
-2000:05B4:80:00:1:1:1:0:S:40:Windows 9x
-2000:05B4:80:00:1:1:1:1:S:40:Windows 95
-2000:05B4:80:WS:0:0:0:0:A:2C:D-Link DWL-900AP
-2000:05B4:80:WS:0:0:0:0:S:2C:Windows NT 4.0
-2000:05B4:80:WS:0:0:1:0:A:2C:Windows 2000
-2000:05B4:80:WS:0:0:1:0:S:2C:Windows NT 4.0 SP6a / Windows 2000
-2000:05B4:80:WS:1:0:1:0:S:2C:Windows NT
-2000:05B4:80:WS:1:0:1:0:S:LT:Windows NT
-2000:05B4:80:WS:1:1:0:0:S:30:Windows 95
-2000:05B4:80:WS:1:1:1:0:A:30:Windows 2000
-2000:05B4:80:WS:1:1:1:0:S:30:Windows 98 / 2000
-2000:05B4:80:WS:1:1:1:0:S:3C:Linux 2.2.19
-2000:05B4:80:WS:1:1:1:0:S:LT:Windows 98
-2000:05B4:FF:WS:1:1:0:0:S:30:Windows XP SP1
-2000:05B4:FF:WS:1:1:1:0:S:30:Windows 98SE 
-2000:6363:80:WS:1:1:1:0:S:LT:Microsoft NT 4.0 Server SP5
-2000:6D70:40:WS:0:0:0:0:A:2C:Linux
-2000:B405:20:WS:0:0:0:0:A:LT:HP Ux 9.x
-2000:B405:20:WS:0:0:1:0:S:LT:Windows 2000
-2000:B405:40:00:0:1:0:1:A:3C:Apple AirPort Base Station
-2000:B405:40:00:0:1:1:1:A:3C:windows 98
-2000:B405:80:00:0:1:0:1:A:3C:Cisco VPN3002 HW Client
-2000:B405:80:WS:0:0:1:0:S:LT:Windows 98 / NT
-2000:B405:80:WS:1:1:1:0:S:30:Windows 98 / XP
-2000:B405:FF:WS:1:1:1:0:S:30:Windows 98se
-2000:_MSS:40:WS:0:0:0:0:S:LT:Mac OS 8.6
-2000:_MSS:40:WS:0:0:1:0:A:LT:BSDI BSD/OS
-2000:_MSS:80:00:0:0:0:0:A:LT:IBM VM/ESA 2.2.0 CMS Mainframe System
-2000:_MSS:80:00:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-2000:_MSS:80:00:0:1:0:0:A:LT:Accelerated Networks - High Speed Integrated Access VoDSL
-2000:_MSS:80:00:0:1:0:1:A:LT:Tandem NSK D40
-2000:_MSS:80:00:0:1:1:0:A:LT:AS/400e 720 running OS/400 R4.4
-2000:_MSS:80:00:0:1:1:1:A:LT:AS/400e 720 running OS/400 R4.4
-2000:_MSS:80:WS:0:0:0:0:A:LT:AGE Logic, Inc. IBM XStation
-2010:_MSS:80:WS:0:0:1:0:A:LT:Windows NT / Win9x
-2017:0534:80:WS:0:0:1:0:A:2C:Windows 98 SE
-2017:05B4:40:00:0:1:1:1:A:LT:BSDI BSD/OS 3.0-3.1 (or possibly MacOS, NetBSD)
-2017:05B4:80:WS:0:0:1:0:A:2C:Windows 98 SE / Windows NT 4.0
-2017:1802:80:WS:0:0:1:0:A:LT:Windows NT 4.0
-2017:_MSS:80:00:0:1:0:0:A:LT:Ascend GRF Router running Ascend Embedded/OS 2.1
-2017:_MSS:80:00:0:1:1:0:A:LT:BSDI 4.0-4.0.1
-2017:_MSS:80:00:0:1:1:1:A:LT:BSDI 4.0-4.0.1
-2017:_MSS:80:WS:0:0:0:0:A:LT:CacheOS (CacheFlow 500-5000 webcache) CFOS 2.1.08 - 2.2.1
-2017:_MSS:80:WS:0:0:1:0:A:LT:3Com NetBuilder & NetBuilder II OS v 9.3
-2058:0564:40:WS:0:0:1:0:A:2C:BSDi BSD/OS 4.0.1
-2058:0564:80:WS:0:0:0:0:A:2C:Windows NT
-2058:0564:80:WS:0:0:1:0:A:2C:Windows 2000 / NT / Win9x
-2058:05B4:80:WS:1:1:1:0:A:LT:Windows 98 SE
-2058:6405:80:WS:0:0:1:0:A:LT:Windows
-20D0:0578:40:00:1:1:1:1:A:40:Windows
-20D0:0578:80:WS:0:0:1:0:A:2C:Windows NT 4.0 Server
-2118:0584:80:WS:0:0:0:0:A:2C:Checkpoint FW-1 4.1 on Solaris 2.6 
-2120:_MSS:80:WS:0:0:1:0:A:LT:Gauntlet 4.0a firewall on Solaris 2.5.1
-2130:0588:80:WS:1:1:1:0:A:30:Windows 98 SE
-2142:058B:40:00:1:1:1:1:A:40:Windows NT
-2180:0218:80:WS:1:1:1:0:A:30:Windows 98
-2180:05B0:80:WS:0:0:1:0:A:2C:Windows NT - Windows 9x
-2180:05B4:20:WS:0:0:1:0:A:2C:Windows XP
-2180:05B4:80:00:1:1:1:1:S:40:Windows 9x 
-2180:05B4:80:WS:0:0:1:0:A:2C:Windows NT / Win9x
-2180:_MSS:20:WS:0:0:1:0:A:LT:Windows NT / Win9x
-2180:_MSS:40:WS:0:0:1:0:A:LT:BSDI BSD/OS
-2190:05B4:20:WS:0:0:1:0:A:LT:Windows NT / Win9x
-2190:05B4:80:WS:0:0:1:0:A:LT:Windows NT / Win9x
-21D2:05B4:80:WS:0:0:1:0:A:LT:Windows NT / Win9x
-21F0:05B4:80:00:1:1:1:1:A:40:vXWorks
-21F0:05B4:80:WS:0:0:1:0:A:LT:Windows NT 4.0
-2200:_MSS:80:00:0:1:0:0:A:LT:Stock OpenVMS 7.1
-2200:_MSS:80:00:0:1:0:1:A:LT:Stock OpenVMS 7.1
-2200:_MSS:80:00:0:1:1:0:A:LT:OpenVMS 6.2/Alpha
-2200:_MSS:80:00:0:1:1:1:A:LT:OpenVMS 6.2/Alpha
-2200:_MSS:80:WS:0:0:0:0:A:LT:Linux 2.0.34-38
-2208:05AC:40:WS:1:1:1:0:A:30:Linux 
-2208:05B4:80:WS:0:0:1:0:A:2C:Windows NT
-2208:05B4:80:WS:1:1:1:0:A:30:Windows 98 SE
-2220:05B0:80:WS:1:1:1:0:A:30:Windows NT
-2220:_MSS:40:WS:0:0:1:0:A:LT:BSDI BSD/OS
-2220:_MSS:80:WS:0:0:1:0:A:LT:Windows NT / Win9x
-2229:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.5, 2.5.1
-2229:_MSS:80:WS:0:0:0:0:A:LT:DG/UX Release R4.11MU02
-2229:_MSS:80:WS:0:0:1:0:A:LT:Solaris 2.3 - 2.4
-2238:0218:40:WS:1:1:1:0:A:30:Windows 98
-2238:0218:80:WS:1:1:1:0:S:30:Windows 2000 Pro
-2238:0550:80:WS:1:1:1:0:S:LT:Linux
-2238:0564:80:WS:0:0:1:0:A:30:Solaris 2.7
-2238:0564:80:WS:1:1:1:0:S:30:Solaris 
-2238:0564:FF:00:0:0:1:0:S:2C:Solaris 2.7
-2238:0584:80:WS:0:0:1:0:A:30:Linux Red Hat
-2238:05AC:40:WS:0:0:0:0:A:2C:Windows 98
-2238:05B4:20:WS:0:0:0:0:A:LT:Snap Server (Quantum)
-2238:05B4:20:WS:0:0:1:0:A:2C:Microsoft Windows 95
-2238:05B4:20:WS:1:1:1:0:S:30:Windows 98
-2238:05B4:40:00:0:0:1:0:S:LT:Solaris 2.6
-2238:05B4:40:00:0:1:0:0:A:30:Hp jetDirect
-2238:05B4:40:00:0:1:0:1:A:3C:SMC Barricade SMC7004VWBR
-2238:05B4:40:00:0:1:1:1:A:3C:IRIX
-2238:05B4:40:00:0:1:1:1:A:LT:BSDI BSD/OS 3.0
-2238:05B4:40:00:1:1:1:1:A:40:Cisco IOS 
-2238:05B4:40:WS:0:0:0:0:A:2C:Linksys WAP11 
-2238:05B4:40:WS:0:0:1:0:A:2C:Cisco IOS
-2238:05B4:40:WS:0:0:1:0:A:LT:BSDI BSD/OS 3.0-3.1 (or possibly MacOS, NetBSD)
-2238:05B4:40:WS:1:1:1:0:A:30:Windows NT4
-2238:05B4:40:WS:1:1:1:0:S:30:Windows XP SP1 + Sygate Personal Firewall 
-2238:05B4:80:00:1:1:1:1:A:40:Windows 98
-2238:05B4:80:WS:0:0:0:0:A:2C:Windows NT 4.x
-2238:05B4:80:WS:0:0:1:0:A:2C:Windows NT 4.x / Win9x
-2238:05B4:80:WS:0:0:1:0:A:30:Windows
-2238:05B4:80:WS:1:1:0:0:A:30:Windows 98
-2238:05B4:80:WS:1:1:1:0:A:30:Windows 98 / 2000 / XP
-2238:05B4:80:WS:1:1:1:0:S:30:Windows 2000 - XP SP1
-2238:05B4:FF:00:0:0:1:0:S:2C:Solaris 2.6 or 2.7
-2238:05B4:FF:00:0:1:0:0:A:30:SunOS 5.7 
-2238:05B4:FF:00:0:1:1:0:A:30:SunOS 5.7 
-2238:05B4:FF:WS:0:0:1:0:A:2C:SunOS 5.7
-2238:05B4:FF:WS:0:0:1:0:A:LT:OpenBSD
-2238:05B4:FF:WS:0:0:1:0:S:2C:SunOS 5.7 Generic sun4u sparc
-2238:05B4:FF:WS:0:1:1:0:S:2C:Solaris 2.6 or 2.7
-2238:05B4:FF:WS:1:0:1:0:S:2C:Solaris 2.6 - 2.7
-2238:05B4:FF:WS:1:1:1:0:A:30:SunOS 5.7
-2238:1128:80:WS:0:0:1:0:A:2C:Novell Netware
-2238:1144:80:WS:0:0:1:0:A:2C:Windows NT 4.0
-2238:9805:80:00:0:1:0:1:A:3C:Windows XP Professional
-2238:B405:20:WS:0:0:1:0:A:2C:Windows 95 
-2238:B405:40:00:0:1:1:1:A:3C:Windows 2000 / XP
-2238:B405:80:00:0:1:1:1:A:3C:Windows 95
-2238:B405:80:WS:0:0:1:0:A:2C:Windows 2000
-2238:B405:FF:00:0:1:1:0:A:LT:Solaris
-2238:B405:FF:WS:0:0:0:0:A:2C:Solaris 2.5.1
-2238:B405:FF:WS:0:0:1:0:A:LT:Solaris 2.5.1
-2238:B405:FF:WS:0:0:1:0:S:LT:Solaris 7
-2238:_MSS:40:WS:0:0:1:0:A:LT:BSDI BSD/OS
-2238:_MSS:80:WS:0:0:0:0:A:LT:HP printer w/JetDirect card
-223F:05AC:FF:WS:0:0:0:0:A:2C:Windows 98
-223F:05B4:FF:WS:0:0:0:0:A:2C:Solaris 2.6
-223F:7805:FF:WS:0:0:0:0:A:LT:Solaris
-2274:04EC:80:WS:1:1:1:0:A:30:Windows 98
-2274:04EC:FF:WS:1:1:1:0:A:30:Symantec Raptor Firewall
-2274:0564:80:WS:0:0:1:0:A:2C:PIX FireWall
-2284:114E:40:00:1:1:1:1:A:3C:Solaris 
-2297:0109:FF:00:0:1:1:1:A:3C:Solaris 2.6 -7 (SPARC)
-2297:_MSS:80:00:0:1:1:0:A:LT:Raptor Firewall 6 on Solaris 2.6
-2297:_MSS:80:00:0:1:1:1:A:LT:Raptor Firewall 6 on Solaris 2.6
-2328:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7
-2332:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.3 - 2.4
-2332:_MSS:80:WS:0:0:0:0:A:LT:Solaris 2.4 w/most Sun patches
-2332:_MSS:80:WS:0:0:1:0:A:LT:Solaris 2.3 - 2.4
-2398:0218:FF:WS:0:0:1:0:A:2C:SunOS 5.6
-239C:_MSS:80:WS:0:0:0:0:A:LT:Apollo Domain/OS SR10.4
-23B4:23B4:FF:00:0:0:1:0:S:LT:Solaris 2.6
-2400:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7
-246C:0534:80:WS:0:0:1:0:A:2C:Windows NT 4.0
-2491:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7 with tcp_strong_iss=0
-2491:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7 with tcp_strong_iss=0
-2530:0550:80:WS:1:1:1:0:A:30:windows 98
-2530:05B4:80:WS:0:0:1:0:A:LT:Windows 2000
-2544:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.3 - 2.4
-2568:0564:FF:00:1:1:1:1:A:40:Solaris 8 
-2568:0564:FF:WS:0:1:0:1:A:38:Solaris
-2568:0564:FF:WS:1:1:1:1:A:3C:Solaris
-2580:05AC:80:WS:1:1:1:0:A:30:Windows 2000 Sp3 (Build2195)
-25BC:0564:FF:WS:0:0:1:0:A:2C:Windows
-25BC:0564:FF:WS:0:0:1:0:A:LT:Solaris
-25BC:0564:FF:WS:1:1:1:0:A:30:Solaris
-2648:0584:FF:00:1:1:1:1:A:40:Windows 2000 NT 
-2648:8405:FF:00:0:1:1:1:A:LT:Solaris
-26E2:058E:FF:WS:1:1:1:0:A:30:SunOS 5.7
-2756:_MSS:80:WS:0:0:0:0:A:LT:AmigaOS AmiTCP/IP Genesis 4.6
-2760:05AC:FF:00:1:1:1:1:A:40:Solaris 7 
-2788:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-2788:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-2798:05B4:FF:00:0:1:1:0:A:LT:Solaris
-2798:05B4:FF:00:0:1:1:1:A:3C:Solaris 2.6 / SunOS 5.6
-2798:05B4:FF:00:1:1:1:1:A:40:SunOS 5.7
-2798:B405:FF:00:0:1:0:1:A:3C:Solaris 6
-2798:B405:FF:00:0:1:1:1:A:3C:Solaris 7
-2798:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7
-2800:05B4:80:WS:0:0:0:0:S:2C:Tiptel Innovaphone IP200 V4.00 sr4
-2800:05B4:80:WS:1:1:1:0:S:30:Windows XP Professional SP1
-2A20:0550:FF:00:0:1:1:1:A:3C:SunOS 5.6 sum4m sparc SUNW,SPARCstation-20
-2D24:_MSS:80:00:0:1:1:1:A:LT:Linux Kernel 2.4.xx (X86)
-2D25:_MSS:80:WS:0:0:0:0:A:LT:Mac OS 7.0-7.1 With MacTCP 1.1.1 - 2.0.6
-2DA0:B405:40:00:0:1:0:0:A:30:HPirect J6039A
-2DA0:_MSS:80:WS:0:0:0:0:A:LT:Windows 98SE + IE5.5sp1
-3000:05B4:FF:WS:0:0:0:0:A:2C:BeOS 
-3000:05B4:FF:WS:0:0:0:0:S:2C:BeOS 5.0
-3000:05B4:FF:WS:0:1:0:0:S:2C:BeOS 5.0
-3000:_MSS:80:WS:0:0:0:0:A:LT:Acorn Risc OS 3.6 (Acorn TCP/IP Stack 4.07)
-37FF:_MSS:80:WS:0:0:0:0:A:LT:Linux 1.2.13
-3840:0564:40:WS:0:0:0:0:S:2C:Windows 98 
-3908:05B4:40:00:1:1:0:1:S:40:HPUX 11.11
-3908:05B4:40:00:1:1:1:1:A:3C:IPCop v1.2.0
-3908:05B4:40:WS:1:1:0:0:S:30:Windows 98 SE
-3908:05B4:40:WS:1:1:1:0:A:30:Linux Debian
-3908:05B4:40:WS:1:1:1:0:S:30:windows 2000 Professional
-3908:05B4:80:WS:1:1:1:0:A:30:Linux 2.0.3 
-3C00:_MSS:80:WS:0:0:0:0:A:LT:Linux 2.0.27 - 2.0.30
-3C0A:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-3C0A:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-3CAC:0584:40:00:1:1:1:1:A:3C:Linux 2.2.16
-3E43:_MSS:80:00:0:1:0:0:A:LT:AIX 4.1-4.1.5
-3E43:_MSS:80:00:0:1:0:1:A:LT:AIX 4.1-4.1.5
-3E64:05AC:40:00:0:1:1:1:A:3C:Debian 3.0
-3E64:05AC:40:00:1:1:1:0:S:3C:Windows 98
-3E64:05AC:40:00:1:1:1:1:A:4C:Linux 2.2.x 2.4.x
-3E64:05AC:40:00:1:1:1:1:S:3C:Linux Debian 3.0 (kernel 2.2)
-3E80:05A6:80:WS:0:0:0:0:A:2C:Windows xp
-3E80:05B4:FF:WS:0:0:0:0:A:2C:CiscoATA-186
-3E80:_MSS:80:WS:0:0:0:0:A:LT:Alcatel Advanced Reflexes IP Phone, Version: E/AT400/46.8
-3E80:_MSS:80:WS:0:0:1:0:A:LT:VersaNet ISP-Accelerator(TM) Remote Access Server
-3EBC:05B4:40:00:1:1:0:1:A:3C:Linux 2.2.17 GNU Debian/Potato
-3EBC:05B4:40:00:1:1:1:0:A:34:Linux Slackware 8.0
-3EBC:05B4:40:00:1:1:1:0:S:3C:Debian/Caldera Linux 2.2.x
-3EBC:05B4:40:00:1:1:1:1:A:3C:Linux 2.2.19 or 2.4.17
-3EBC:05B4:40:00:1:1:1:1:S:3C:Linux 2.2.16 - 2.2.19
-3EBC:05B4:40:WS:0:0:0:0:A:2C:AIX 4.3.2
-3EBC:05B4:40:WS:0:0:1:0:A:2C:AIX 4.3
-3EBC:05B4:40:WS:0:0:1:0:A:LT:Debian GNU/Linux
-3EBC:05B4:40:WS:1:1:1:0:A:30:Linux 2.2.19
-3EBC:05B4:40:WS:1:1:1:0:A:LT:Linux 2.2.19
-3EBC:05B4:80:WS:0:0:0:0:A:2C:Novell Netware
-3EBC:B405:40:00:1:1:1:1:S:LT:Slackware Linux v7.1 - Linux Kernel 2.2.16
-3ED0:0218:40:WS:0:0:1:0:A:LT:Linux Slackware 8.0
-3F20:0650:40:00:1:1:1:1:S:3C:Linux 2.2.19
-3F25:0109:40:00:0:1:1:1:A:3C:Linux 2.2.17 - 2.2.19
-3F25:_MSS:80:00:0:1:0:0:A:LT:AIX 4.3.2.0-4.3.3.0 on an IBM RS/*
-3F25:_MSS:80:00:0:1:0:1:A:LT:AIX 4.3.2.0-4.3.3.0 on an IBM RS/*
-3F25:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-3F25:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-3F25:_MSS:80:WS:0:0:0:0:A:LT:AIX 3.2
-3F25:_MSS:80:WS:0:0:1:0:A:LT:Linux 2.2.19
-3FE0:05B4:40:WS:0:0:0:0:A:2C:Caldera OpenLinux(TM) 1.3 / RedHat 7.2 / FreeSCO 0.2.7
-3FE0:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
-3FF0:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.34-38
-3FF0:_MSS:80:WS:0:0:0:0:A:LT:AtheOS ( www.atheos.cx )
-3FFF:_MSS:80:WS:0:0:0:0:A:LT:IBM MVS (unknown version)
-4000:0000:40:WS:0:0:0:0:S:LT:ULTRIX V4.5 (Rev. 47)
-4000:01F4:80:WS:1:1:0:0:A:30:Windows 
-4000:0200:40:00:0:0:0:0:S:2C:AIX 3.2, 4.2 - 4.3
-4000:0200:40:00:0:1:0:0:S:3C:OpenBSD 2.6-2.8
-4000:0200:40:00:0:1:0:1:A:3C:IPSO 3.3 / Net BSD 1.5.2
-4000:0200:40:00:0:1:0:1:S:LT:OpenBSD
-4000:0200:40:00:1:1:0:1:S:LT:FreeBSD
-4000:0200:40:WS:0:0:0:0:A:2C:AIX 4.3
-4000:0200:40:WS:0:0:0:0:S:LT:BorderWare 5.2
-4000:0200:FF:WS:0:0:0:0:A:2C:Windows 2000
-4000:0218:80:00:1:1:1:1:S:LT:Windows XP Home
-4000:023C:40:00:1:1:1:0:S:40:OpenBSD 3.0
-4000:023C:80:WS:1:1:1:0:S:30:Windows NT SP4+
-4000:0400:40:00:0:1:0:1:A:3C:IPSO 3.7
-4000:0400:40:WS:0:0:0:0:A:2C:Xerox 440 Document center
-4000:04EC:80:WS:1:1:1:0:S:30:Windows 2000
-4000:04F8:80:WS:1:1:1:0:S:30:Windows NT SP3
-4000:0528:80:WS:1:1:1:0:S:30:Windows XP pro
-4000:052A:80:WS:1:1:0:0:S:30:Windows 2000 Server 
-4000:0530:80:WS:1:1:1:0:S:30:Windows 2000
-4000:0534:80:WS:1:1:1:0:S:30:Windows 2000
-4000:0542:80:WS:1:1:1:0:S:30:Windows ME
-4000:0550:40:WS:0:0:0:0:A:2C:Windows 2000
-4000:0550:40:WS:0:0:1:0:A:2C:NetBSD
-4000:0550:80:WS:0:0:0:0:A:2C:Mac OS 
-4000:0550:80:WS:0:0:1:0:A:2C:Windows 2000
-4000:0550:80:WS:1:1:1:0:S:30:Windows 2000
-4000:0556:80:WS:1:1:1:0:S:30:Windows XP
-4000:0562:80:WS:1:1:1:0:S:30:Windows 2000 
-4000:0564:80:WS:1:1:0:0:S:30:Windows 2000
-4000:0564:80:WS:1:1:1:0:S:LT:Windows 2000
-4000:0578:40:00:0:1:0:1:A:3C:NetBSD 1.6
-4000:0578:40:00:1:1:1:1:S:40:OpenBSD 3.0
-4000:0578:80:WS:1:1:1:0:S:30:Windows 2000
-4000:0578:FF:00:1:1:0:1:A:40:Windows 2000 / 2003
-4000:057A:80:WS:1:1:1:0:S:30:Windows 2000
-4000:057E:80:WS:1:1:1:0:S:30:Windows XP (Home) 
-4000:0582:80:WS:1:1:1:0:S:30:Microsoft Windows 2000 Professional SP4 
-4000:0584:20:WS:1:1:0:0:S:30:Windows ME
-4000:0584:80:00:1:1:0:1:A:40:Windows 
-4000:0584:80:WS:1:1:1:0:S:30:Windows 2000 
-4000:0586:80:WS:1:1:1:0:S:30:Windows 2000
-4000:0588:80:WS:1:1:1:0:S:30:Windows ME
-4000:058A:80:WS:1:1:1:0:S:30:Windows 2000
-4000:058C:80:WS:1:1:1:0:S:30:Free BSD 
-4000:0596:80:WS:1:1:1:0:S:30:Linux Red Hat
-4000:0598:40:WS:0:0:0:0:A:2C:Linux Debian 3.0 
-4000:0598:40:WS:1:1:0:0:A:30:Windows 
-4000:0598:80:00:1:1:1:1:S:40:Windows XP
-4000:0598:80:WS:1:1:1:0:S:30:Windows 2000 
-4000:05A0:80:WS:1:1:1:0:S:30:Windows XP Pro
-4000:05A4:80:WS:1:1:1:0:S:30:Windows
-4000:05AC:40:00:1:1:1:1:S:40:OpenBSD 3.1
-4000:05AC:80:WS:1:1:0:0:A:30:Windows 2000
-4000:05AC:80:WS:1:1:1:0:S:30:Windows 2000 / XP
-4000:05B0:80:WS:1:1:1:0:S:30:Window 2000 pro. SP2
-4000:05B4:01:WS:1:1:1:0:S:30:Windows 2003 
-4000:05B4:20:WS:1:1:1:0:S:30:Windows
-4000:05B4:40:00:0:0:1:0:S:2C:FreeBSD 4.0-STABLE, 3.2-RELEASE
-4000:05B4:40:00:0:1:0:0:S:3C:NetBSD 1.3/i386
-4000:05B4:40:00:0:1:0:1:A:3C:NetBSD 1.5.2 (GENERIC)
-4000:05B4:40:00:0:1:0:1:S:3C:NetBSD 1.5 (x86)
-4000:05B4:40:00:0:1:1:0:S:2C:FreeBSD 2.2.8-RELEASE
-4000:05B4:40:00:0:1:1:0:S:3C:Linux 2.4.2 - 2.4.14
-4000:05B4:40:00:0:1:1:0:S:44:FreeBSD 4.3 - 4.4PRERELEASE
-4000:05B4:40:00:0:1:1:0:S:LT:FreeBSD 2.2.8-RELEASE
-4000:05B4:40:00:0:1:1:1:A:3C:NetBSD 1.6U
-4000:05B4:40:00:0:1:1:1:S:3C:FreeBSD 4.4
-4000:05B4:40:00:1:1:0:1:S:40:OpenBSD 3.2 
-4000:05B4:40:00:1:1:1:1:A:40:OpenBSD 3.5 
-4000:05B4:40:00:1:1:1:1:S:40:OpenBSD 3.0
-4000:05B4:40:00:1:1:1:1:S:48:Amiga OS / Miami Deluxe 1.0c
-4000:05B4:40:5E:0:1:1:0:S:2C:FreeBSD 4.0-STABLE, 3.2-RELEASE
-4000:05B4:40:62:0:0:1:0:S:2C:FreeBSD 4.0-STABLE, 3.2-RELEASE
-4000:05B4:40:70:0:0:1:0:S:2C:FreeBSD 4.0-STABLE, 3.2-RELEASE
-4000:05B4:40:WS:0:0:0:0:A:2C:NetBSD 1.3 - 1.33 / AIX 4.3.X
-4000:05B4:40:WS:0:0:0:0:S:2C:AIX 4.3 - 4.3.3
-4000:05B4:40:WS:0:0:1:0:A:2C:NetBSD
-4000:05B4:40:WS:0:0:1:0:S:2C:FreeBSD 4.2 - 4.3
-4000:05B4:40:WS:1:1:0:0:A:30:Windows
-4000:05B4:40:WS:1:1:1:0:S:30:Windows 2000 sp3
-4000:05B4:80:00:0:1:1:1:A:LT:Linux Kernel 2.4.xx (X86)
-4000:05B4:80:00:1:1:0:1:A:40:Windows Server 2003
-4000:05B4:80:00:1:1:1:0:S:30:Windows 2000
-4000:05B4:80:00:1:1:1:1:A:40:Windows 2000
-4000:05B4:80:00:1:1:1:1:S:40:Windows 2000 Pro
-4000:05B4:80:4B:1:1:1:0:S:30:Windows ME
-4000:05B4:80:WS:0:0:0:0:A:2C:Windows 2000 
-4000:05B4:80:WS:0:0:0:0:S:2C:Windows Longhorn
-4000:05B4:80:WS:0:0:1:0:A:2C:Windows 2000
-4000:05B4:80:WS:0:1:1:0:S:30:Windows XP 
-4000:05B4:80:WS:1:1:0:0:A:30:Windows Server 2003
-4000:05B4:80:WS:1:1:0:0:S:30:Windows 2000
-4000:05B4:80:WS:1:1:0:0:S:LT:BeOS
-4000:05B4:80:WS:1:1:1:0:A:30:Windows XP
-4000:05B4:80:WS:1:1:1:0:S:30:Windows ME / 2000 / XP
-4000:05B4:80:WS:1:1:1:0:S:3C:Linux RedHat 7.2 (kernel 2.4.9)
-4000:05B4:80:WS:1:1:1:0:S:LT:Windows XP / 2000 / ME
-4000:05B4:FF:00:0:1:1:0:S:LT:FreeBSD 2.2.6-RELEASE
-4000:05B4:FF:WS:0:0:0:0:A:LT:Cisco Systems IOS 11.3
-4000:05B4:FF:WS:1:1:1:0:S:30:Windows 2000
-4000:0650:40:00:0:1:1:1:A:3C:NetBSD 1.6
-4000:0FB0:80:WS:1:1:1:0:S:LT:Windows 2000 Professional 
-4000:3605:80:WS:1:1:1:0:S:30:Windows XP
-4000:5005:40:WS:0:0:0:0:A:2C:Mac OS X
-4000:5005:80:WS:0:0:0:0:A:2C:Windows 2000
-4000:62BB:80:WS:1:1:1:0:S:LT:Windows 2000
-4000:B405:40:00:0:1:0:1:A:3C:NetBSD 1.5 
-4000:B405:40:00:0:1:1:1:S:LT:FreeBSD
-4000:B405:80:00:0:1:0:1:A:3C:Windows Server 2003
-4000:B405:80:WS:1:1:1:0:S:30:Windows XP / 2000 / ME
-4000:B405:80:WS:1:1:1:0:S:LT:Windows XP - 2000
-4000:D84A:80:WS:1:1:1:0:S:30:Windows 2000
-4000:_MSS:80:00:0:0:0:0:A:LT:IBM MVS (unknown version)
-4000:_MSS:80:00:0:0:1:0:A:LT:OpenVMS 7.1 using Process Software's TCPWare 5.3
-4000:_MSS:80:00:0:1:0:0:A:LT:Check Point FireWall-1 4.0 SP-5 (IPSO build)
-4000:_MSS:80:00:0:1:0:1:A:LT:Check Point FireWall-1 4.0 SP-5 (IPSO build)
-4000:_MSS:80:WS:0:0:0:0:A:LT:Auspex Fileserver (AuspexOS 1.9.1/SunOS 4.1.4)
-4000:_MSS:80:WS:0:0:0:0:S:28:Windows XP 
-4000:_MSS:80:WS:0:0:1:0:A:LT:AmigaOS Miami 3.0
-4020:0564:40:00:0:1:0:1:A:3C:OpenBSD
-402E:0218:80:00:0:1:1:1:A:3C:Windows Millenium
-402E:05B4:80:00:0:1:0:1:A:3C:Linux
-402E:05B4:80:00:0:1:1:1:A:3C:Windows 2000 Professional / Windows XP
-402E:5005:80:00:0:1:1:1:A:3C:Windows XP / 2000 / ME
-402E:B405:40:WS:0:0:1:0:A:LT:Free BSD 4.1.1 - 4.3 X86
-402E:_MSS:80:00:0:1:0:0:A:LT:FreeBSD 2.1.0 - 2.1.5
-402E:_MSS:80:00:0:1:0:1:A:LT:FreeBSD 2.1.0 - 2.1.5
-402E:_MSS:80:00:0:1:1:0:A:LT:D-Link DI-701, Version 2.22
-402E:_MSS:80:00:0:1:1:1:A:LT:D-Link DI-701, Version 2.22
-402E:_MSS:80:WS:0:0:0:0:A:LT:OpenBSD 2.1/X86
-402E:_MSS:80:WS:0:0:1:0:A:LT:AmigaOS Miami 2.1-3.0
-402E:_MSS:80:WS:0:1:1:0:A:LT:Windows XP Professional Release
-403D:_MSS:80:00:0:1:0:0:A:LT:FreeBSD 2.1.0 - 2.1.5
-403D:_MSS:80:00:0:1:0:1:A:LT:FreeBSD 2.1.0 - 2.1.5
-403D:_MSS:80:00:0:1:1:0:A:LT:Acorn RiscOS 3.7 using AcornNet TCP/IP stack
-403D:_MSS:80:00:0:1:1:1:A:LT:Acorn RiscOS 3.7 using AcornNet TCP/IP stack
-4074:01F4:40:00:0:1:0:1:A:3C:OpenBSD 3.2
-4074:_MSS:40:WS:0:0:0:0:A:LT:OpenBSD 2.x
-4088:05B4:40:WS:0:0:1:0:A:LT:FreeBSD
-40B0:0564:80:WS:1:1:1:0:A:30:Windows 2000 (firewalled)
-40B0:05B4:40:WS:0:0:1:0:A:2C:FreeBSD 4.3
-40E8:0218:80:WS:1:1:1:0:A:LT:Windows ME
-40E8:04EC:80:WS:0:0:1:0:A:2C:Windows 2000 Pro
-40E8:0584:80:WS:0:0:1:0:A:2C:Windows 2000
-40E8:05B4:40:00:1:1:0:1:A:40:Windows 
-40E8:05B4:80:WS:0:0:1:0:A:2C:Windows 2000 Server
-40E8:05B4:80:WS:1:1:1:0:A:30:Windows XP 
-40E8:05B4:FF:00:0:0:1:0:S:30:Mac OS 7.x-9.x
-40E8:B405:80:WS:0:0:1:0:A:2C:Windows 2000
-40E8:B405:FF:00:0:0:1:0:S:LT:Mac OS 8.6
-4150:_MSS:40:WS:0:0:1:0:A:LT:Cisco Localdirector 430, running OS 2.1
-41A0:0578:80:00:1:1:1:1:A:40:Windows XP SP1
-41A0:0584:40:00:1:1:1:1:A:40:Windos XP
-41B8:05B4:80:WS:1:1:1:0:A:30:Windows 2000 server
-41E8:057E:80:00:1:1:1:1:A:40:Windows 2000
-4230:0584:80:00:1:1:0:1:A:40:Linux
-4230:0584:80:00:1:1:1:1:A:40:Windows 2000 Server
-4230:0584:80:WS:1:1:0:0:A:30:Windows 2000 Server
-4230:0584:80:WS:1:1:1:0:A:30:Windows 2000 Server
-4230:05B4:80:WS:1:1:1:0:A:30:Windows XP
-4238:0518:40:WS:0:0:0:0:S:2C:Xbox
-4240:05B4:40:04:1:1:1:0:S:34:Windows XP
-4240:05B4:80:04:1:1:1:0:S:34:Windows 2000 Pro
-4240:B405:80:04:1:1:1:0:S:34:Windows XP
-4240:_MSS:80:00:0:0:1:0:A:LT:MacOS 8.1
-4248:0586:80:00:1:1:1:1:A:40:GNU / Olli OS
-4248:0586:80:WS:1:1:1:0:A:30:Windows 2000 server
-4290:058C:40:WS:0:0:1:0:A:2C:Windows 2000
-4290:05B4:80:WS:1:1:1:0:A:30:Windows 2000 Pro SP3
-4322:052A:40:WS:0:0:1:0:A:2C:Windows 
-4322:05B4:80:WS:1:1:1:0:A:30:Linksys Router 
-4350:9C05:80:WS:1:1:1:0:A:30:Windows Server 2003
-4380:05A0:80:WS:1:1:1:0:A:30:Openbsd
-4380:05B4:80:WS:1:1:1:0:A:30:Windows 2003 Server
-4380:A005:80:WS:1:1:1:0:A:30:Open BSD
-43B0:05A4:80:WS:1:1:1:0:A:30:OpenBSD 2.8 GENERIC 
-43E0:05B4:40:00:0:1:0:1:A:LT:OpenBSD 2.8 GENERIC
-43E0:05B4:40:00:0:1:1:0:A:LT:FreeBSD 4.x
-43E0:05B4:40:00:0:1:1:1:A:3C:FreeBSD 4.4-Release
-43E0:05B4:40:00:1:1:0:1:A:40:OpenBSD 3.4
-43E0:05B4:40:00:1:1:1:1:A:40:OpenBSD 2.9 3.0
-43E0:A805:40:00:0:1:0:1:A:LT:OpenBSD 2.6
-43E0:B405:40:00:0:1:0:1:A:LT:OpenBSD 2.9
-43E0:B405:40:00:0:1:1:1:A:3C:FreeBSD 4.4 / OpenBSD 3.1
-43E0:_MSS:40:WS:0:0:0:0:A:LT:OpenBSD 2.x
-43E0:_MSS:40:WS:0:0:1:0:A:LT:FreeBSD 2.2.1 - 4.0
-43F8:AA05:40:WS:0:0:1:0:A:2C:Free BSD
-4410:05AC:40:WS:1:1:1:0:A:30:OpenBSD 3.0 
-4410:05AC:80:00:1:1:1:1:A:LT:Windows 2000 
-4410:05AC:80:WS:1:1:1:0:A:30:Windows 2000 Workstation / Windows 98 SE
-4410:05B4:80:00:1:1:1:0:A:34:Windows 2000
-4410:05B4:80:00:1:1:1:1:A:40:Windows 2000
-4410:05B4:80:WS:1:1:1:0:A:30:Windows 2000
-4431:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-4431:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-4440:05B0:80:00:1:1:1:1:A:40:Windows 2000 (Advanced Server)
-4440:05B0:80:WS:1:1:1:0:A:30:Solaris 7
-4440:05B4:80:WS:1:1:1:0:A:30:Windows 2000 Terminal Server
-4440:05B4:80:WS:1:1:1:0:A:LT:Solaris 7
-4452:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.5, 2.5.1
-4470:05B4:40:00:0:1:0:1:A:3C:Windows 2000
-4470:05B4:40:00:0:1:1:1:A:3C:WINDOWS 2000
-4470:05B4:40:00:1:1:0:0:A:LT:Windows 2000
-4470:05B4:40:00:1:1:0:1:A:40:Windows NT
-4470:05B4:40:00:1:1:1:0:A:34:OpenBSD 3.0
-4470:05B4:40:00:1:1:1:1:A:3C:Linux
-4470:05B4:40:00:1:1:1:1:A:40:Windows NT
-4470:05B4:40:WS:0:0:0:0:A:LT:FreeBSD NFR Network Flight Recorder
-4470:05B4:40:WS:0:0:1:0:A:2C:FreeBSD 4.2 / FreeBSD 3.4-STABLE
-4470:05B4:40:WS:1:1:0:0:A:30:OpenBSD 2.8
-4470:05B4:40:WS:1:1:1:0:A:30:OpenBSD 3.0 - 3.1
-4470:05B4:80:00:0:1:1:0:A:LT:Windows 2000
-4470:05B4:80:00:0:1:1:1:A:3C:Windows NT4 / Win95 / Win98
-4470:05B4:80:00:1:1:0:1:A:40:Linux 2.2.14 - 2.2.20
-4470:05B4:80:00:1:1:0:1:A:LT:Windows 2000 Professional
-4470:05B4:80:00:1:1:1:0:A:34:Windows 2000 Server
-4470:05B4:80:00:1:1:1:1:A:40:Windows 2000 Pro / XP Pro / 2003 Server
-4470:05B4:80:WS:0:0:1:0:A:2C:Windows 2000
-4470:05B4:80:WS:1:1:0:0:A:30:Windows 2000 pro
-4470:05B4:80:WS:1:1:1:0:A:30:Windows 2000 Server / XP Pro / NT 4.0 server
-4470:05B4:80:WS:1:1:1:0:A:3C:FreeBSD 4.x
-4470:05B4:80:WS:1:1:1:0:S:30:Windows Server 2003 Enterprise Edition
-4470:05B4:80:WS:1:1:1:1:S:3C:Windows 2000 Advance Server
-4470:05B4:FF:WS:0:0:1:0:A:2C:Windows 2000
-4470:05B4:FF:WS:1:1:1:0:A:30:Windows XP
-4470:B405:40:00:0:1:1:1:A:3C:Windows NT 2000/5.0
-4470:B405:80:00:0:1:0:1:A:3C:Windows ME
-4470:B405:80:00:0:1:1:1:A:3C:Windows 2000 Workstation / XP Home
-4470:B405:80:00:0:1:1:1:A:LT:Windows Server 2003 
-4470:B405:80:00:1:1:1:0:A:34:Windows XP SP1
-4470:B405:80:WS:1:1:0:0:A:30:Mac OS 8.6
-4470:B405:80:WS:1:1:1:0:A:30:Windows XP
-4470:B405:FF:00:0:0:1:0:A:LT:Mac OS 8.6
-4470:_MSS:40:WS:0:0:0:0:A:LT:FreeBSD 2.2.1 - 4.0
-4470:_MSS:40:WS:0:0:1:0:A:LT:FreeBSD 2.2.1 - 4.0
-4470:_MSS:80:WS:0:0:0:0:A:LT:Snap Network Box
-44E8:04EC:80:00:1:1:1:1:A:40:Windows 2000 pro
-44E8:04EC:80:WS:1:1:1:0:A:30:Windows 2000 Pro
-4510:0550:80:00:1:1:1:1:A:40:Windows 2000
-4510:0550:80:WS:0:0:1:0:A:LT:Windows 2000 Professional 5.0.2195 Service Pack 2
-4510:0550:80:WS:1:1:1:0:A:30:Windows 2000 Professional 5.0.2195 Service Pack 2
-4510:05B4:FF:WS:1:1:1:0:A:30:Windows XP Pro 
-455B:_MSS:80:00:0:0:0:0:A:LT:MacOS 8.1 running on a PowerPC G3 (iMac)
-455B:_MSS:80:00:0:0:1:0:A:LT:Mac OS 8.6
-462B:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 7 X86
-462B:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 7 X86
-4764:23B2:40:00:1:1:1:1:S:3C:Linux 2.4.xx
-4860:0218:80:WS:1:1:1:0:S:30:Windows XP
-4860:058E:10:WS:1:1:1:0:S:30:Linux 
-4860:05B4:80:WS:1:1:1:0:S:30:Windows 2000
-4EC0:05B4:80:00:0:1:1:1:A:3C:Windows XP Pro SP1
-4F68:05AC:80:WS:1:1:1:0:S:30:Windows 2000 Professional 
-4FD8:05B4:40:00:1:1:1:0:S:34:Windows XP Professional
-5B40:_MSS:80:WS:0:0:0:0:A:LT:Polycom ViewStation 512K videoconferencing system
-6000:_MSS:80:00:0:0:0:0:A:LT:SCO OpenServer(TM) Release 5
-6000:_MSS:80:00:0:0:1:0:A:LT:OpenVMS v7.1 VAX
-6000:_MSS:80:00:0:1:1:0:A:LT:Sequent DYNIX/ptx(R) V4.4.6
-6028:05B4:40:00:0:1:1:1:A:3C:Solaris 8
-6028:05B4:40:00:1:1:1:1:A:40:Solaris 7 / 8
-6028:B405:40:00:0:1:1:1:A:3C:Solaris 8
-6030:0564:40:00:1:1:1:1:A:40:Solaris 8 
-6030:6405:40:00:0:1:1:1:A:3C:Solaris 8
-6050:05B4:40:00:1:1:1:0:A:34:Windows
-6050:05B4:40:WS:0:0:1:0:A:2C:Solaris 9
-6050:05B4:FF:WS:0:0:0:0:A:2C:Solaris 8
-606C:00D8:40:00:1:1:1:1:A:40:Solaris 9
-60DA:0584:40:00:0:1:1:1:A:3C:Solaris 8
-60DA:_MSS:80:00:0:1:1:0:A:LT:Sun Solaris 8 early acces beta through actual release
-60DA:_MSS:80:00:0:1:1:1:A:LT:Sun Solaris 8 early acces beta through actual release
-60F4:05B4:40:00:0:0:1:0:S:LT:SCO UnixWare 7.0.1
-60F4:05B4:40:00:0:1:1:0:A:30:SunOS 5.8 
-60F4:05B4:40:00:0:1:1:0:S:LT:SCO UnixWare 7.1.0 x86
-60F4:05B4:40:00:0:1:1:1:A:3C:SCO UnixWare 7.1.1
-60F4:05B4:40:00:1:1:1:0:A:34:SunOS 5.8
-60F4:05B4:40:WS:0:0:0:0:A:2C:SCO openserver 5.0.5
-60F4:05B4:40:WS:0:0:0:0:S:2C:SCO openserver 5.0.6
-60F4:05B4:40:WS:0:0:1:0:A:2C:Windows 2000
-60F4:05B4:40:WS:0:0:1:0:S:2C:SCO Openserver 5
-60F4:05B4:40:WS:1:1:0:0:S:30:SunOS 5.8
-60F4:05B4:40:WS:1:1:1:0:A:30:SunOS 5.8
-60F4:05B4:40:WS:1:1:1:0:S:30:Solaris 8
-60F4:05B4:40:WS:1:1:1:0:S:LT:Solaris 8
-60F4:B405:40:WS:1:1:1:0:S:LT:Sun
-60F4:_MSS:40:WS:0:0:1:0:A:LT:SCO OpenServer 5.0.5
-60F4:_MSS:80:00:0:1:0:0:A:LT:NCR MP-RAS SVR4 UNIX System Version 3
-60F4:_MSS:80:00:0:1:0:1:A:LT:NCR MP-RAS SVR4 UNIX System Version 3
-60F4:_MSS:80:00:0:1:1:0:A:LT:NCR MP-RAS 3.01
-60F4:_MSS:80:00:0:1:1:1:A:LT:NCR MP-RAS 3.01
-60F4:_MSS:80:WS:0:0:0:0:A:LT:SCO UnixWare 7.0.0 or OpenServer 5.0.4-5
-6108:0564:40:WS:1:1:0:0:A:30:Windows 95 / 98 
-61A8:0200:40:00:1:1:1:1:A:LT:Windows NT
-61A8:_MSS:80:00:0:1:1:0:A:LT:Windows NT4 / Win95 / Win98
-61A8:_MSS:80:00:0:1:1:1:A:LT:Windows NT4 / Win95 / Win98
-6270:04EC:80:00:1:1:1:0:S:34:Windows 2000
-6270:04EC:80:WS:1:1:1:0:A:30:Linux Red Hat 
-6270:04EC:80:WS:1:1:1:0:S:30:Windows XP
-6270:0564:40:WS:1:1:1:0:A:30:Windows
-6270:0584:40:00:1:1:1:1:A:40:SunOS 5.8
-6270:05AC:80:00:1:1:1:1:A:40:Solaris
-6270:05B4:40:00:1:1:1:0:S:34:Windows 2000
-6270:05B4:80:WS:1:1:1:0:S:30:Windows XP
-6348:0584:40:WS:1:1:1:0:A:30:Solaris/Ultra sparc 
-6420:_MSS:40:WS:0:1:1:0:A:3C:SunOS 5.8 
-64F0:055C:40:WS:1:1:1:1:A:3C:SunOS
-6540:05B4:40:00:1:1:1:1:A:40:Windows XP 
-6978:05B4:80:WS:1:1:1:0:S:30:Windows XP
-6C68:05B4:40:02:1:1:1:0:S:34:Windows XP
-6FCC:_MSS:80:WS:0:0:0:0:A:LT:IBM OS/2 V 2.1
-7000:05B4:40:WS:0:0:0:0:A:2C:IBM OS/2
-7000:05B4:40:WS:0:0:0:0:S:2C:IBM OS/2 V.3
-7000:_MSS:80:WS:0:0:0:0:A:LT:IBM OS/2 V.3
-70D5:_MSS:80:00:0:1:1:0:A:LT:Digital UNIX OSF1 V 4.0-4.0F
-7210:04EC:40:00:1:1:1:1:S:40:Windows 98
-7210:05B4:80:WS:0:0:1:0:A:2C:Windows NT server 4.0 sp6a
-77C4:05B4:40:00:0:1:1:0:A:30:Linux 2.2.19
-77C4:05B4:40:00:1:1:0:1:A:3C:Linux 2.2.22 (PLD)
-77C4:05B4:40:00:1:1:1:1:A:3C:Linux SuSE 7.3
-77C4:05B4:40:00:1:1:1:1:A:LT:Linux SuSE 7.x
-77C4:05B4:40:WS:0:0:1:0:A:2C:SuSE Linux 7.1
-77C4:05B4:40:WS:1:1:1:0:A:30:Linux Mandrake 7.1 / Debian 3.0
-77C4:B405:40:00:0:1:1:1:A:3C:Linux
-77C4:_MSS:40:WS:0:0:1:0:A:LT:Linux 2.1.122 - 2.2.14
-7850:0578:40:WS:1:1:1:0:A:30:Suse Linux 7.0
-7900:_MSS:80:00:0:1:1:0:A:LT:Atari Mega STE running JIS-68k 3.0
-7900:_MSS:80:00:0:1:1:1:A:LT:Atari Mega STE running JIS-68k 3.0
-7958:0584:40:00:1:1:1:0:A:34:Linux Mandrake 7.2
-7958:0584:40:00:1:1:1:1:A:3C:Windows NT 4
-7958:0584:40:WS:1:1:1:0:A:30:Linux 2.2.16-3 (RH 6.2)
-7960:0F2C:40:00:1:1:1:0:S:LT:Linux 2.2.12-20
-7B10:0598:40:00:1:1:1:1:A:3C:Linux 2.2.18pre21
-7B2F:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-7B2F:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-7B44:055C:40:WS:1:1:1:0:A:30:Debian/GNU Linux
-7B88:0218:40:WS:0:0:1:0:A:2C:Reliant Unix from Siemens-Nixdorf
-7BC0:_MSS:40:WS:0:0:1:0:A:LT:Linux 2.1.122 - 2.2.14
-7BF0:052A:40:WS:1:1:1:0:A:30:PLD Linux
-7BF0:2A05:40:WS:1:1:1:0:A:30:Linux 2.2.19
-7BF0:_MSS:40:WS:0:0:1:0:A:LT:Linux 2.1.122 - 2.2.14
-7BFC:0564:40:00:1:1:1:1:A:3C:Slackware Linux 8.0
-7BFC:0564:40:00:1:1:1:1:A:LT:CISCO PIX 6.1
-7BFC:0564:40:WS:0:0:1:0:A:2C:Linux
-7BFC:0564:40:WS:1:0:1:1:A:38:Linux
-7BFC:0564:40:WS:1:1:1:0:A:LT:Cisco PIX
-7BFC:6405:40:00:0:1:1:1:A:3C:Linux
-7C00:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.27 - 2.0.30
-7C00:_MSS:80:WS:0:0:0:0:A:LT:Convex OS Release 10.1
-7C38:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-7C38:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-7C70:05B4:40:00:1:1:1:0:S:LT:Linux 2.3.99-ac - 2.4.0-test1
-7C70:_MSS:80:00:0:1:1:0:A:LT:Linux 2.3.28-33
-7C70:_MSS:80:00:0:1:1:1:A:LT:Linux 2.3.28-33
-7C9C:05AA:40:WS:0:0:1:0:A:2C:SuSE Linux 7.0
-7C9C:AA05:40:00:0:1:1:1:A:LT:Linux RedHat 7.1
-7CC8:0584:40:00:1:1:1:0:S:3C:Linux 2.2
-7D00:05A0:80:00:1:1:1:0:S:34:Windows
-7D00:05A0:80:WS:1:1:1:0:S:30:OpenBSD
-7D00:05B4:80:WS:1:1:1:0:S:30:Windows XP Pro
-7D78:0109:80:10:0:1:0:1:S:LT:OpenBSD 2.9 generic
-7D78:0564:40:00:1:1:1:1:S:3C:Linux
-7D78:0564:40:WS:1:1:1:1:S:3C:Slware Linux 7.1
-7D78:05AC:40:00:1:1:1:0:A:34:OpenBSD 2.9
-7D78:05B4:01:00:1:1:1:1:S:3C:Linux 
-7D78:05B4:20:00:1:1:1:0:S:LT:Linux 2.2.13
-7D78:05B4:3A:WS:0:0:0:0:S:LT:Linux 2.0.38
-7D78:05B4:40:00:0:1:1:0:A:30:RedHat 6.2
-7D78:05B4:40:00:0:1:1:0:S:LT:Linux 2.2.19
-7D78:05B4:40:00:0:1:1:1:A:3C:Linux 2.2.17 - 2.2.20
-7D78:05B4:40:00:1:1:0:0:S:LT:Linux 2.2.19
-7D78:05B4:40:00:1:1:0:1:A:3C:Linux pld 2.4.22
-7D78:05B4:40:00:1:1:1:0:A:34:Linux 2.2.19 (Mandrake Secure)
-7D78:05B4:40:00:1:1:1:0:A:LT:Linux 2.2.19 - 2.2.20
-7D78:05B4:40:00:1:1:1:0:S:34:Linux 2.2.19 (Mandrake Secure)
-7D78:05B4:40:00:1:1:1:0:S:3C:Linux 2.2.9 - 2.2.18
-7D78:05B4:40:00:1:1:1:0:S:LT:Linux 2.2.14 - 2.2.20
-7D78:05B4:40:00:1:1:1:1:A:3C:Linux 2.2.14 - 2.2.20
-7D78:05B4:40:00:1:1:1:1:S:3C:Linux 2.2.14 - 2.2.20
-7D78:05B4:40:09:1:1:1:0:S:3C:Linux 2.2.x
-7D78:05B4:40:BE:1:1:1:0:S:3C:Linux 2.2.16
-7D78:05B4:40:WS:0:0:0:0:S:2C:Linux 2.0.33
-7D78:05B4:40:WS:0:0:1:0:A:2C:Cobalt Linux RaQ 4 (2.2.19)
-7D78:05B4:40:WS:0:0:1:0:A:LT:Linux 2.2.19 - 2.2.20
-7D78:05B4:40:WS:1:0:1:1:A:38:Linux 2.2.16-22
-7D78:05B4:40:WS:1:1:0:0:A:30:Linux 2.2.(PLD) 
-7D78:05B4:40:WS:1:1:1:0:A:30:Linux 2.2.12 - 2.2.20
-7D78:05B4:80:WS:0:0:1:0:A:LT:Windows XP
-7D78:05B4:80:WS:1:1:1:0:A:30:Windows 2000 sp2
-7D78:05B4:80:WS:1:1:1:0:S:30:Windows XP Professional
-7D78:05B4:FF:00:1:1:1:1:A:3C:Linux 2.2.18
-7D78:B405:40:00:0:1:1:0:A:30:Yellow Dog Linux 2.2
-7D78:B405:40:00:0:1:1:1:A:3C:Cobalt
-7D78:B405:40:00:1:1:1:1:A:3C:Linux Redhat 6.2 Zoot (Kernel 2.2.14-5)
-7D78:B405:40:00:1:1:1:1:S:LT:Linux 2.2.14
-7D78:_MSS:80:WS:0:0:0:0:A:28:Linux 
-7D78:_MSS:80:WS:0:0:0:0:S:28:Linux 2.4.19 crypto gentoo
-7DC8:0578:40:WS:1:1:1:0:A:30:Suse Linux
-7E18:_MSS:80:00:0:1:1:0:A:LT:Linux Kernel 2.4.0-test5
-7EA0:3F5C:40:00:1:1:1:1:A:3C:Linux Kernel 2.4.10
-7EB8:3F5C:40:00:1:1:1:1:S:3C:Suse 7.3 (2.4.16)
-7EDC:0584:40:WS:1:1:1:0:A:LT:Linux 2.2.18
-7EF4:0514:40:00:1:1:1:1:A:3C:Linux 2.2.14
-7F53:0109:40:00:0:1:1:1:A:LT:Linux 2.2.14
-7F53:_MSS:80:00:0:0:0:0:A:LT:AIX 4.0 - 4.2
-7F53:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.19 - 2.2.17
-7F53:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.19 - 2.2.17
-7F53:_MSS:80:WS:0:0:0:0:A:LT:AIX 3.2
-7F53:_MSS:80:WS:0:0:1:0:A:LT:Linux Kernel 2.1.88
-7F7D:_MSS:80:00:0:1:1:0:A:LT:Linux 2.1.91 - 2.1.103
-7F7D:_MSS:80:00:0:1:1:1:A:LT:Linux 2.1.91 - 2.1.103
-7F80:0550:40:00:1:1:1:1:A:LT:Linux 2.2.19
-7FB6:0218:FF:00:0:0:0:0:S:LT:3Com HiPer ARC, System V4.2.32
-7FB8:0218:40:00:1:1:0:0:S:3C:SCO UnixWare 7.1.0 x86
-7FB8:0218:40:00:1:1:0:1:S:3C:Linux
-7FB8:0218:40:00:1:1:1:1:A:LT:Linux 2.2.19
-7FB8:0218:40:WS:0:0:1:0:A:2C:Linux 2.2.16
-7FE0:05B4:40:WS:0:0:0:0:A:2C:Linux 2.0.38
-7FE0:_MSS:40:WS:0:0:0:0:A:LT:Linux 2.0.34 - 2.0.38
-7FE0:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.32-34
-7FE0:_MSS:80:WS:0:0:0:0:A:LT:Cobalt Linux 4.0 (Fargo) Kernel 2.0.34C52_SK on MIPS
-7FF0:_MSS:80:00:0:0:0:0:A:LT:Linux 2.0.34-38
-7FFF:04EC:80:WS:1:1:1:0:S:30:Windows 2000 
-7FFF:0550:80:00:1:1:1:0:S:34:Windows 2000
-7FFF:0550:80:WS:1:1:1:0:A:30:Windows 2000
-7FFF:0550:80:WS:1:1:1:0:S:30:Suse
-7FFF:0564:80:WS:1:1:1:0:A:30:Windows 98 SE 
-7FFF:0578:80:WS:1:1:1:0:S:30:Linux Suse
-7FFF:057A:80:00:1:1:1:0:S:34:Linux 
-7FFF:0586:40:WS:1:1:1:0:S:30:Windows 2000
-7FFF:058E:40:00:1:1:1:0:S:34:OpenBSD 3.1
-7FFF:05A0:80:00:1:1:1:0:S:34:Windows XP
-7FFF:05A0:80:WS:1:1:1:0:A:30:Windows 98 SE
-7FFF:05A0:80:WS:1:1:1:0:S:30:Windows 2000 Server 
-7FFF:05AC:80:00:0:1:1:0:A:30:Windows 2000 / XP / ME
-7FFF:05AC:80:00:1:1:1:0:S:34:Windows 2000 
-7FFF:05B4:40:00:0:1:0:0:A:30:Sinix 5.4x
-7FFF:05B4:40:00:0:1:1:0:A:30:Windows XP
-7FFF:05B4:40:00:1:1:1:1:S:3C:SuSe Linux
-7FFF:05B4:40:03:1:1:1:1:S:3C:Linux
-7FFF:05B4:40:WS:0:0:0:0:S:2C:Windows 98 SE
-7FFF:05B4:80:00:0:1:1:1:A:3C:Windows XP
-7FFF:05B4:80:00:1:1:1:0:S:34:Windows XP / 2000
-7FFF:05B4:80:00:1:1:1:1:A:40:Windows 2000
-7FFF:05B4:80:00:1:1:1:1:S:40:Windows XP Service Pack 1 
-7FFF:05B4:80:WS:0:0:1:0:A:2C:Windows NT
-7FFF:05B4:80:WS:0:0:1:0:S:2C:Windows NT 4.0 SP6a
-7FFF:05B4:80:WS:1:1:1:0:A:30:Windows 98 SE
-7FFF:05B4:80:WS:1:1:1:0:S:30:Windows 2000 Server
-7FFF:7E05:80:00:0:1:1:0:A:30:BeOS
-7FFF:_MSS:80:00:0:0:1:0:A:LT:Linux 2.4.7 (X86)
-7FFF:_MSS:80:00:0:1:0:0:A:LT:ReliantUNIX-Y 5.44 B0033 RM600 1/256 R10000
-7FFF:_MSS:80:00:0:1:1:0:A:LT:Linux Kernel 2.4.xx (X86)
-7FFF:_MSS:80:00:0:1:1:1:A:LT:Linux Kernel 2.4.xx (X86)
-7FFF:_MSS:80:WS:0:0:0:0:A:LT:SINIX-Y 5.43B0045
-7FFF:_MSS:80:WS:0:0:1:0:A:LT:Linux 2.1.76
-8000:0200:40:00:0:1:0:0:A:LT:Mac OS X Server
-8000:0218:40:WS:0:0:1:0:A:2C:HP-UX
-8000:0564:40:00:0:1:0:1:A:3C:solaris 8
-8000:0564:40:00:1:1:1:1:A:40:Solaris 8 
-8000:0578:40:00:0:1:1:1:S:3C:Linux 
-8000:0584:40:00:0:1:1:1:A:3C:HP-UX
-8000:0584:40:WS:0:0:1:0:A:2C:HP-UX B.10.20
-8000:05A0:40:WS:1:1:1:0:A:30:Windows 2000
-8000:05AC:40:00:0:1:1:1:A:3C:FreeBSD 4.9 
-8000:05AC:40:00:0:1:1:1:S:LT:Mac OS X 10.1.5
-8000:05AC:40:WS:0:0:1:0:A:2C:OS400 V5R2
-8000:05AC:FF:WS:0:0:1:0:A:2C:Mac OS X
-8000:05B4:01:WS:0:0:1:0:A:2C:HP-UX 
-8000:05B4:20:WS:0:0:1:0:S:2C:Windows CE 3.0 (Ipaq 3670)
-8000:05B4:20:WS:0:1:1:0:S:2C:Windows CE 3.0 (Ipaq 3670)
-8000:05B4:40:00:0:0:1:0:S:2C:HP-UX B.10.01 A 9000/712
-8000:05B4:40:00:0:1:0:0:A:LT:NetBSD
-8000:05B4:40:00:0:1:0:0:S:LT:OpenVMS
-8000:05B4:40:00:0:1:0:1:A:3C:HP-UX B.11.00
-8000:05B4:40:00:0:1:0:1:S:3C:NetBSD
-8000:05B4:40:00:0:1:1:0:A:LT:HP-UX
-8000:05B4:40:00:0:1:1:0:S:30:Digital UNIX V4.0E, Mac OS X
-8000:05B4:40:00:0:1:1:1:A:3C:Windows 
-8000:05B4:40:00:0:1:1:1:S:3C:Mac OS X 10.1.[23]
-8000:05B4:40:00:1:1:1:1:S:40:OpenBSD 3.1 
-8000:05B4:40:WS:0:0:0:0:A:2C:FreeBSD
-8000:05B4:40:WS:0:0:0:0:S:2C:AIX 
-8000:05B4:40:WS:0:0:1:0:A:2C:Mac OS X Darwin 1.4 / HP-UX 10.20
-8000:05B4:40:WS:0:0:1:0:S:2C:Mac OS X
-8000:05B4:40:WS:1:1:1:0:A:30:Windows 2000
-8000:05B4:80:00:0:1:1:0:S:30:Dec V4.0 OSF1
-8000:05B4:80:00:1:1:1:0:A:34:Windows XP Pro
-8000:05B4:80:WS:0:0:1:0:S:LT:Novell NetWare 4.11
-8000:05B4:FF:00:0:1:0:0:S:30:MAC OS 8.6
-8000:05B4:FF:00:0:1:1:0:S:30:Mac OS 9
-8000:05B4:FF:00:0:1:1:1:A:3C:Mac OS
-8000:05B4:FF:WS:0:0:1:0:A:LT:OpenBSD
-8000:05B4:FF:WS:1:1:1:0:A:30:Wire Home Portal DSL Routerw/nat
-8000:1000:40:WS:0:0:1:0:A:2C:HP-UX
-8000:114C:40:WS:0:0:0:0:A:2C:IBM MVS
-8000:6405:FF:00:0:1:1:1:A:3C:Mac OS 9.2.2
-8000:6405:FF:WS:0:0:1:0:A:2C:Mac OS 9.2.2
-8000:9405:FF:00:0:1:1:1:A:3C:Mac Os 9.1
-8000:B405:40:00:0:1:1:1:S:3C:Mac OS X 10.x (Darwin 1.3.x 1.4.x 5.x)
-8000:B405:40:00:0:1:1:1:S:LT:Mac OS X 10.x.x -  Darwin 6.1
-8000:B405:40:00:0:1:1:1:S:LT:Mac Ox X 10.2.8 Jaguar
-8000:B405:40:WS:0:0:1:0:S:2C:MacOS X
-8000:B405:40:WS:0:0:1:0:S:LT:Mac Os X 
-8000:B405:80:00:1:1:1:1:S:40:Windows CE 3.0
-8000:B405:80:WS:1:1:1:0:S:LT:Pocket PC
-8000:B405:FF:00:0:1:0:0:S:LT:Mac OS 9.1
-8000:B405:FF:00:0:1:1:0:A:30:Mac OS 9.1
-8000:B405:FF:00:0:1:1:0:S:30:Mac OS 9.2
-8000:B405:FF:00:0:1:1:1:A:3C:Mac OS 9.1
-8000:_MSS:80:00:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-8000:_MSS:80:00:0:1:0:0:A:LT:Cray UNICOS 9.0.1ai - 10.0.0.2
-8000:_MSS:80:00:0:1:0:1:A:LT:Cray UNICOS 9.0.1ai - 10.0.0.2
-8000:_MSS:80:00:0:1:1:0:A:LT:Apple MacOS 9.04 (Powermac or G4)
-8000:_MSS:80:00:0:1:1:1:A:LT:Apple MacOS 9.04 (Powermac or G4)
-8000:_MSS:80:WS:0:0:0:0:A:LT:DECNIS 600 V4.1.3B System
-8000:_MSS:80:WS:0:0:1:0:A:LT:Cisco IOS 12.0(3.3)S  (perhaps a 7200)
-804C:A005:40:00:0:1:1:1:A:3C:Mac OS X
-8052:05B4:40:01:1:1:1:1:S:40:Solaris 5.8
-805C:_MSS:80:00:0:1:0:0:A:LT:BSDI BSD/OS 2.0 - 2.1
-805C:_MSS:80:00:0:1:0:1:A:LT:BSDI BSD/OS 2.0 - 2.1
-805C:_MSS:80:00:0:1:1:0:A:LT:Compaq Tru64 UNIX (formerly Digital UNIX) 4.0e
-807A:_MSS:80:00:0:1:0:0:A:LT:OpenBSD 2.6-2.8
-807A:_MSS:80:00:0:1:0:1:A:LT:OpenBSD 2.6-2.8
-807A:_MSS:80:00:0:1:1:0:A:LT:AmigaOS 3.1 running Miami Deluxe 0.9m
-807A:_MSS:80:00:0:1:1:1:A:LT:AmigaOS 3.1 running Miami Deluxe 0.9m
-8084:0584:40:01:1:1:1:1:A:40:SunOS 5.8 / Solaris 8 
-8160:0564:40:01:1:1:1:0:A:34:Solaris 8
-8160:05B4:40:01:0:1:1:1:A:3C:Solaris 8 - X86
-81D0:0218:40:00:0:1:0:0:A:LT:OSF1 4.0
-81D0:_MSS:40:WS:0:0:1:0:A:LT:Compaq Tru64 UNIX 5.0
-8218:05B4:40:00:0:1:1:1:A:3C:Mac OS X 10.1.5
-8218:05B4:40:00:1:1:1:1:A:40:Solaris 
-8218:05B4:40:01:1:1:1:0:A:LT:Solaris 8
-8218:05B4:40:01:1:1:1:1:A:40:Gauntlet Firewall
-8218:B405:40:00:0:1:0:1:A:3C:MAC OS X 10.3.4
-8218:B405:40:00:0:1:1:1:A:3C:Mac OS X 10.1.4
-8218:B405:40:00:0:1:1:1:A:LT:MacOS X Server Release
-8235:0488:FF:WS:0:0:0:0:S:2C:Mac OS X 
-8246:AA05:40:00:0:1:0:1:A:3C:X server
-8274:05B4:40:WS:0:0:0:0:A:2C:Digital Unix 4.0b 
-832C:05B4:40:00:0:1:1:0:A:30:Compaq Tru64 UNIX 5.0 / Digital UNIX V5.60
-832C:05B4:40:WS:0:0:0:0:A:2C:Digital Unix
-832C:05B4:40:WS:0:0:1:0:A:2C:Freebsd 4.3
-832C:05B4:40:WS:1:1:1:0:A:30:Windows 2000 pro
-832C:05B4:40:WS:1:1:1:0:S:30:Solaris 8
-832C:05B4:FF:00:1:1:0:0:A:34:Windows 2000 Server 
-832C:05B4:FF:WS:0:0:1:0:S:2C:Solaris 7
-832C:05B4:FF:WS:1:1:0:0:A:30:MAC OS X
-832C:10D8:40:00:0:1:0:0:A:30:Unix
-832C:B405:40:00:0:1:1:0:A:30:Digital UNIX V4.0F
-832C:B405:40:WS:0:0:1:0:A:2C:Mac OS X 10.1
-832C:B405:40:WS:0:0:1:0:A:LT:Darwin
-832C:B405:FF:00:0:1:1:0:A:LT:Mac OS X
-832C:_MSS:40:WS:0:0:1:0:A:LT:Linux 2.0.34 - 2.0.38
-8340:0578:40:WS:1:1:1:0:A:30:Solaris 8 
-8340:0584:40:00:0:1:1:1:A:3C:Mac OS X/10
-8340:05B4:40:00:0:1:1:1:A:3C:MacOS X
-8371:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-8371:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-8377:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.5, 2.5.1
-8400:8C05:40:00:0:1:1:1:A:3C:MacOS X 10.3
-8520:B405:40:WS:0:0:1:0:A:LT:MacOS X 10.2.1
-869F:_MSS:80:00:0:1:1:0:A:LT:Windows NT4 / Win95 / Win98
-869F:_MSS:80:00:0:1:1:1:A:LT:Windows NT4 / Win95 / Win98
-8700:05AC:FF:00:1:1:1:1:A:40:Solaris 2.6
-8765:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7 with tcp_strong_iss=0
-8765:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7 with tcp_strong_iss=0
-879B:_MSS:80:WS:0:0:1:0:A:LT:Solaris 2.5, 2.5.1
-87C0:05B4:FF:00:1:1:0:1:A:40:Windows 
-87C0:05B4:FF:00:1:1:1:1:A:40:Solaris 2.6 2.7
-87C0:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7
-88E0:05B4:80:WS:1:1:1:0:S:30:Windows 2000
-8EDA:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.5, 2.5.1
-8F4D:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-8F4D:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-91B4:05AC:40:00:1:1:1:0:A:34:Windows NT 5.1 (Windows XP)
-91B4:05B4:40:00:1:1:1:0:S:34:Windows XP
-94C0:05B4:80:WS:1:1:1:0:S:30:Windows 2000 
-95C2:B405:80:WS:1:1:1:0:S:30:Windows ME 
-9820:05B4:40:WS:1:1:1:0:S:30:Windows 2000
-9C40:05B4:80:WS:1:1:1:0:S:30:Windows Xp
-AA3C:05B4:80:WS:1:1:1:0:S:30:Windows 2000 Pro
-ABCD:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-ABCD:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-AC00:0550:80:WS:0:0:1:0:S:2C:Windows NT 4.0 SP6a
-AC00:05AC:80:WS:1:1:1:0:S:30:Windows 2000 SP2
-AC00:FA3B:80:WS:1:1:1:0:S:LT:Windows 2000 SP2
-AE4C:0594:80:WS:1:1:1:0:S:30:OpenBSD 3.5 
-AE4C:05B4:40:03:1:1:1:1:S:40:Windows XP
-AE4C:05B4:40:WS:0:0:0:0:S:2C:Windows 95
-AE4C:05B4:80:03:1:1:1:0:S:34:Windows 2000
-AE60:0586:80:WS:1:1:1:0:S:30:Windows ME
-AE60:05B4:80:03:1:1:1:1:S:40:Linux
-AE60:05B4:80:WS:1:1:1:0:S:30:Windows XP
-B270:05B4:80:WS:1:1:1:0:S:LT:Windows ME
-B400:05AC:20:03:1:1:1:1:S:40:windows 200
-B400:05B4:20:03:1:1:0:1:S:LT:Windows 2000 SP2
-B400:05B4:20:03:1:1:1:1:S:40:Windows 2000
-B400:05B4:40:03:1:1:1:1:S:40:Windows XP Pro SP1
-B400:05B4:80:03:1:1:1:1:S:40:Windows XP 
-B400:B405:20:03:1:1:1:0:S:34:Windows 2000 SP3
-B580:05AC:40:02:1:1:1:1:A:40:Windows XP
-B580:05AC:80:03:1:1:1:1:A:40:Windows XP
-B580:05B4:80:03:1:1:1:1:A:40:Windows XP
-B5A4:05B4:80:00:1:1:0:1:A:40:Linux 2.4.18
-B5A4:05B4:80:00:1:1:1:0:S:34:Windows 2000 Server
-B5A4:05B4:80:00:1:1:1:1:A:40:Windows XP Corp. SP1 (Ger)
-B5A4:05B4:80:WS:0:0:0:0:A:2C:Windows XP Corp. SP1 (Ger)
-B5A4:05B4:80:WS:1:1:1:0:S:30:Windows XP SP2 german 
-B5C9:_MSS:80:00:0:1:1:0:A:LT:Windows Millenium Edition v4.90.3000
-B5C9:_MSS:80:00:0:1:1:1:A:LT:Windows Millenium Edition v4.90.3000
-B680:05B4:FF:WS:0:0:0:0:A:2C:ZyXEL ZyNOS 3.50
-B9F0:0578:FF:WS:0:0:0:0:A:2C:Windows 2000
-BB80:05B4:80:WS:1:1:1:0:S:30:Windows 2000
-BB80:_MSS:80:WS:0:0:1:0:A:LT:Windows 98
-C000:057A:40:WS:1:1:1:0:A:30:Linux
-C000:05A0:80:00:1:1:1:1:S:40:Windows XP
-C000:05B4:40:00:0:0:0:0:S:2C:IRIX 6.5 / 6.4
-C000:05B4:40:00:1:1:1:1:A:40:IRIX64 6.5 IP27
-C000:05B4:40:WS:0:0:0:0:S:LT:Irix 6.5
-C000:05B4:40:WS:1:1:1:0:A:30:Linux
-C000:05B4:80:00:0:1:0:0:A:LT:IRIX 6.2 - 6.5
-C000:05B4:80:00:0:1:0:1:A:LT:IRIX 6.2 - 6.5
-C000:_MSS:80:WS:0:0:0:0:A:LT:OS-9/68K V2.4 (Quanterra Q4124 - 68030)
-C050:05B4:40:00:0:1:1:1:A:3C:Solaris 9 SPARC ULTRA 10
-C050:05B4:40:00:1:1:1:1:A:40:SunOS 5.9 (sun4u)
-C08A:_MSS:80:00:0:1:1:0:A:LT:FreeBSD 2.2.1 - 4.1
-C08A:_MSS:80:00:0:1:1:1:A:LT:FreeBSD 2.2.1 - 4.1
-C0B7:_MSS:80:00:0:1:1:0:A:LT:FreeBSD 2.2.1 - 4.1
-C0B7:_MSS:80:00:0:1:1:1:A:LT:FreeBSD 2.2.1 - 4.1
-C1E8:05B4:40:WS:0:0:1:0:A:2C:Solaris 9
-C1E8:05B4:40:WS:1:1:1:0:A:30:Windows NT
-C1E8:05B4:40:WS:1:1:1:0:S:30:Solaris 9
-C210:0564:40:WS:1:1:1:0:A:30:Linux 
-C377:05AC:80:02:1:1:1:1:S:40:Windows 2000 advanced server SP2
-C3C8:0598:40:WS:1:1:1:0:A:30:Unix
-C79C:05B4:80:WS:1:1:1:0:S:30:Windows XP Home
-CDFF:_MSS:80:00:0:0:1:0:A:LT:SONY NEWS-OS 6.1.2
-D600:05AC:80:02:1:1:1:1:S:40:Windows XP Professional
-D780:05B4:40:03:1:1:1:0:S:34:Winblows XP
-D780:B405:40:03:1:1:1:0:S:LT:Windows XP
-DA00:05B4:80:02:1:1:0:0:S:34:Windows 2000
-DA00:05B4:80:02:1:1:1:0:S:34:Windows XP
-E000:0564:40:00:0:1:0:1:A:3C:FreeBSD 4.8
-E000:0564:40:00:0:1:1:1:A:3C:BSD
-E000:0564:40:WS:0:0:1:0:A:2C:Free BSD 4.7
-E000:0578:40:00:0:1:1:1:A:3C:FreeBSD 4.9-stable 
-E000:0578:40:WS:0:0:1:0:A:2C:FreeBSD 
-E000:0584:40:00:0:1:1:1:A:3C:Linux/FreeBSD 
-E000:0586:40:WS:0:0:0:0:A:2C:FreeBSD4.6.2
-E000:05A0:40:00:0:1:1:1:A:3C:FreeBSD 4.7-RELEASE / 4.9
-E000:05AA:40:WS:0:0:1:0:A:2C:Windows2000
-E000:05AC:40:00:0:1:1:1:A:3C:free BSD
-E000:05AC:40:WS:0:0:1:0:A:2C:FreeBSD 4.7
-E000:05B4:40:00:0:1:0:1:A:3C:FreeBSD 4.6-RELEASE-p1
-E000:05B4:40:00:0:1:1:0:A:30:Free BSD 4.8-STABLE
-E000:05B4:40:00:0:1:1:1:A:3C:FreeBSD 4.7-PRERELEASE
-E000:05B4:40:00:0:1:1:1:S:3C:FreeBSD 4.6-RELEASE
-E000:05B4:40:00:0:1:1:1:S:LT:Free BSD 4.7-Stable
-E000:05B4:40:WS:0:0:0:0:A:2C:FreeBSD 4.6-RELEASE-p1
-E000:05B4:40:WS:0:0:1:0:A:2C:FreeBSD 4.7
-E000:05B4:40:WS:0:0:1:0:S:2C:FreeBSD
-E000:05B4:80:00:0:1:1:1:S:3C:FreeBSD 4.6-RC2
-E000:6405:40:00:0:1:0:1:A:3C:FreeBSD 4.6
-E000:B405:40:00:0:1:0:1:A:3C:FreeBSD 4.6
-E000:B405:40:00:0:1:1:1:A:3C:Free BSD 4.8 
-E000:B405:40:00:0:1:1:1:S:3C:Free BSD
-E000:B405:40:00:0:1:1:1:S:LT:Free BSD 
-E000:C003:40:00:0:1:1:1:A:3C:Linux Debian 
-E640:05AC:40:02:1:1:1:0:S:34:Windows 2000 Server - Windows XP SP1
-E640:05B4:40:02:1:1:0:0:S:LT:Windows 2000 SP2
-E640:05B4:40:02:1:1:1:0:S:34:Windows 2000 Professional
-E8C0:05A0:40:01:1:1:1:0:S:34:Windows 98
-E920:_MSS:80:00:0:1:1:1:A:LT:Windows ME
-EA60:05AC:40:WS:0:0:1:0:A:2C:Router Cisco 677 
-EA60:05DC:40:WS:0:0:1:0:A:2C:Windows XP
-EA60:05DC:40:WS:0:0:1:0:A:LT:Cisco 667i-DIR DSL router -- cbos 2.4.2
-EA60:_MSS:80:WS:0:0:1:0:A:LT:Cisco 675 DSL router -- cbos 2.1
-EB28:0578:40:WS:1:1:1:0:A:30:IRIX 6.5.x
-EBC0:05AC:40:02:0:1:0:0:S:30:Windows 2000
-EBC0:05AC:40:02:1:1:1:0:S:34:Windows XP
-EBC0:05B4:40:02:1:1:0:0:S:LT:Windows ME
-EBC0:05B4:40:02:1:1:1:0:S:34:Windows 2000 Pro SP2 / XP Pro
-EBC0:05B4:40:02:1:1:1:1:S:40:Windows XP
-EBC0:05B4:40:WS:1:1:1:0:S:30:Windown XP
-EBC0:05B4:80:02:1:1:1:0:S:34:Windows XP
-EBC0:05B4:80:02:1:1:1:1:S:40:Windows XP
-EBC0:05B4:80:WS:1:1:1:0:S:30:Windows ME
-ED90:05B4:40:00:0:1:1:1:A:3C:Irix 6.5.8
-ED90:05B4:40:00:1:1:1:1:A:40:IRIX 6.5
-ED90:_MSS:40:WS:0:0:1:0:A:LT:IRIX 6.2 - 6.5
-EE48:_MSS:40:WS:0:0:1:0:A:LT:IRIX 5.1 - 5.3
-EF2A:_MSS:80:00:0:1:0:0:A:LT:IRIX 5.2
-EF2A:_MSS:80:00:0:1:0:1:A:LT:IRIX 5.2
-EF88:_MSS:40:WS:0:0:1:0:A:LT:IRIX 6.2 - 6.5
-F000:0200:40:WS:0:0:0:0:S:LT:IRIX 5.3 / 4.0.5F
-F000:05B4:40:00:0:1:0:0:A:30:OSF1 5.1 732 alpha
-F000:05B4:40:00:0:1:0:0:S:30:OSF1 5.1
-F000:05B4:40:WS:0:0:0:0:A:2C:OSF1
-F000:05B4:40:WS:0:0:0:0:S:LT:IRIX 6.3
-F000:05B4:40:WS:1:1:0:0:S:LT:IRIX 6.5.10
-F000:05B4:80:00:0:1:0:0:A:LT:IRIX 5.3
-F000:05B4:80:00:0:1:0:1:A:LT:IRIX 5.3
-F000:B405:40:WS:1:1:0:0:S:30:SGI Irix 6.5.17m
-F400:05B4:80:01:1:1:1:0:S:34:Windows XP
-F424:05B4:80:04:1:1:1:0:A:34:Windows XP SP1 - english 
-F5E0:05B4:80:01:1:1:1:0:S:34:Windows 2000
-F990:05B4:40:WS:1:1:1:0:S:30:Windows 2000
-F99F:0000:80:WS:0:0:0:0:S:28:Linux 2.2.x or 2.4.x
-FAD8:0574:80:WS:1:1:1:0:S:30:Windows XP
-FAF0:0200:80:WS:1:1:1:0:S:30:Windows 2000 
-FAF0:04EC:80:WS:1:1:1:0:S:30:Windows XP Professional 
-FAF0:0514:80:WS:1:1:1:0:S:30:Windows XP
-FAF0:0518:80:WS:1:1:1:0:S:30:Windows 2000 server
-FAF0:0528:80:WS:1:1:1:0:S:30:Windows
-FAF0:0550:80:WS:1:1:1:0:A:30:Windows XP Pro 
-FAF0:055C:80:WS:1:1:1:0:S:30:Windows XP SP2
-FAF0:0564:80:00:1:1:1:1:A:40:Windows XP
-FAF0:0564:80:WS:0:0:1:0:A:2C:Windows XP Professional
-FAF0:0564:80:WS:1:1:1:0:A:30:Windows 2K
-FAF0:0564:80:WS:1:1:1:0:S:30:Windows XP Professional
-FAF0:0572:80:WS:1:1:1:0:S:30:Windows XP
-FAF0:0578:80:WS:1:1:1:0:A:30:Windows XP
-FAF0:0578:80:WS:1:1:1:0:S:30:Windows 2000
-FAF0:057A:80:WS:1:1:1:0:S:30:Windows XP
-FAF0:0584:40:WS:1:1:1:0:A:30:Unix 
-FAF0:0584:80:WS:0:1:1:0:S:30:Windows XP 
-FAF0:0584:80:WS:1:1:1:0:A:30:Windows 2000 / XP
-FAF0:0584:80:WS:1:1:1:0:S:30:Windows XP
-FAF0:0586:80:WS:1:1:1:0:S:30:Windows XP pro
-FAF0:0598:80:WS:1:1:1:0:A:30:Windows XP
-FAF0:05A0:80:00:1:1:1:1:A:40:Windows XP
-FAF0:05AC:40:03:1:1:1:0:A:34:Windows 2000 
-FAF0:05AC:80:00:1:1:1:1:A:40:Windows XP 
-FAF0:05AC:80:WS:1:1:1:0:A:30:Windows 2000
-FAF0:05AC:80:WS:1:1:1:0:S:30:Windows 2000 Pro
-FAF0:05B0:80:WS:1:1:1:0:A:30:Windows 2000
-FAF0:05B4:40:00:1:1:1:0:S:34:Windows XP
-FAF0:05B4:40:00:1:1:1:0:S:LT:Windows 98
-FAF0:05B4:40:00:1:1:1:1:A:40:Windows 2000
-FAF0:05B4:40:00:1:1:1:1:S:40:Windows 2000
-FAF0:05B4:40:02:1:1:0:0:A:LT:Windows ME
-FAF0:05B4:40:02:1:1:1:0:A:34:Windows 2000
-FAF0:05B4:40:WS:0:0:0:0:A:2C:IBM AIX (JG)
-FAF0:05B4:40:WS:0:0:1:0:A:2C:SunOS 5.9
-FAF0:05B4:40:WS:0:0:1:0:S:2C:Windows NT Server 4.0 
-FAF0:05B4:40:WS:1:1:1:0:A:30:Unix
-FAF0:05B4:40:WS:1:1:1:0:S:30:Windows XP Professional, Build 2600
-FAF0:05B4:80:00:0:1:1:0:A:LT:Windows 2000 Professional, Build 2183 (RC3)
-FAF0:05B4:80:00:0:1:1:1:A:3C:Windows 2000 Professional / Windows XP Pro
-FAF0:05B4:80:00:1:1:1:0:A:34:Windows XP
-FAF0:05B4:80:00:1:1:1:0:S:34:Windows 2000
-FAF0:05B4:80:00:1:1:1:1:A:40:Windows 2000 Version 5.0 (Build 2195)
-FAF0:05B4:80:00:1:1:1:1:S:40:Windows XP
-FAF0:05B4:80:WS:0:0:0:0:A:2C:Windows NT 4.0
-FAF0:05B4:80:WS:0:0:0:0:S:2C:Windows XP Proffesional Release
-FAF0:05B4:80:WS:0:0:1:0:A:2C:Linux Slackware 8.0
-FAF0:05B4:80:WS:0:1:1:0:A:LT:Windows XP Professional Release
-FAF0:05B4:80:WS:0:1:1:0:S:30:Windows XP
-FAF0:05B4:80:WS:1:1:0:0:A:30:Linux
-FAF0:05B4:80:WS:1:1:0:0:S:30:Windows 2000 Pro
-FAF0:05B4:80:WS:1:1:1:0:A:30:Windows XP
-FAF0:05B4:80:WS:1:1:1:0:S:30:Windows XP Pro, Windows 2000 Pro
-FAF0:05B4:80:WS:1:1:1:0:S:LT:Windows 98 SE / 2000 / XP Professional
-FAF0:05B4:FF:WS:0:0:1:0:S:2C:Linux 2.1.xx
-FAF0:05B4:FF:WS:1:1:1:0:A:LT:Windows 2000 Pro
-FAF0:05B4:FF:WS:1:1:1:0:S:30:Windows 2000 Professional SP 3
-FAF0:B405:40:00:0:1:1:0:A:LT:Mac OS X Server 10.1
-FAF0:B405:80:00:0:1:1:1:A:3C:Windows XP professional
-FAF0:B405:80:00:0:1:1:1:A:LT:Windows XP
-FAF0:B405:80:00:1:1:1:1:A:LT:Pocket Pc 2002
-FAF0:B405:80:WS:0:0:1:0:A:2C:Windows XP Pro
-FAF0:B405:80:WS:1:1:1:0:A:30:Windows XP
-FAF0:B405:80:WS:1:1:1:0:S:30:Windows XP Home
-FAF0:_MSS:FF:WS:0:0:0:0:A:LT:Solaris 2.6 - 2.7
-FB04:0594:80:WS:1:1:1:0:S:30:Windows XP
-FB40:0218:40:00:1:1:1:0:S:34:Windows 2000 Pro
-FB40:05B4:40:00:1:1:1:0:S:34:Windows XP
-FC00:04EC:80:WS:1:1:1:0:S:30:Windows XP
-FC00:0518:40:WS:0:0:0:0:A:2C:Xbox - Avalaunch 0.48.64 
-FC00:0546:80:WS:1:1:1:0:S:30:Windows XP Pro 
-FC00:0564:80:WS:1:1:1:0:A:30:Cisco PIX FireWall
-FC00:0578:40:WS:0:0:0:0:S:2C:Microsoft XBox 
-FC00:057E:80:WS:1:1:1:0:S:30:Windows XP
-FC00:05B4:80:00:0:1:1:1:A:3C:Windows 2000
-FC00:05B4:80:00:1:1:0:1:A:40:Windows 2000 Running IIS Version 5
-FC00:05B4:80:00:1:1:1:0:S:34:Windows XP SP1 
-FC00:05B4:80:00:1:1:1:1:A:40:Windows 2000 - XP
-FC00:05B4:80:WS:0:0:1:0:A:2C:Windows XP
-FC00:05B4:80:WS:1:1:1:0:A:30:Windows X
-FC00:05B4:80:WS:1:1:1:0:S:30:Windows 2000 Pro
-FC00:7E05:80:WS:1:1:1:0:S:30:Windows XP Pro
-FC00:B405:80:00:0:1:1:1:A:3C:Windows 2000 server
-FC00:B405:80:00:1:1:1:0:A:34:Windows XP Professional v2002 SP1
-FC00:B405:80:WS:1:1:1:0:S:30:Windows XP 
-FC6C:05B4:80:WS:1:1:1:0:S:LT:Windows XP 
-FCA4:057E:80:WS:1:1:1:0:S:30:Windows XP
-FD20:05A0:80:00:1:1:1:1:A:40:Windows XP Home v2002 
-FD20:05A0:80:WS:1:1:1:0:A:30:Windows XP home 
-FD20:05A0:80:WS:1:1:1:0:S:30:Windows XP Home v2002
-FDB8:0584:FF:WS:1:1:1:0:S:30:Windows XP
-FDD4:05A4:80:WS:1:1:1:0:S:30:Windows XP SP1
-FE70:0588:80:WS:1:1:0:0:A:30:Windows 98 SE
-FE70:0588:80:WS:1:1:0:0:S:30:Windows XP Home
-FE88:05B4:FF:00:0:1:1:1:A:3C:Solaris
-FE88:05B4:FF:00:1:1:1:1:A:40:Mac OS X Server
-FE88:B405:40:00:0:1:1:1:A:3C:Mac OS X Server 10.x
-FE88:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7
-FEF4:0534:80:00:1:1:1:1:A:40:Windows 2000
-FEF4:0534:80:WS:1:1:1:0:S:30:Windows XP
-FEFA:_MSS:80:00:0:1:0:0:A:LT:AIX v4.2
-FEFA:_MSS:80:00:0:1:0:1:A:LT:AIX v4.2
-FF00:0550:80:00:1:1:1:1:A:40:Windows XP
-FF00:0550:80:WS:1:1:1:0:S:30:Windows XP
-FF3C:0584:80:WS:1:1:1:0:A:30:Windows 2000 
-FF3C:05AC:40:WS:1:1:1:0:A:30:Windows XP
-FF3C:05AC:80:00:1:1:1:0:A:34:Windows XP Pro
-FF3C:05AC:80:WS:1:1:0:0:S:30:Windows 2000 Pro SP3
-FF3C:05AC:80:WS:1:1:1:0:S:30:Windows 2000
-FF70:0218:80:WS:1:1:1:0:A:30:Windows 2000 Professional
-FF70:0218:80:WS:1:1:1:0:S:1C:Windows XP Professional Build 2600.xpsp2.030422
-FFA3:05B4:40:WS:1:1:1:0:S:30:Windown 2000 
-FFAF:_MSS:80:00:0:0:1:0:A:LT:Solaris 2.3 - 2.4
-FFAF:_MSS:80:00:0:1:0:0:A:LT:Hitachi HI-UX/MPP (don't know version)
-FFAF:_MSS:80:00:0:1:0:1:A:LT:Hitachi HI-UX/MPP (don't know version)
-FFAF:_MSS:80:WS:0:0:0:0:A:LT:AIX 3.2.5 (Bull HardWare)
-FFDC:0200:40:00:0:1:0:1:A:3C:Windows XP
-FFF0:04EC:80:00:1:1:1:0:A:34:Windos XP 
-FFF0:04EC:80:00:1:1:1:1:A:40:Windows 2000
-FFF0:04EC:80:WS:1:1:1:0:S:30:Windows 2000
-FFF0:057A:80:00:1:1:1:1:A:40:Windows XP
-FFF0:05B0:80:WS:1:1:1:0:A:30:Windows XP
-FFF0:05B0:80:WS:1:1:1:0:S:30:Windows XP
-FFF0:B005:80:00:0:1:1:1:A:3C:Windows XP
-FFF0:EC04:80:WS:1:1:1:0:S:30:Windows XP
-FFF7:_MSS:80:00:0:1:1:0:A:LT:Solaris 2.6 - 2.7
-FFF7:_MSS:80:00:0:1:1:1:A:LT:Solaris 2.6 - 2.7
-FFFF:0200:40:01:0:1:0:0:A:30:FreeBSD 4.8
-FFFF:0200:40:WS:0:0:0:0:A:2C:AIX
-FFFF:0200:80:WS:1:1:1:0:S:30:Windows
-FFFF:0218:80:00:1:1:1:0:S:34:Windows XP
-FFFF:04EC:40:00:1:1:1:1:S:40:Windows XP 
-FFFF:04EC:80:00:1:1:1:1:A:40:Windows 2000
-FFFF:04EC:80:WS:0:0:1:0:A:2C:Windows 2000
-FFFF:04EC:80:WS:1:1:1:0:S:30:Windows 2000 Professional
-FFFF:052A:40:WS:0:0:0:0:A:2C:Windows* [aol client]
-FFFF:052A:80:00:1:1:0:1:A:40:Windows 2000 Server 
-FFFF:0534:40:WS:1:1:1:0:A:30:Windows XP Pro SP1
-FFFF:0548:80:WS:1:1:0:0:S:30:Windows 2000 Server
-FFFF:0550:40:WS:1:1:1:0:A:30:Windows 2000 Server
-FFFF:0558:80:WS:0:0:1:0:S:LT:BorderManager 3.5
-FFFF:0564:40:00:0:1:1:1:A:3C:FreeBSD 
-FFFF:0564:40:01:0:1:1:1:S:3C:FreeBSD 5.1-RELEASE 
-FFFF:0564:40:WS:0:0:0:0:A:LT:AIX
-FFFF:0564:40:WS:0:0:1:0:A:2C:Linux
-FFFF:0564:40:WS:1:1:1:0:S:30:Windows 98 Second Edition
-FFFF:0564:80:00:1:1:1:1:A:40:Windows 2000 server
-FFFF:0564:80:WS:1:1:1:0:A:30:Windows 2000 / NT 
-FFFF:0564:80:WS:1:1:1:0:S:30:Windows
-FFFF:0564:80:WS:1:1:1:1:A:3C:Windows 2000
-FFFF:0578:40:WS:0:0:1:0:S:2C:FreeBSD 4.5 
-FFFF:057E:80:00:1:1:1:1:S:40:Windows 2000
-FFFF:0584:40:00:1:1:1:1:A:40:Windows XP
-FFFF:0584:40:WS:0:0:0:0:A:2C:Solaris
-FFFF:0584:80:WS:1:1:1:0:A:30:Cisco-louche1 
-FFFF:0584:80:WS:1:1:1:0:S:30:Linux Debian
-FFFF:0586:40:00:0:1:1:1:A:3C:Unix
-FFFF:0586:40:01:0:1:1:1:S:3C:Mac OS X 10.2
-FFFF:0586:40:WS:1:1:1:0:S:30:Windows 98 SE 
-FFFF:058C:40:00:1:1:1:1:A:40:Windows XP Pro
-FFFF:058C:40:WS:0:0:0:0:A:2C:FreeBSD 4.5
-FFFF:058C:40:WS:1:1:1:0:A:30:Windows 2000 Pro SP2
-FFFF:058C:80:00:1:1:1:1:A:40:FreeBSD
-FFFF:058C:80:WS:1:1:1:0:A:30:NetBSD
-FFFF:0598:40:WS:0:0:0:0:A:2C:FreeBSD 4.5
-FFFF:0598:40:WS:0:0:0:0:S:2C:Cisco webcache
-FFFF:05A0:80:WS:1:1:1:0:A:30:Windows XP
-FFFF:05A0:80:WS:1:1:1:0:S:30:Windows XP Pro
-FFFF:05A0:FF:WS:1:1:1:0:S:30:Windows 98 
-FFFF:05AC:40:00:1:1:1:0:S:34:MS Windows XP SP1
-FFFF:05AC:40:01:0:1:0:1:A:3C:FreeBSD 4.5-STABLE
-FFFF:05AC:40:01:0:1:1:1:S:3C:Mac OS X 10.2.x 
-FFFF:05AC:40:WS:1:1:1:0:S:30:Windows 98 Second Edition
-FFFF:05AC:40:WS:1:1:1:0:S:LT:Windows 98
-FFFF:05AC:80:00:0:1:0:1:S:3C:Windows XP
-FFFF:05AC:80:00:1:1:1:1:A:40:Windows 2000 Server
-FFFF:05AC:80:WS:0:0:1:0:S:LT:Windows 98
-FFFF:05AC:80:WS:1:1:1:0:A:30:BSD
-FFFF:05AC:80:WS:1:1:1:0:S:30:Windows 95
-FFFF:05B0:80:WS:1:1:1:0:S:30:Windows 2000 Professional 
-FFFF:05B4:40:00:0:1:0:0:S:3C:CacheOS 3.1 on a CacheFlow 6000
-FFFF:05B4:40:00:0:1:1:1:A:3C:Mac OS X (Panther) ver. 10.3.3 (7F44)
-FFFF:05B4:40:00:0:1:1:1:S:3C:FreeBSD 4.4 / 4.5 / 4.7
-FFFF:05B4:40:00:1:1:1:1:S:40:Openbsd 2.9
-FFFF:05B4:40:01:0:1:0:0:A:30:FreeBSD 4.5
-FFFF:05B4:40:01:0:1:0:0:S:30:AOL proxy
-FFFF:05B4:40:01:0:1:0:1:A:3C:FreeBSD 4.4 - 4.5
-FFFF:05B4:40:01:0:1:0:1:A:LT:AIX
-FFFF:05B4:40:01:0:1:1:1:A:3C:FreeBSD 4.3 - 4.4 - 5.1
-FFFF:05B4:40:01:0:1:1:1:A:LT:Linux 
-FFFF:05B4:40:01:0:1:1:1:S:3C:FreeBSD 4.5-STABLE
-FFFF:05B4:40:01:0:1:1:1:S:44:FreeBSD
-FFFF:05B4:40:02:0:1:0:1:A:3C:AIX 4.3 
-FFFF:05B4:40:02:1:1:1:0:S:34:Windows 2003 
-FFFF:05B4:40:03:0:1:1:1:A:3C:FreeBSD 4.7-RELEASE 
-FFFF:05B4:40:WS:0:0:0:0:A:2C:FreeBSD 4.5
-FFFF:05B4:40:WS:0:0:0:0:A:LT:Win NT 4.0 SP4
-FFFF:05B4:40:WS:0:0:1:0:A:2C:FreeBSD 4.3 - 4.4
-FFFF:05B4:40:WS:0:0:1:0:S:2C:FreeBSD 4.5-RELEASE
-FFFF:05B4:40:WS:1:1:0:0:S:30:Windows 98
-FFFF:05B4:40:WS:1:1:1:0:A:30:Windows 2000 Pro SP2
-FFFF:05B4:40:WS:1:1:1:0:S:30:Windows 98 Second Edition
-FFFF:05B4:80:00:0:0:1:0:A:LT:MacOS 8.1
-FFFF:05B4:80:00:0:1:0:0:A:LT:AIX 3.2 running on RS/6000
-FFFF:05B4:80:00:0:1:0:1:A:LT:AIX 3.2 running on RS/6000
-FFFF:05B4:80:00:0:1:1:1:A:3C:Windows 2000 SP4 
-FFFF:05B4:80:00:1:1:0:1:A:40:Windows 2000 Server 
-FFFF:05B4:80:00:1:1:1:0:A:34:Windows 2000 Server SP4 
-FFFF:05B4:80:00:1:1:1:1:A:40:Windows 2000 Advanced Server
-FFFF:05B4:80:01:0:1:1:1:S:3C:FreeBSD 5.0 dp-1
-FFFF:05B4:80:03:1:1:1:0:S:34:Windows 2000
-FFFF:05B4:80:03:1:1:1:1:S:40:Windows 2000 SP 3
-FFFF:05B4:80:WS:0:0:1:0:A:2C:BSD
-FFFF:05B4:80:WS:1:1:0:0:A:30:Windows 2000 Server SP4 
-FFFF:05B4:80:WS:1:1:0:0:S:30:Windows 98 SE
-FFFF:05B4:80:WS:1:1:1:0:A:30:NetBSD
-FFFF:05B4:80:WS:1:1:1:0:S:30:Windows 2000 Professional SP4
-FFFF:05B4:80:WS:1:1:1:0:S:LT:MacOS X
-FFFF:05B4:FF:01:0:1:1:0:A:30:Mac OS 9
-FFFF:05B4:FF:01:0:1:1:0:S:30:Mac OS 9
-FFFF:05B4:FF:WS:0:0:1:0:A:2C:FreeBSD 
-FFFF:05B4:FF:WS:1:1:1:0:S:30:Windows 2000 
-FFFF:7805:40:01:0:1:0:1:S:3C:Mac OS X 10.3 
-FFFF:7E05:80:00:1:1:1:1:S:40:Windows 2000
-FFFF:8C05:FF:01:0:1:0:1:A:LT:MacOS X
-FFFF:A005:40:01:0:1:1:1:S:LT:Linux (Embedded) Router
-FFFF:AC05:80:00:1:1:1:1:S:40:Windows XP
-FFFF:AC05:80:WS:1:1:1:0:S:30:Windows XP
-FFFF:B405:40:00:0:1:1:1:A:3C:Mac OS X (Panther) ver. 10.3.x 
-FFFF:B405:40:00:0:1:1:1:S:3C:Mac OS X 10.3 Panther
-FFFF:B405:40:00:0:1:1:1:S:LT:Darwin
-FFFF:B405:40:00:0:1:1:1:S:LT:Darwin 1.4
-FFFF:B405:40:00:0:1:1:1:S:LT:Mac OS X 10.3.2 (ppc) 
-FFFF:B405:40:00:0:1:1:1:S:LT:Mac Os X 10.3.4
-FFFF:B405:40:01:0:1:0:1:A:3C:FreeBSD 4.4 / 4.5
-FFFF:B405:40:01:0:1:1:0:A:LT:Mac OS X 
-FFFF:B405:40:01:0:1:1:1:A:3C:Mac OS X 10.1.3 / 10.2.x
-FFFF:B405:40:01:0:1:1:1:S:3C:Mac OS X 10.1.x
-FFFF:B405:40:02:0:1:1:1:S:3C:Mac OS X 10.x.x
-FFFF:B405:40:WS:0:0:1:0:A:2C:Mac OS X 
-FFFF:B405:40:WS:0:0:1:0:A:LT:Mac OS X 
-FFFF:B405:40:WS:0:0:1:0:S:2C:Mac OS X 10.3
-FFFF:B405:40:WS:0:0:1:0:S:LT:Mac OS X (10.3)
-FFFF:B405:40:WS:0:0:1:0:S:LT:Mac OS X (10.3) 
-FFFF:B405:40:WS:0:0:1:0:S:LT:Mac OS X 10.3
-FFFF:B405:80:00:0:1:1:1:A:3C:Windows 2000 
-FFFF:B405:80:WS:0:0:0:0:A:2C:Windows 2000 Advanced Server
-FFFF:B405:80:WS:1:1:1:0:A:30:Windows XP
-FFFF:B405:80:WS:1:1:1:0:S:30:Windows
-FFFF:B405:FF:02:0:1:0:1:A:LT:AIX
-FFFF:B405:FF:02:0:1:1:0:S:LT:Mac OS 9.2
-FFFF:_MSS:80:00:0:0:0:0:A:LT:IBM MVS TCP/IP stack V. 3.2 or AIX 4.3.2
-FFFF:_MSS:80:00:0:1:1:0:A:LT:Cray Unicos 9.0 - 10.0 or Unicos/mk 1.5.1
-FFFF:_MSS:80:00:0:1:1:1:A:LT:Cray Unicos 9.0 - 10.0 or Unicos/mk 1.5.1
-FFFF:_MSS:80:WS:0:0:0:0:A:LT:IBM MVS TCP/IP stack V. 3.2 or AIX 4.3.2
-FFFF:_MSS:80:WS:0:0:1:0:A:LT:Novell NetWare 3.12 - 5.00
-FFFF:_MSS:FF:WS:0:0:1:0:A:LT:Solaris 2.6 - 2.7

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Sun Jan 12 12:36:13 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Sun, 12 Jan 2014 11:36:13 +0000
Subject: SF.net SVN: gar:[22820] csw/mgar/pkg/graphviz/trunk
Message-ID: <3f2G923kp8zgy@mail.opencsw.org>

Revision: 22820
          http://sourceforge.net/p/gar/code/22820
Author:   lblume
Date:     2014-01-12 11:36:10 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
graphviz/trunk: Bump to 2.36.0

Modified Paths:
--------------
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/checksums

Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile	2014-01-11 21:57:01 UTC (rev 22819)
+++ csw/mgar/pkg/graphviz/trunk/Makefile	2014-01-12 11:36:10 UTC (rev 22820)
@@ -4,7 +4,7 @@
 # investigated.
 
 NAME = graphviz
-VERSION = 2.34.0
+VERSION = 2.36.0
 GARTYPE = v2
 
 DESCRIPTION = Graph visualization tools 

Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums	2014-01-11 21:57:01 UTC (rev 22819)
+++ csw/mgar/pkg/graphviz/trunk/checksums	2014-01-12 11:36:10 UTC (rev 22820)
@@ -1 +1 @@
-a8a54f8abac5bcdafd9a568e85a086d6  graphviz-2.34.0.tar.gz
+1f41664dba0c93109ac8b71216bf2b57  graphviz-2.36.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From bonivart at users.sourceforge.net  Tue Jan 14 00:08:41 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 13 Jan 2014 23:08:41 +0000
Subject: SF.net SVN: gar:[22821] csw/mgar/pkg/bind/trunk
Message-ID: <3f39Tj6qnfz148@mail.opencsw.org>

Revision: 22821
          http://sourceforge.net/p/gar/code/22821
Author:   bonivart
Date:     2014-01-13 23:08:39 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
bind/trunk: update to 9.9.4-P2

Modified Paths:
--------------
    csw/mgar/pkg/bind/trunk/Makefile
    csw/mgar/pkg/bind/trunk/checksums

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2014-01-12 11:36:10 UTC (rev 22820)
+++ csw/mgar/pkg/bind/trunk/Makefile	2014-01-13 23:08:39 UTC (rev 22821)
@@ -6,7 +6,7 @@
 GARTYPE = v2
 
 # Enable these for Px-releases
-RELEASE = P1
+RELEASE = P2
 DISTVERSION = $(VERSION)-$(RELEASE)
 SPKG_VERSION = $(VERSION)$(RELEASE)
 DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)
@@ -38,6 +38,7 @@
 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWbind += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWbind += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2
 
 PACKAGES += CSWbind-dev
 CATALOGNAME_CSWbind-dev = bind_dev
@@ -54,7 +55,6 @@
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgcc-s1
 
@@ -64,6 +64,7 @@
 RUNTIME_DEP_PKGS_CSWbindutils  = CSWlibbind
 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2
 
 PACKAGES += CSWbindchroot
 CATALOGNAME_CSWbindchroot = bind_chroot
@@ -109,6 +110,8 @@
 
 SPKG_SOURCEURL = http://www.isc.org/software/bind
 
+CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2
 CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils
 CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibssl1-0-0
 CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils

Modified: csw/mgar/pkg/bind/trunk/checksums
===================================================================
--- csw/mgar/pkg/bind/trunk/checksums	2014-01-12 11:36:10 UTC (rev 22820)
+++ csw/mgar/pkg/bind/trunk/checksums	2014-01-13 23:08:39 UTC (rev 22821)
@@ -1 +1 @@
-c1b4fb31c7f8390237b3f46965a49fbd  bind-9.9.4-P1.tar.gz
+aa8e351e3e28d148e1717f8a0361d191  bind-9.9.4-P2.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  Tue Jan 14 11:19:08 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 14 Jan 2014 10:19:08 +0000
Subject: SF.net SVN: gar:[22822] csw/mgar/pkg/gthumb/trunk
Message-ID: <3f3SMG600Tz3Z@mail.opencsw.org>

Revision: 22822
          http://sourceforge.net/p/gar/code/22822
Author:   cgrzemba
Date:     2014-01-14 10:19:07 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
gthumb/trunk: update version 2.12

Modified Paths:
--------------
    csw/mgar/pkg/gthumb/trunk/Makefile
    csw/mgar/pkg/gthumb/trunk/checksums

Modified: csw/mgar/pkg/gthumb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-13 23:08:39 UTC (rev 22821)
+++ csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-14 10:19:07 UTC (rev 22822)
@@ -2,8 +2,8 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = gthumb
-VERSION = 2.10.12
-# VERSION = 2.12.4
+# VERSION = 2.10.12
+VERSION = 2.12.4
 SUBDIR=$(basename $(VERSION))
 GARTYPE = v2
 CATEGORIES = gnome
@@ -14,106 +14,102 @@
 endef
 
 MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz # xz
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 
-GARCOMPILER = SOS12U3
+GARCOMPILER = GCC4
+# GARCOMPILER = SOS12U3
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 STRIP_LIBTOOL = 1
 # PATCHFILES += 0001-configure.ac.patch
+# PATCHFILES += mkdtemp-patch
 
-PATCHFILES += mkdtemp-patch
-
 BUILD_DEP_PKGS += CSWlibgtk2-dev
 BUILD_DEP_PKGS += CSWlibglib2-dev
 BUILD_DEP_PKGS += CSWlibgconf-dev
 BUILD_DEP_PKGS += CSWlibexif-dev 
-# BUILD_DEP_PKGS += CSWlibunique-dev   
+BUILD_DEP_PKGS += CSWlibunique-dev   
+BUILD_DEP_PKGS += CSWlibharfbuzz-dev
 # BUILD_DEP_PKGS += CSWlibsoupdevel 
 # BUILD_DEP_PKGS += CSWgnomekeyring-dev
 
-PACKAGES += CSWlibgthumb
-PKGFILES_CSWlibgthumb += $(call baseisadirs,$(libdir),libgthumb\.so)
-SPKG_DESC_CSWlibgthumb += $(DESCRIPTION), libgthumb.so
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomeui2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibexif12
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomecanvas2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnome2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWorbit2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgconf2-4
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglade2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWpango
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonoboui
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibart
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonobo2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglib2-0-0
-# this is reported because lib was not split out in the old package
-# CHECKPKG_OVERRIDES_CSWlibgthumb += file-collision|/opt/csw/lib/libgthumb.so|CSWgthumb|CSWlibgthumb
-# there is really only the .so name
-CHECKPKG_OVERRIDES_CSWlibgthumb += soname-equals-filename|file=/opt/csw/lib/libgthumb.so
+PACKAGES += CSWgthumb-extensions
+CATALOGNAME_CSWgthumb-extensions = gthumb_extensions
+PKGFILES_CSWgthumb-extensions += $(call baseisadirs,$(libdir)/gthumb/extensions,.*)
+SPKG_DESC_CSWgthumb-extensions += $(DESCRIPTION), extensions
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpangocairo1-0-0
 
+PACKAGES += CSWgthumb-dev
+CATALOGNAME_CSWgthumb-dev = gthumb_dev
+PKGFILES_CSWgthumb-dev += $(PKGFILES_DEVEL)
+SPKG_DESC_CSWgthumb-dev += $(DESCRIPTION), header files
+
+PACKAGES += CSWgthumb-data
+CATALOGNAME_CSWgthumb-data = gthumb_data
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb # $(call catalogname,$P)
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale
+PKGFILES_CSWgthumb-data += $(sysconfigdir)/gconf
+SPKG_DESC_CSWgthumb-data += $(DESCRIPTION), arch-independent files
+
 PACKAGES += CSWgthumb
+CATALOGNAME_CSWgthumb = gthumb
 SPKG_DESC_CSWgthumb += $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthumb
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomeui2-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-data
+RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-extensions
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxrender
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibexif12
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomecanvas2-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome2-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWorbit2
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgconf2-4
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglade2
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWpango
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonoboui
-RUNTIME_DEP_PKGS_CSWgthumb += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibart
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonobo2
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0
 EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/var/lib.*
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpango1-0-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpng15-15
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome-keyring0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstreamer0-10-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibunique1-0-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstinterfaces0-10-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgcc-s1
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-extensions
+CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-data
 
+
 # for xmllint
 EXTRA_TEST_ENV += http_proxy=http://proxy:3128
 
 EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-gnome-3
+# xmllint failed because of missing variable malrng in gnome-doc-utils.pc
+SKIPTEST = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/gthumb/trunk/checksums
===================================================================
--- csw/mgar/pkg/gthumb/trunk/checksums	2014-01-13 23:08:39 UTC (rev 22821)
+++ csw/mgar/pkg/gthumb/trunk/checksums	2014-01-14 10:19:07 UTC (rev 22822)
@@ -1 +1 @@
-14732ffc8b5cea9a80e32de6c34480b3  gthumb-2.10.12.tar.gz
+5a1a4c10602c6bfaf6cc47add3bcfe21  gthumb-2.12.4.tar.xz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From cgrzemba at users.sourceforge.net  Tue Jan 14 11:45:24 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 14 Jan 2014 10:45:24 +0000
Subject: SF.net SVN: gar:[22823] csw/mgar/pkg/transfig/trunk/Makefile
Message-ID: <3f3SxY5klYz8g@mail.opencsw.org>

Revision: 22823
          http://sourceforge.net/p/gar/code/22823
Author:   cgrzemba
Date:     2014-01-14 10:45:20 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
transfig/trunk: add install man page

Modified Paths:
--------------
    csw/mgar/pkg/transfig/trunk/Makefile

Modified: csw/mgar/pkg/transfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transfig/trunk/Makefile	2014-01-14 10:19:07 UTC (rev 22822)
+++ csw/mgar/pkg/transfig/trunk/Makefile	2014-01-14 10:45:20 UTC (rev 22823)
@@ -42,6 +42,8 @@
 	gsed -i -e '/ MAKE = /s/usr\/ccs\/bin\/make/opt\/csw\/bin\/gmake/' fig2dev/Makefile ; \
 	imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES ; \
 	gsed -i -e '/ MAKE = /s/usr\/ccs\/bin\/make/opt\/csw\/bin\/gmake/' Makefile ; \
+	gsed -i -e '/ MANPATH = /s/usr\/openwin/opt\/csw/' fig2dev/Makefile ; \
+	gsed -i -e '/ MANPATH = /s/usr\/openwin/opt\/csw/' transfig/Makefile ; \
 	)
 	$(MAKECOOKIE)
 
@@ -49,3 +51,6 @@
 
 include gar/category.mk
 
+post-install:
+	( cd $(WORKSRC) && gmake install.man DESTDIR=$(DESTDIR) ) 
+	$(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  Tue Jan 14 12:43:13 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 11:43:13 +0000
Subject: SF.net SVN: gar:[22824] csw/mgar/pkg/cpan
Message-ID: <3f3VDB6glMzHT@mail.opencsw.org>

Revision: 22824
          http://sourceforge.net/p/gar/code/22824
Author:   dmichelsen
Date:     2014-01-14 11:43:10 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/Unicode-LineBreak/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Unicode-LineBreak/
    csw/mgar/pkg/cpan/Unicode-LineBreak/branches/
    csw/mgar/pkg/cpan/Unicode-LineBreak/tags/
    csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/
    csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/checksums
    csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/files/

Index: csw/mgar/pkg/cpan/Unicode-LineBreak/trunk
===================================================================
--- csw/mgar/pkg/cpan/Unicode-LineBreak/trunk	2014-01-14 10:45:20 UTC (rev 22823)
+++ csw/mgar/pkg/cpan/Unicode-LineBreak/trunk	2014-01-14 11:43:10 UTC (rev 22824)

Property changes on: csw/mgar/pkg/cpan/Unicode-LineBreak/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile	2014-01-14 11:43:10 UTC (rev 22824)
@@ -0,0 +1,21 @@
+NAME = Unicode-LineBreak
+VERSION = 2013.11
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = NEZUMI
+
+DESCRIPTION = UAX #14 Unicode Line Breaking Algorithm
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE = ARTISTIC
+
+PACKAGES += CSWpm-unicode-gcstring
+CATALOGNAME_CSWpm-unicode-gcstring = pm_unicode_gcstring
+SPKG_DESC_CSWpm-unicode-gcstring = UAX #14 Unicode Line Breaking Algorithm
+RUNTIME_DEP_PKGS_CSWpm-unicode-gcstring += CSWpm-mime-charset
+RUNTIME_DEP_PKGS_CSWpm-unicode-gcstring += CSWlibthai0
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/checksums	2014-01-14 11:43:10 UTC (rev 22824)
@@ -0,0 +1 @@
+994da3b6dab60486249034d2502fba28  Unicode-LineBreak-2013.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  Tue Jan 14 12:47:28 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 11:47:28 +0000
Subject: SF.net SVN: gar:[22825]
	csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile
Message-ID: <3f3VK572WCzMV@mail.opencsw.org>

Revision: 22825
          http://sourceforge.net/p/gar/code/22825
Author:   dmichelsen
Date:     2014-01-14 11:47:27 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/Unicode-LineBreak/trunk: Adjust package name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile	2014-01-14 11:43:10 UTC (rev 22824)
+++ csw/mgar/pkg/cpan/Unicode-LineBreak/trunk/Makefile	2014-01-14 11:47:27 UTC (rev 22825)
@@ -12,10 +12,9 @@
 
 LICENSE = ARTISTIC
 
-PACKAGES += CSWpm-unicode-gcstring
-CATALOGNAME_CSWpm-unicode-gcstring = pm_unicode_gcstring
-SPKG_DESC_CSWpm-unicode-gcstring = UAX #14 Unicode Line Breaking Algorithm
-RUNTIME_DEP_PKGS_CSWpm-unicode-gcstring += CSWpm-mime-charset
-RUNTIME_DEP_PKGS_CSWpm-unicode-gcstring += CSWlibthai0
+PACKAGES += CSWpm-unicode-linebreak
+SPKG_DESC_CSWpm-unicode-linebreak = UAX #14 Unicode Line Breaking Algorithm
+RUNTIME_DEP_PKGS_CSWpm-unicode-linebreak += CSWpm-mime-charset
+RUNTIME_DEP_PKGS_CSWpm-unicode-linebreak += CSWlibthai0
 
 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 Jan 14 12:55:45 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 11:55:45 +0000
Subject: SF.net SVN: gar:[22826] csw/mgar/pkg/cpan
Message-ID: <3f3VVf3D6YzRK@mail.opencsw.org>

Revision: 22826
          http://sourceforge.net/p/gar/code/22826
Author:   dmichelsen
Date:     2014-01-14 11:55:43 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/String-Print/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/String-Print/
    csw/mgar/pkg/cpan/String-Print/branches/
    csw/mgar/pkg/cpan/String-Print/tags/
    csw/mgar/pkg/cpan/String-Print/trunk/
    csw/mgar/pkg/cpan/String-Print/trunk/Makefile
    csw/mgar/pkg/cpan/String-Print/trunk/checksums
    csw/mgar/pkg/cpan/String-Print/trunk/files/

Index: csw/mgar/pkg/cpan/String-Print/trunk
===================================================================
--- csw/mgar/pkg/cpan/String-Print/trunk	2014-01-14 11:47:27 UTC (rev 22825)
+++ csw/mgar/pkg/cpan/String-Print/trunk	2014-01-14 11:55:43 UTC (rev 22826)

Property changes on: csw/mgar/pkg/cpan/String-Print/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/String-Print/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/String-Print/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/String-Print/trunk/Makefile	2014-01-14 11:55:43 UTC (rev 22826)
@@ -0,0 +1,22 @@
+NAME = String-Print
+VERSION = 0.13
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Printf extensions
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-string-print
+CATALOGNAME_CSWpm-string-print = pm_string_print
+SPKG_DESC_CSWpm-string-print = Printf extensions
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-string-print = 1
+RUNTIME_DEP_PKGS_CSWpm-string-print += CSWpm-unicode-linebreak
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/String-Print/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/String-Print/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/String-Print/trunk/checksums	2014-01-14 11:55:43 UTC (rev 22826)
@@ -0,0 +1 @@
+6b78922d71eca61ca97619cbecc80c0c  String-Print-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  Tue Jan 14 13:01:21 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:01:21 +0000
Subject: SF.net SVN: gar:[22827] csw/mgar/pkg/cpan
Message-ID: <3f3Vd64ly2zVy@mail.opencsw.org>

Revision: 22827
          http://sourceforge.net/p/gar/code/22827
Author:   dmichelsen
Date:     2014-01-14 12:01:17 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/Log-Report-Optional/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Log-Report-Optional/
    csw/mgar/pkg/cpan/Log-Report-Optional/branches/
    csw/mgar/pkg/cpan/Log-Report-Optional/tags/
    csw/mgar/pkg/cpan/Log-Report-Optional/trunk/
    csw/mgar/pkg/cpan/Log-Report-Optional/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Report-Optional/trunk/checksums
    csw/mgar/pkg/cpan/Log-Report-Optional/trunk/files/

Index: csw/mgar/pkg/cpan/Log-Report-Optional/trunk
===================================================================
--- csw/mgar/pkg/cpan/Log-Report-Optional/trunk	2014-01-14 11:55:43 UTC (rev 22826)
+++ csw/mgar/pkg/cpan/Log-Report-Optional/trunk	2014-01-14 12:01:17 UTC (rev 22827)

Property changes on: csw/mgar/pkg/cpan/Log-Report-Optional/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/Log-Report-Optional/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Report-Optional/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Log-Report-Optional/trunk/Makefile	2014-01-14 12:01:17 UTC (rev 22827)
@@ -0,0 +1,22 @@
+NAME = Log-Report-Optional
+VERSION = 1.00
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Log::Report in the lightest form
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-log-report-optional
+CATALOGNAME_CSWpm-log-report-optional = pm_log_report_optional
+SPKG_DESC_CSWpm-log-report-optional = Log::Report in the lightest form
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-log-report-optional = 1
+RUNTIME_DEP_PKGS_CSWpm-log-report-optional += CSWpm-string-print
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Log-Report-Optional/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Log-Report-Optional/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Log-Report-Optional/trunk/checksums	2014-01-14 12:01:17 UTC (rev 22827)
@@ -0,0 +1 @@
+19ac502fd361dac0fceab7cb9d1e7dbe  Log-Report-Optional-1.00.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 Jan 14 13:05:46 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:05:46 +0000
Subject: SF.net SVN: gar:[22828] csw/mgar/pkg/cpan
Message-ID: <3f3VkD1FhvzZS@mail.opencsw.org>

Revision: 22828
          http://sourceforge.net/p/gar/code/22828
Author:   dmichelsen
Date:     2014-01-14 12:05:45 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/IO-SessionData/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/IO-SessionData/
    csw/mgar/pkg/cpan/IO-SessionData/branches/
    csw/mgar/pkg/cpan/IO-SessionData/tags/
    csw/mgar/pkg/cpan/IO-SessionData/trunk/
    csw/mgar/pkg/cpan/IO-SessionData/trunk/Makefile
    csw/mgar/pkg/cpan/IO-SessionData/trunk/checksums
    csw/mgar/pkg/cpan/IO-SessionData/trunk/files/

Index: csw/mgar/pkg/cpan/IO-SessionData/trunk
===================================================================
--- csw/mgar/pkg/cpan/IO-SessionData/trunk	2014-01-14 12:01:17 UTC (rev 22827)
+++ csw/mgar/pkg/cpan/IO-SessionData/trunk	2014-01-14 12:05:45 UTC (rev 22828)

Property changes on: csw/mgar/pkg/cpan/IO-SessionData/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/IO-SessionData/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-SessionData/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-SessionData/trunk/Makefile	2014-01-14 12:05:45 UTC (rev 22828)
@@ -0,0 +1,21 @@
+NAME = IO-SessionData
+VERSION = 1.03
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = PHRED
+
+DESCRIPTION = Supporting module for SOAP::Lite
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the unknown license
+
+PACKAGES += CSWpm-io-sessiondata
+CATALOGNAME_CSWpm-io-sessiondata = pm_io_sessiondata
+SPKG_DESC_CSWpm-io-sessiondata = Supporting module for SOAP::Lite
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-io-sessiondata = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/IO-SessionData/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/IO-SessionData/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-SessionData/trunk/checksums	2014-01-14 12:05:45 UTC (rev 22828)
@@ -0,0 +1 @@
+790f9e05465c774cf9a6299500463104  IO-SessionData-1.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  Tue Jan 14 13:09:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:09:38 +0000
Subject: SF.net SVN: gar:[22829] csw/mgar/pkg/cpan
Message-ID: <3f3Vpg4nb6zdw@mail.opencsw.org>

Revision: 22829
          http://sourceforge.net/p/gar/code/22829
Author:   dmichelsen
Date:     2014-01-14 12:09:36 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/Log-Report/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Log-Report/
    csw/mgar/pkg/cpan/Log-Report/branches/
    csw/mgar/pkg/cpan/Log-Report/tags/
    csw/mgar/pkg/cpan/Log-Report/trunk/
    csw/mgar/pkg/cpan/Log-Report/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Report/trunk/checksums
    csw/mgar/pkg/cpan/Log-Report/trunk/files/

Index: csw/mgar/pkg/cpan/Log-Report/trunk
===================================================================
--- csw/mgar/pkg/cpan/Log-Report/trunk	2014-01-14 12:05:45 UTC (rev 22828)
+++ csw/mgar/pkg/cpan/Log-Report/trunk	2014-01-14 12:09:36 UTC (rev 22829)

Property changes on: csw/mgar/pkg/cpan/Log-Report/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/cpan/Log-Report/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Report/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Log-Report/trunk/Makefile	2014-01-14 12:09:36 UTC (rev 22829)
@@ -0,0 +1,23 @@
+NAME = Log-Report
+VERSION = 1.01
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Report a problem, pluggable handlers and language support
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-log-report
+CATALOGNAME_CSWpm-log-report = pm_log_report
+SPKG_DESC_CSWpm-log-report = Report a problem, pluggable handlers and language support
+ARCHALL_CSWpm-log-report = 1
+RUNTIME_DEP_PKGS_CSWpm-log-report += CSWpm-log-report-optional
+RUNTIME_DEP_PKGS_CSWpm-log-report += CSWpm-devel-globaldestruction
+RUNTIME_DEP_PKGS_CSWpm-log-report += CSWpm-string-print
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Log-Report/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Log-Report/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Log-Report/trunk/checksums	2014-01-14 12:09:36 UTC (rev 22829)
@@ -0,0 +1 @@
+21a979d4996298d4eb1a0b1b3767f8dc  Log-Report-1.01.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 Jan 14 13:11:36 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:11:36 +0000
Subject: SF.net SVN: gar:[22830] csw/mgar/pkg/cpan/SOAP-Lite/trunk
Message-ID: <3f3Vry1rz7zjH@mail.opencsw.org>

Revision: 22830
          http://sourceforge.net/p/gar/code/22830
Author:   dmichelsen
Date:     2014-01-14 12:11:33 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/SOAP-Lite/trunk: Update to 1.08

Modified Paths:
--------------
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING

Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile	2014-01-14 12:09:36 UTC (rev 22829)
+++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile	2014-01-14 12:11:33 UTC (rev 22830)
@@ -1,26 +1,31 @@
 NAME = SOAP-Lite
-VERSION = 0.710.10
+VERSION = 1.08
 CATEGORIES = cpan
 GARTYPE = v2
-AUTHOR = MKUTTER
+AUTHOR = PHRED
 
-DESCRIPTION = Client and server side SOAP implementation
+DESCRIPTION = Perl's Web Services Toolkit
 define BLURB
-  SOAP::Lite is a collection of Perl modules which provides a simple and
-  lightweight interface to the Simple Object Access Protocol (SOAP) both on
-  client and server side.
 endef
 
-DISTFILES = COPYING
+CATALOG_RELEASE = unstable
 
-DEP_PKGS = CSWpmiocompress CSWpmlibwww CSWpmmimelite CSWpmmimetools CSWpmuri CSWpmxmlparser CSWpmversion CSWpmnetjabber
+LICENSE_TEXT = This module is licensed under the perl license
 
-PACKAGES = CSWpmsoaplite
-CATALOGNAME = pm_soaplite
+PACKAGES += CSWpm-soap-lite
+CATALOGNAME_CSWpm-soap-lite = pm_soap_lite
+SPKG_DESC_CSWpm-soap-lite = Perl's Web Services Toolkit
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-soap-lite = 1
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-uri
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-io-socket-ssl
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-io-sessiondata
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-libwww-perl
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-xml-parser
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-task-weaken
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-class-inspector
+RUNTIME_DEP_PKGS_CSWpm-soap-lite += CSWpm-crypt-ssleay
+OBSOLETED_BY_CSWpm-soap-lite += CSWpmsoaplite
+CATALOGNAME_CSWpmsoaplite = pm_soaplite_stub
 
-CONFIGURE_ARGS = --noprompt
-
-ARCHALL = 1
-
 include gar/category.mk
-

Modified: csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums	2014-01-14 12:09:36 UTC (rev 22829)
+++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/checksums	2014-01-14 12:11:33 UTC (rev 22830)
@@ -1,2 +1 @@
-54d428705c5d9309c8d6719168acf6ae  COPYING
-45d6679daac03fe4eb604a5b5f416fd5  SOAP-Lite-0.710.10.tar.gz
+d5de2cd5a4415590cfc96d7a41fa811e  SOAP-Lite-1.08.tar.gz

Deleted: csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING	2014-01-14 12:09:36 UTC (rev 22829)
+++ csw/mgar/pkg/cpan/SOAP-Lite/trunk/files/COPYING	2014-01-14 12:11:33 UTC (rev 22830)
@@ -1,4 +0,0 @@
-Copyright (C) 2000-2001 Paul Kulchenko. All rights reserved.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.

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 Jan 14 13:17:23 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:17:23 +0000
Subject: SF.net SVN: gar:[22831] csw/mgar/pkg/cpan
Message-ID: <3f3Vzc1WHhzms@mail.opencsw.org>

Revision: 22831
          http://sourceforge.net/p/gar/code/22831
Author:   dmichelsen
Date:     2014-01-14 12:17:21 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/XML-Compile-Tester/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/XML-Compile-Tester/
    csw/mgar/pkg/cpan/XML-Compile-Tester/branches/
    csw/mgar/pkg/cpan/XML-Compile-Tester/tags/
    csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/
    csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/checksums
    csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/files/

Index: csw/mgar/pkg/cpan/XML-Compile-Tester/trunk
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Tester/trunk	2014-01-14 12:11:33 UTC (rev 22830)
+++ csw/mgar/pkg/cpan/XML-Compile-Tester/trunk	2014-01-14 12:17:21 UTC (rev 22831)

Property changes on: csw/mgar/pkg/cpan/XML-Compile-Tester/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/Makefile	2014-01-14 12:17:21 UTC (rev 22831)
@@ -0,0 +1,23 @@
+NAME = XML-Compile-Tester
+VERSION = 0.90
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Support XML::Compile related regression testing
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-xml-compile-tester
+CATALOGNAME_CSWpm-xml-compile-tester = pm_xml_compile_tester
+SPKG_DESC_CSWpm-xml-compile-tester = Support XML::Compile related regression testing
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-xml-compile-tester = 1
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-tester += CSWpm-log-report
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-tester += CSWpm-test-deep
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile-Tester/trunk/checksums	2014-01-14 12:17:21 UTC (rev 22831)
@@ -0,0 +1 @@
+f228165ab2ce016389f1d2accb6ddf29  XML-Compile-Tester-0.90.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 Jan 14 13:26:44 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:26:44 +0000
Subject: SF.net SVN: gar:[22832] csw/mgar/pkg/cpan
Message-ID: <3f3WBN6SvPzrb@mail.opencsw.org>

Revision: 22832
          http://sourceforge.net/p/gar/code/22832
Author:   dmichelsen
Date:     2014-01-14 12:26:36 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/XML-Compile/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/XML-Compile/
    csw/mgar/pkg/cpan/XML-Compile/branches/
    csw/mgar/pkg/cpan/XML-Compile/tags/
    csw/mgar/pkg/cpan/XML-Compile/trunk/
    csw/mgar/pkg/cpan/XML-Compile/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Compile/trunk/checksums
    csw/mgar/pkg/cpan/XML-Compile/trunk/files/

Index: csw/mgar/pkg/cpan/XML-Compile/trunk
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile/trunk	2014-01-14 12:17:21 UTC (rev 22831)
+++ csw/mgar/pkg/cpan/XML-Compile/trunk	2014-01-14 12:26:36 UTC (rev 22832)

Property changes on: csw/mgar/pkg/cpan/XML-Compile/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/XML-Compile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile/trunk/Makefile	2014-01-14 12:26:36 UTC (rev 22832)
@@ -0,0 +1,25 @@
+NAME = XML-Compile
+VERSION = 1.42
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Compilation based XML processing
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-xml-compile
+CATALOGNAME_CSWpm-xml-compile = pm_xml_compile
+SPKG_DESC_CSWpm-xml-compile = Compilation based XML processing
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-xml-compile = 1
+RUNTIME_DEP_PKGS_CSWpm-xml-compile += CSWpm-xml-compile-tester
+RUNTIME_DEP_PKGS_CSWpm-xml-compile += CSWpm-log-report
+RUNTIME_DEP_PKGS_CSWpm-xml-compile += CSWpm-xml-libxml
+RUNTIME_DEP_PKGS_CSWpm-xml-compile += CSWpm-test-deep
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/XML-Compile/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile/trunk/checksums	2014-01-14 12:26:36 UTC (rev 22832)
@@ -0,0 +1 @@
+85556f1f23c30adfc6c84e470643e2dc  XML-Compile-1.42.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 Jan 14 13:36:58 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:36:58 +0000
Subject: SF.net SVN: gar:[22833] csw/mgar/pkg/cpan
Message-ID: <3f3WQD26vqzwH@mail.opencsw.org>

Revision: 22833
          http://sourceforge.net/p/gar/code/22833
Author:   dmichelsen
Date:     2014-01-14 12:36:54 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/XML-LibXML-Simple/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/XML-LibXML-Simple/
    csw/mgar/pkg/cpan/XML-LibXML-Simple/branches/
    csw/mgar/pkg/cpan/XML-LibXML-Simple/tags/
    csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/
    csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/checksums
    csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/files/

Index: csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk
===================================================================
--- csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk	2014-01-14 12:26:36 UTC (rev 22832)
+++ csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk	2014-01-14 12:36:54 UTC (rev 22833)

Property changes on: csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/Makefile	2014-01-14 12:36:54 UTC (rev 22833)
@@ -0,0 +1,21 @@
+NAME = XML-LibXML-Simple
+VERSION = 0.93
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = 
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the  license
+
+PACKAGES += CSWpm-xml-libxml-simple
+CATALOGNAME_CSWpm-xml-libxml-simple = pm_xml_libxml_simple
+SPKG_DESC_CSWpm-xml-libxml-simple = XML::LibXML clone of XML::Simple::XMLin
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-xml-libxml-simple = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-LibXML-Simple/trunk/checksums	2014-01-14 12:36:54 UTC (rev 22833)
@@ -0,0 +1 @@
+f03059bbf7d42af97af224d23a732b23  XML-LibXML-Simple-0.93.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  Tue Jan 14 13:38:04 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:38:04 +0000
Subject: SF.net SVN: gar:[22834] csw/mgar/pkg/gthumb/trunk/Makefile
Message-ID: <3f3WRV5j74z10k@mail.opencsw.org>

Revision: 22834
          http://sourceforge.net/p/gar/code/22834
Author:   cgrzemba
Date:     2014-01-14 12:38:01 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
gthumb/trunk: new package structure

Modified Paths:
--------------
    csw/mgar/pkg/gthumb/trunk/Makefile

Modified: csw/mgar/pkg/gthumb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-14 12:36:54 UTC (rev 22833)
+++ csw/mgar/pkg/gthumb/trunk/Makefile	2014-01-14 12:38:01 UTC (rev 22834)
@@ -32,29 +32,6 @@
 # BUILD_DEP_PKGS += CSWlibsoupdevel 
 # BUILD_DEP_PKGS += CSWgnomekeyring-dev
 
-PACKAGES += CSWgthumb-extensions
-CATALOGNAME_CSWgthumb-extensions = gthumb_extensions
-PKGFILES_CSWgthumb-extensions += $(call baseisadirs,$(libdir)/gthumb/extensions,.*)
-SPKG_DESC_CSWgthumb-extensions += $(DESCRIPTION), extensions
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpango1-0-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstreamer0-10-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup-gnome2-4-1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstinterfaces0-10-0
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup2-4-1
-RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpangocairo1-0-0
-
 PACKAGES += CSWgthumb-dev
 CATALOGNAME_CSWgthumb-dev = gthumb_dev
 PKGFILES_CSWgthumb-dev += $(PKGFILES_DEVEL)
@@ -62,18 +39,19 @@
 
 PACKAGES += CSWgthumb-data
 CATALOGNAME_CSWgthumb-data = gthumb_data
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb # $(call catalogname,$P)
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons
-PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale
-PKGFILES_CSWgthumb-data += $(sysconfigdir)/gconf
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb/.* # $(call catalogname,$P)
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale/.*
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/applications/.*
+PKGFILES_CSWgthumb-data += $(sysconfdir)/gconf/schemas/.*
 SPKG_DESC_CSWgthumb-data += $(DESCRIPTION), arch-independent files
+ARCHALL_CSWgthumb-data = 1
 
 PACKAGES += CSWgthumb
 CATALOGNAME_CSWgthumb = gthumb
 SPKG_DESC_CSWgthumb += $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-data
-RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-extensions
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibintl8
@@ -86,6 +64,15 @@
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup2-4-1
+
 EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/var/lib.*
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpango1-0-0
 # RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
@@ -100,8 +87,8 @@
 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpangocairo1-0-0
 CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-extensions
 CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-data
+OBSOLETED_BY_CSWgthumb += CSWlibgthumb
 
-
 # for xmllint
 EXTRA_TEST_ENV += http_proxy=http://proxy:3128
 

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 Jan 14 13:43:28 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 12:43:28 +0000
Subject: SF.net SVN: gar:[22835] csw/mgar/pkg/cpan
Message-ID: <3f3WYm3PdBz14L@mail.opencsw.org>

Revision: 22835
          http://sourceforge.net/p/gar/code/22835
Author:   dmichelsen
Date:     2014-01-14 12:43:28 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
cpan/XML-Compile-Cache/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/XML-Compile-Cache/
    csw/mgar/pkg/cpan/XML-Compile-Cache/branches/
    csw/mgar/pkg/cpan/XML-Compile-Cache/tags/
    csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/
    csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/checksums
    csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/files/

Index: csw/mgar/pkg/cpan/XML-Compile-Cache/trunk
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Cache/trunk	2014-01-14 12:38:01 UTC (rev 22834)
+++ csw/mgar/pkg/cpan/XML-Compile-Cache/trunk	2014-01-14 12:43:28 UTC (rev 22835)

Property changes on: csw/mgar/pkg/cpan/XML-Compile-Cache/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/Makefile	2014-01-14 12:43:28 UTC (rev 22835)
@@ -0,0 +1,25 @@
+NAME = XML-Compile-Cache
+VERSION = 1.01
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MARKOV
+
+DESCRIPTION = Cache compiled XML translators
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the perl license
+
+PACKAGES += CSWpm-xml-compile-cache
+CATALOGNAME_CSWpm-xml-compile-cache = pm_xml_compile_cache
+SPKG_DESC_CSWpm-xml-compile-cache = Cache compiled XML translators
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-xml-compile-cache = 1
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-cache += CSWpm-xml-compile
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-cache += CSWpm-xml-compile-tester
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-cache += CSWpm-xml-libxml-simple
+RUNTIME_DEP_PKGS_CSWpm-xml-compile-cache += CSWpm-log-report
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/XML-Compile-Cache/trunk/checksums	2014-01-14 12:43:28 UTC (rev 22835)
@@ -0,0 +1 @@
+06703c4a9f4c299b154669cda93ebcd7  XML-Compile-Cache-1.01.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 Jan 14 17:16:29 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jan 2014 16:16:29 +0000
Subject: SF.net SVN: gar:[22836] csw/mgar/pkg
Message-ID: <3f3cHb12Vqz1Q4@mail.opencsw.org>

Revision: 22836
          http://sourceforge.net/p/gar/code/22836
Author:   dmichelsen
Date:     2014-01-14 16:16:27 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
mod_auth_external: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/mod_auth_external/trunk/Makefile
    csw/mgar/pkg/mod_auth_external/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mod_auth_external/
    csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall
    csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.preremove

Removed Paths:
-------------
    csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2modauthradius.postinstall
    csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2modauthradius.preremove

Modified: csw/mgar/pkg/mod_auth_external/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_auth_radius/trunk/Makefile	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/mod_auth_external/trunk/Makefile	2014-01-14 16:16:27 UTC (rev 22836)
@@ -1,5 +1,5 @@
-NAME = mod_auth_radius
-VERSION = 1.5.8
+NAME = mod_authnz_external
+VERSION = 3.2.6
 GARTYPE = v2
 
 DESCRIPTION = Apache RADIUS authentication module
@@ -9,20 +9,17 @@
   however, need to supply your own RADIUS server to perform the actual authentication.
 endef
 
-MASTER_SITES = ftp://ftp.freeradius.org/pub/radius/
-DISTFILES  = $(NAME)-$(VERSION).tar
-DISTFILES += CSWap2modauthradius.postinstall CSWap2modauthradius.preremove
-DISTFILES += COPYING
+https://code.google.com/p/mod-auth-external/downloads/detail?name=mod_authnz_external-3.2.6.tar.gz
+GOOGLE_PROJECT = mod-auth-external
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += CSWap2-mod-auth-external.postinstall CSWap2-mod-auth-external.preremove
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar
+VENDOR_URL = https://code.google.com/p/mod-auth-external/
 
-VENDOR_URL = http://freeradius.org/mod_auth_radius/
+PACKAGES = CSWap2-mod-auth-external
 
-PACKAGES = CSWap2modauthradius
-CATALOGNAME = ap2_mod_auth_radius
-
 DEP_PKGS = CSWapache2
-CHECKPKG_OVERRIDES_CSWap2modauthradius += surplus-dependency|CSWapache2
 
 # Apache paths
 AP2_ROOT      = $(prefix)/apache2
@@ -38,24 +35,18 @@
 
 STRIP_DIRS = $(DESTDIR)$(prefix)/apache2/libexec
 
-PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-auth-radius.conf
-
 include gar/category.mk
 
 build-custom:
-	cd $(WORKSRC) && $(APXS) -c mod_auth_radius-2.0.c
+	cd $(WORKSRC) && $(APXS) -c mod_authnz_external.c
 	$(MAKECOOKIE)
 
 install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
 install-custom:
 	mkdir -p $(AP2_LIBEXEC)
-	cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_auth_radius-2.0.la
-	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-	ginstall -m 0644 $(WORKSRC)/httpd.conf $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-auth-radius.conf
+	cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_authnz_external.la
+	#ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+	#ginstall -m 0644 $(WORKSRC)/httpd.conf $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-auth-radius.conf
 	ginstall -d $(DOCDEST)
 	ginstall $(WORKSRC)/README $(DOCDEST)
 	@$(MAKECOOKIE)
-
-
-
-

Modified: csw/mgar/pkg/mod_auth_external/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_auth_radius/trunk/checksums	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/mod_auth_external/trunk/checksums	2014-01-14 16:16:27 UTC (rev 22836)
@@ -1,4 +1 @@
-6c2b9be793fdffe75bdf8dc816a85466  COPYING
-5ec728767a9a7545de480ceb71d93e20  CSWap2modauthradius.postinstall
-1c5e63dbb9b18aca27943e9b0011d1f3  CSWap2modauthradius.preremove
-81de397fcbb18e3c5696d6cc9c73493b  mod_auth_radius-1.5.8.tar
+38ce167e14ab696324a838adfef0c850  mod_authnz_external-3.2.6.tar.gz

Copied: csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall (from rev 22420, csw/mgar/pkg/mod_auth_radius/trunk/files/CSWap2modauthradius.postinstall)
===================================================================
--- csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall	2014-01-14 16:16:27 UTC (rev 22836)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the auth_radius modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    authnz_external mod_authnz_external.so
+
+# Finito
+cat <

Revision: 22837
          http://sourceforge.net/p/gar/code/22837
Author:   lblume
Date:     2014-01-14 22:02:59 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
ImageMagick/trunk: Bump to 6.8.8-2

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile
    csw/mgar/pkg/ImageMagick/trunk/checksums

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-14 16:16:27 UTC (rev 22836)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-14 22:02:59 UTC (rev 22837)
@@ -1,6 +1,6 @@
 NAME      = imagemagick
 VERSION   = 6.8.8
-GARSUBREV = 1
+GARSUBREV = 2
 GARTYPE   = v2
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2014-01-14 16:16:27 UTC (rev 22836)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2014-01-14 22:02:59 UTC (rev 22837)
@@ -1 +1 @@
-bd92093ef3cf83167c316575e478d3b5  ImageMagick-6.8.8-1.tar.xz
+d11e1c732add731ff368b2dffcd004b4  ImageMagick-6.8.8-2.tar.xz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Wed Jan 15 11:27:20 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 15 Jan 2014 10:27:20 +0000
Subject: SF.net SVN: gar:[22838] csw/mgar/pkg/pca/trunk
Message-ID: <3f44VK4zJTz162@mail.opencsw.org>

Revision: 22838
          http://sourceforge.net/p/gar/code/22838
Author:   dmichelsen
Date:     2014-01-15 10:27:17 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
pca/trunk: Update to 20140115-01

Modified Paths:
--------------
    csw/mgar/pkg/pca/trunk/Makefile
    csw/mgar/pkg/pca/trunk/checksums

Modified: csw/mgar/pkg/pca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pca/trunk/Makefile	2014-01-14 22:02:59 UTC (rev 22837)
+++ csw/mgar/pkg/pca/trunk/Makefile	2014-01-15 10:27:17 UTC (rev 22838)
@@ -1,5 +1,5 @@
 NAME = pca
-VERSION = 20130502-01
+VERSION = 20140115-01
 GARTYPE = v2
 
 DESCRIPTION = Patch Check Advanced

Modified: csw/mgar/pkg/pca/trunk/checksums
===================================================================
--- csw/mgar/pkg/pca/trunk/checksums	2014-01-14 22:02:59 UTC (rev 22837)
+++ csw/mgar/pkg/pca/trunk/checksums	2014-01-15 10:27:17 UTC (rev 22838)
@@ -2,4 +2,4 @@
 def9838b9f704ec17a32dd2aeec8bf02  clean
 3027cc2e36a52704e4443cb5c7a91427  cleanup_sadm
 9032b788b8a494082368ea0881146078  mkxref
-70c76b041938d4d57ba7f529a783011b  pca-20130502-01
+96415657cb8f53e4577cf02afb9ef707  pca-20140115-01

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Wed Jan 15 16:25:00 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 15 Jan 2014 15:25:00 +0000
Subject: SF.net SVN: gar:[22839] csw/mgar/pkg/ImageMagick/trunk/Makefile
Message-ID: <3f4C5k2VvSz1Vq@mail.opencsw.org>

Revision: 22839
          http://sourceforge.net/p/gar/code/22839
Author:   lblume
Date:     2014-01-15 15:24:59 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
ImageMagick/trunk: Version needs soname bump

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-15 10:27:17 UTC (rev 22838)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-15 15:24:59 UTC (rev 22839)
@@ -38,38 +38,38 @@
 BUILD_DEP_PKGS += CSWliblcms2-dev
 BUILD_DEP_PKGS += CSWgraphviz-dev
 
-PACKAGES += CSWlibmagickcore6q16hdri1
-CATALOGNAME_CSWlibmagickcore6q16hdri1 = libmagickcore6q16hdri1
-SPKG_DESC_CSWlibmagickcore6q16hdri1 += Library from ImageMagick, libMagickCore-6.Q16HDRI.so.1
-PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1\.0\.0)
-PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblqr1-0
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgomp1
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgcc-s1
+PACKAGES += CSWlibmagickcore6q16hdri2
+CATALOGNAME_CSWlibmagickcore6q16hdri2 = libmagickcore6q16hdri2
+SPKG_DESC_CSWlibmagickcore6q16hdri2 += Library from ImageMagick, libMagickCore-6.Q16HDRI.so.2
+PKGFILES_CSWlibmagickcore6q16hdri2 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2\.0\.0)
+PKGFILES_CSWlibmagickcore6q16hdri2 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1
 
-PACKAGES += CSWlibmagickwand6q16hdri1
-CATALOGNAME_CSWlibmagickwand6q16hdri1 = libmagickwand6q16hdri1
-SPKG_DESC_CSWlibmagickwand6q16hdri1 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.1
-PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1\.0\.0)
-PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgomp1
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgcc-s1
+PACKAGES += CSWlibmagickwand6q16hdri2
+CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2
+SPKG_DESC_CSWlibmagickwand6q16hdri2 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.2
+PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0)
+PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1
 
 PACKAGES += CSWlibmagick++6q16hdri3
 CATALOGNAME_CSWlibmagick++6q16hdri3 = libmagick++6q16hdri3
 PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3\.0\.0)
 PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibmagick++6q16hdri3 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.3
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickcore6q16hdri1
-RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickwand6q16hdri1
+RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickcore6q16hdri2
+RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickwand6q16hdri2
 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibstdc++6
 
@@ -80,16 +80,16 @@
 PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWimagemagick-dev += $(docdir)/.*
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri2
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri2
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri3
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl
 
 PACKAGES += CSWimagemagick
 SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri1
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri1
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri2
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7
@@ -118,18 +118,18 @@
 
 ### 
 # Needed for the Solaris ld bug
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWliblqr1-0
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibimath2-0-10
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8
@@ -167,18 +167,18 @@
 CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibfreetype6
 CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibltdl7
 CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibgomp1
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfftw3-3
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfontconfig1
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWliblqr1-0
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibbz2-1-0
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWliblcms2-2
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibglib2-0-0
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfreetype6
-CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibltdl7
-CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibglib2-0-0
-CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibfftw3-3
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWliblqr1-0
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibbz2-1-0
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWliblcms2-2
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibglib2-0-0
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri2 += surplus-dependency|CSWlibltdl7
+CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri2 += surplus-dependency|CSWlibglib2-0-0
+CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri2 += surplus-dependency|CSWlibintl8
 CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibfftw3-3
 CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibhalf10
 CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibintl8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Wed Jan 15 20:55:14 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 15 Jan 2014 19:55:14 +0000
Subject: SF.net SVN: gar:[22840] csw/mgar/pkg/ImageMagick/trunk/Makefile
Message-ID: <3f4K5S0rDLzL6@mail.opencsw.org>

Revision: 22840
          http://sourceforge.net/p/gar/code/22840
Author:   lblume
Date:     2014-01-15 19:55:13 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
ImageMagick/trunk: Add obsoleting info

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-15 15:24:59 UTC (rev 22839)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-15 19:55:13 UTC (rev 22840)
@@ -53,15 +53,19 @@
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibmagickcore6q16hdri2 += CSWlibmagickcore6q16hdri1
 
 PACKAGES += CSWlibmagickwand6q16hdri2
 CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2
 SPKG_DESC_CSWlibmagickwand6q16hdri2 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.2
 PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0)
 PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*)
+PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0)
+PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibmagickwand6q16hdri2 += CSWlibmagickwand6q16hdri1
 
 PACKAGES += CSWlibmagick++6q16hdri3
 CATALOGNAME_CSWlibmagick++6q16hdri3 = libmagick++6q16hdri3
@@ -72,6 +76,7 @@
 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickwand6q16hdri2
 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibstdc++6
+OBSOLETED_BY_CSWlibmagick++6q16hdri3 += CSWlibmagick++6q16hdri2
 
 PACKAGES += CSWimagemagick-dev
 SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From guillomovitch at users.sourceforge.net  Wed Jan 15 21:10:52 2014
From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net)
Date: Wed, 15 Jan 2014 20:10:52 +0000
Subject: SF.net SVN: gar:[22841] csw/mgar/pkg/fusioninventory-agent/trunk
Message-ID: <3f4KRT1kxdzQR@mail.opencsw.org>

Revision: 22841
          http://sourceforge.net/p/gar/code/22841
Author:   guillomovitch
Date:     2014-01-15 20:10:51 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
fusioninventory-agent/trunk: new version 2.3.5.1

Modified Paths:
--------------
    csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
    csw/mgar/pkg/fusioninventory-agent/trunk/checksums

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2014-01-15 19:55:13 UTC (rev 22840)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2014-01-15 20:10:51 UTC (rev 22841)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = fusioninventory-agent
-VERSION = 2.3.4
+VERSION = 2.3.5.1
 GARTYPE = v2
 CATEGORIES = cpan
 
@@ -15,7 +15,7 @@
 endef
 
 MASTER_SITES = $(CPAN_MIRRORS)
-AUTHOR = GONERI
+AUTHOR = GROUSSE
 MODDIST =
 DISTNAME = FusionInventory-Agent-$(VERSION)
 DISTFILES = $(DISTNAME).tar.gz

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums
===================================================================
--- csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2014-01-15 19:55:13 UTC (rev 22840)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2014-01-15 20:10:51 UTC (rev 22841)
@@ -1 +1 @@
-12c63829ec1d8433647fc2483089ed79  FusionInventory-Agent-2.3.4.tar.gz
+97896f8f9710aa36d70fcc90999f50b1  FusionInventory-Agent-2.3.5.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jake_goerzen at users.sourceforge.net  Wed Jan 15 22:56:41 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 15 Jan 2014 21:56:41 +0000
Subject: SF.net SVN: gar:[22842] csw/mgar/pkg/tor/trunk
Message-ID: <3f4MnZ2zPHzd1@mail.opencsw.org>

Revision: 22842
          http://sourceforge.net/p/gar/code/22842
Author:   jake_goerzen
Date:     2014-01-15 21:56:37 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
tor: move OpenCSW options from sample config file to command-line

Modified Paths:
--------------
    csw/mgar/pkg/tor/trunk/Makefile
    csw/mgar/pkg/tor/trunk/files/cswtor

Modified: csw/mgar/pkg/tor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 20:10:51 UTC (rev 22841)
+++ csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 21:56:37 UTC (rev 22842)
@@ -40,12 +40,6 @@
 
 post-install-modulated:
 
-	# add some config options to sample conf
-	echo "# OpenCSW added default options" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "Log syslog" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "PidFile /var/run/tor.pid" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "RunAsDaemon 1" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-
 	# Copy SMF script
 	ginstall -Dm 755 $(FILEDIR)/cswtor \
 		$(DESTDIR)/etc/opt/csw/init.d/cswtor

Modified: csw/mgar/pkg/tor/trunk/files/cswtor
===================================================================
--- csw/mgar/pkg/tor/trunk/files/cswtor	2014-01-15 20:10:51 UTC (rev 22841)
+++ csw/mgar/pkg/tor/trunk/files/cswtor	2014-01-15 21:56:37 UTC (rev 22842)
@@ -4,12 +4,12 @@
 
 DAEMON=/opt/csw/bin/tor
 CONF=/etc/opt/csw/tor/torrc
-pidfile=/var/run/tor.pid
+pidfile=/var/opt/csw/run/tor.pid
 
 case "$1" in
   start)
     echo "Starting Tor"
-    $DAEMON -f $CONF
+    $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid
     ;;
   stop)
     echo "Stopping Tor"
@@ -19,7 +19,7 @@
     echo "Restarting Tor"
     kill `cat $pidfile`
     sleep 1
-    $DAEMON -f $CONF
+    $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid
     ;;
   *)
     echo "Usage: $0 { start | stop | restart }"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From jake_goerzen at users.sourceforge.net  Wed Jan 15 22:58:34 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 15 Jan 2014 21:58:34 +0000
Subject: SF.net SVN: gar:[22843] csw/mgar/pkg/tor/trunk
Message-ID: <3f4Mqk2gZqzhR@mail.opencsw.org>

Revision: 22843
          http://sourceforge.net/p/gar/code/22843
Author:   jake_goerzen
Date:     2014-01-15 21:58:32 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
tor: version bump to 0.2.4.20

Modified Paths:
--------------
    csw/mgar/pkg/tor/trunk/Makefile
    csw/mgar/pkg/tor/trunk/checksums

Modified: csw/mgar/pkg/tor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 21:56:37 UTC (rev 22842)
+++ csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 21:58:32 UTC (rev 22843)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = tor
-VERSION = 0.2.4.19
+VERSION = 0.2.4.20
 GARTYPE = v2
 
 DESCRIPTION = Secure network traffic router

Modified: csw/mgar/pkg/tor/trunk/checksums
===================================================================
--- csw/mgar/pkg/tor/trunk/checksums	2014-01-15 21:56:37 UTC (rev 22842)
+++ csw/mgar/pkg/tor/trunk/checksums	2014-01-15 21:58:32 UTC (rev 22843)
@@ -1 +1 @@
-5fb5d7252b60859428083e34dde46421  tor-0.2.4.19.tar.gz
+a8cd8e3b3a3f6a7770f2c22d280f19b8  tor-0.2.4.20.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From bonivart at users.sourceforge.net  Thu Jan 16 13:12:32 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 16 Jan 2014 12:12:32 +0000
Subject: SF.net SVN: gar:[22844] csw/mgar/pkg/cpan/Net-DNS/trunk
Message-ID: <3f4knD3Dn5z1RN@mail.opencsw.org>

Revision: 22844
          http://sourceforge.net/p/gar/code/22844
Author:   bonivart
Date:     2014-01-16 12:12:28 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
cpan/Net-DNS/trunk: update to 0.74

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile
    csw/mgar/pkg/cpan/Net-DNS/trunk/checksums

Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile	2014-01-15 21:58:32 UTC (rev 22843)
+++ csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile	2014-01-16 12:12:28 UTC (rev 22844)
@@ -1,5 +1,5 @@
 NAME = Net-DNS
-VERSION = 0.72
+VERSION = 0.74
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = NLNETLABS

Modified: csw/mgar/pkg/cpan/Net-DNS/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Net-DNS/trunk/checksums	2014-01-15 21:58:32 UTC (rev 22843)
+++ csw/mgar/pkg/cpan/Net-DNS/trunk/checksums	2014-01-16 12:12:28 UTC (rev 22844)
@@ -1 +1 @@
-393e48ec6f28abe5ed30204276e02775  Net-DNS-0.72.tar.gz
+d3d074ba95314fa9627252653a4242b7  Net-DNS-0.74.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Thu Jan 16 15:32:42 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu, 16 Jan 2014 14:32:42 +0000
Subject: SF.net SVN: gar:[22845] csw/mgar/pkg/openjpeg/trunk
Message-ID: <3f4ntt2DvMz5w@mail.opencsw.org>

Revision: 22845
          http://sourceforge.net/p/gar/code/22845
Author:   lblume
Date:     2014-01-16 14:32:41 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
openjpeg/trunk: Introducing OpenJPEG 2.0.0

Modified Paths:
--------------
    csw/mgar/pkg/openjpeg/trunk/Makefile
    csw/mgar/pkg/openjpeg/trunk/checksums

Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-16 12:12:28 UTC (rev 22844)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-16 14:32:41 UTC (rev 22845)
@@ -1,23 +1,42 @@
 NAME = openjpeg
-VERSION = 1.3
+VERSION = 2.0.0
 GARTYPE = v2
 
 DESCRIPTION = Open-source JPEG 2000 codec written in C
 define BLURB
+The OpenJPEG library is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG). In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ..
 endef
 
-MASTER_SITES = http://www.openjpeg.org/
-DISTFILES  = $(NAME)_v1_3.tar.gz
+VENDOR_URL   = http://code.google.com/p/openjpeg/
+MASTER_SITES = $(GOOGLE_MIRROR)
+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
+GARCOMPILER = GCC4
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
+CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
+CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
+CMAKE_ARGS += -DBUILD_SHARED_LIBS:bool=on
+CMAKE_ARGS += -DBUILD_CODEC:bool=on
 
-BUILD64_LIBS_ONLY = 1
-NORUNPATH = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
+ISAEXEC = 1
 
+CONFIGURE_SCRIPTS = custom
+TEST_TARGET = 
+
 include gar/category.mk
+
+configure-custom:
+	(cd $(WORKSRC) && \
+		/usr/bin/env -i \
+			$(CONFIGURE_ENV) \
+			cmake \
+			. \
+			$(CMAKE_ARGS))
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/openjpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/checksums	2014-01-16 12:12:28 UTC (rev 22844)
+++ csw/mgar/pkg/openjpeg/trunk/checksums	2014-01-16 14:32:41 UTC (rev 22845)
@@ -1 +1 @@
-f9a3ccfa91ac34b589e9bf7577ce8ff9  download/openjpeg_v1_3.tar.gz
+d9be274bddc0f47f268e484bdcaaa6c5  openjpeg-2.0.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Thu Jan 16 15:41:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Jan 2014 14:41:38 +0000
Subject: SF.net SVN: gar:[22846] csw/mgar/pkg/sudo/trunk
Message-ID: <3f4p564NNKzB0@mail.opencsw.org>

Revision: 22846
          http://sourceforge.net/p/gar/code/22846
Author:   dmichelsen
Date:     2014-01-16 14:41:34 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
sudo/trunk: Update to 1.8.9p4

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	2014-01-16 14:32:41 UTC (rev 22845)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2014-01-16 14:41:34 UTC (rev 22846)
@@ -2,7 +2,7 @@
 #
 
 NAME = sudo
-VERSION = 1.8.9p1
+VERSION = 1.8.9p4
 GARTYPE = v2
 
 EXTRA_MODULATORS = LDAP

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2014-01-16 14:32:41 UTC (rev 22845)
+++ csw/mgar/pkg/sudo/trunk/checksums	2014-01-16 14:41:34 UTC (rev 22846)
@@ -1 +1 @@
-03773c373082843211c96df2c9187146  sudo-1.8.9p1.tar.gz
+a46f6de8645e6c5b6668d30657439d1c  sudo-1.8.9p4.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Thu Jan 16 23:50:21 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu, 16 Jan 2014 22:50:21 +0000
Subject: SF.net SVN: gar:[22847] csw/mgar/pkg/openjpeg/trunk/Makefile
Message-ID: <3f50x34jgPzgy@mail.opencsw.org>

Revision: 22847
          http://sourceforge.net/p/gar/code/22847
Author:   lblume
Date:     2014-01-16 22:50:20 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
openjpeg/trunk: Split into subpackages; Fix install dirs; Add override

Modified Paths:
--------------
    csw/mgar/pkg/openjpeg/trunk/Makefile

Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-16 14:41:34 UTC (rev 22846)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-16 22:50:20 UTC (rev 22847)
@@ -10,11 +10,29 @@
 VENDOR_URL   = http://code.google.com/p/openjpeg/
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES    = $(DISTNAME).tar.gz
+LICENSE      = LICENSE
 
 GARCOMPILER = GCC4
 
+PACKAGES += CSWlibopenjp2-6
+CATALOGNAME_CSWlibopenjp2-6 = libopenjp2_6
+PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.2\.0\.0)
+PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.6)
+SPKG_DESC_CSWlibopenjp2-6 += $(DESCRIPTION), libopenjp2.so.6
+RUNTIME_DEP_PKGS_CSWlibopenjp2-6 += CSWlibgcc-s1
+
+PACKAGES += CSWopenjpeg-dev
+CATALOGNAME_CSWopenjpeg-dev = openjpeg_dev
+SPKG_DESC_CSWopenjpeg-dev += $(DESCRIPTION), development files
+PKGFILES_CSWopenjpeg-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-6
+
+RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-6
+
+# For some reason the so.6 links to the so.2.0.0
+CHECKPKG_OVERRIDES_CSWlibopenjp2-6 += soname-not-part-of-filename|soname=libopenjp2.so.6|filename=libopenjp2.so.2.0.0
+
 CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
-CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
 CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
@@ -22,6 +40,8 @@
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
 CMAKE_ARGS += -DBUILD_SHARED_LIBS:bool=on
 CMAKE_ARGS += -DBUILD_CODEC:bool=on
+CMAKE_ARGS += -DOPENJPEG_INSTALL_BIN_DIR=$(subst $(prefix)/,,$(bindir))
+CMAKE_ARGS += -DOPENJPEG_INSTALL_LIB_DIR=$(subst $(prefix)/,,$(libdir))
 
 BUILD64 = 1
 ISAEXEC = 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Fri Jan 17 21:37:47 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 17 Jan 2014 20:37:47 +0000
Subject: SF.net SVN: gar:[22848] csw/mgar/pkg/openjpeg/trunk/Makefile
Message-ID: <3f5Yxj2mmGzpF@mail.opencsw.org>

Revision: 22848
          http://sourceforge.net/p/gar/code/22848
Author:   lblume
Date:     2014-01-17 20:37:43 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
openjpeg/trunk: Adjust the cmake parameters; fix the dependencies

Modified Paths:
--------------
    csw/mgar/pkg/openjpeg/trunk/Makefile

Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-16 22:50:20 UTC (rev 22847)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-17 20:37:43 UTC (rev 22848)
@@ -27,7 +27,14 @@
 PKGFILES_CSWopenjpeg-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-6
 
+PACKAGES += CSWopenjpeg
+CATALOGNAME_CSWopenjpeg = openjpeg
+SPKG_DESC_CSWopenjpeg += $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-6
+RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWopenjpeg += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibpng15-15
+# PKGFILES is catchall
 
 # For some reason the so.6 links to the so.2.0.0
 CHECKPKG_OVERRIDES_CSWlibopenjp2-6 += soname-not-part-of-filename|soname=libopenjp2.so.6|filename=libopenjp2.so.2.0.0
@@ -37,11 +44,15 @@
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
-CMAKE_ARGS += -DBUILD_SHARED_LIBS:bool=on
-CMAKE_ARGS += -DBUILD_CODEC:bool=on
-CMAKE_ARGS += -DOPENJPEG_INSTALL_BIN_DIR=$(subst $(prefix)/,,$(bindir))
-CMAKE_ARGS += -DOPENJPEG_INSTALL_LIB_DIR=$(subst $(prefix)/,,$(libdir))
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX="$(prefix)"
+# Those two lines are absolutely needed so the RPATH is set properly in the
+# final binary.
+CMAKE_ARGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH:bool=TRUE
+CMAKE_ARGS += -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:bool=TRUE
+CMAKE_ARGS += -DBUILD_SHARED_LIBS:bool=TRUE
+CMAKE_ARGS += -DBUILD_CODEC:bool=TRUE
+CMAKE_ARGS += -DOPENJPEG_INSTALL_BIN_DIR="$(subst $(prefix)/,,$(bindir))"
+CMAKE_ARGS += -DOPENJPEG_INSTALL_LIB_DIR="$(subst $(prefix)/,,$(libdir))"
 
 BUILD64 = 1
 ISAEXEC = 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Sat Jan 18 11:53:31 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Sat, 18 Jan 2014 10:53:31 +0000
Subject: SF.net SVN: gar:[22849] csw/mgar/pkg/openjpeg/trunk
Message-ID: <3f5wx12Qc7z1Mg@mail.opencsw.org>

Revision: 22849
          http://sourceforge.net/p/gar/code/22849
Author:   lblume
Date:     2014-01-18 10:53:28 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
openjpeg/trunk: Add patch for pkgconfig support

Modified Paths:
--------------
    csw/mgar/pkg/openjpeg/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/openjpeg/trunk/files/0001-add-pc-file.patch

Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-17 20:37:43 UTC (rev 22848)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile	2014-01-18 10:53:28 UTC (rev 22849)
@@ -12,6 +12,10 @@
 DISTFILES    = $(DISTNAME).tar.gz
 LICENSE      = LICENSE
 
+# .pc file needed at least for ImageMagick
+# http://code.google.com/p/openjpeg/source/detail?spec=svn2250&r=2250#
+PATCHFILES += 0001-add-pc-file.patch
+
 GARCOMPILER = GCC4
 
 PACKAGES += CSWlibopenjp2-6

Added: csw/mgar/pkg/openjpeg/trunk/files/0001-add-pc-file.patch
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/files/0001-add-pc-file.patch	                        (rev 0)
+++ csw/mgar/pkg/openjpeg/trunk/files/0001-add-pc-file.patch	2014-01-18 10:53:28 UTC (rev 22849)
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -287,3 +287,14 @@ endif()
+ install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+ 
+ include (cmake/OpenJPEGCPack.cmake)
++
++#-----------------------------------------------------------------------------
++# pkgconfig support
++if(UNIX)
++  # install in lib and not share (see multi-arch note above)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
++  install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
++    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++endif()
++#-----------------------------------------------------------------------------
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -0,0 +1,13 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
++mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
++docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
++libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
++includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++
++Name: openjp2
++Description: JPEG2000 library (Part 1 and 2)
++URL: http://www.openjpeg.org/
++Version: @OPENJPEG_VERSION@
++Libs: -L${libdir} -lopenjp2
++Cflags: -I${includedir}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Sat Jan 18 12:49:23 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Sat, 18 Jan 2014 11:49:23 +0000
Subject: SF.net SVN: gar:[22850] csw/mgar/pkg/ImageMagick/trunk/Makefile
Message-ID: <3f5y9S2d31z1S3@mail.opencsw.org>

Revision: 22850
          http://sourceforge.net/p/gar/code/22850
Author:   lblume
Date:     2014-01-18 11:49:21 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
ImageMagick/trunk: Replace libjasper by libopenjp2; Fix fftw3 build dep

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-18 10:53:28 UTC (rev 22849)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-18 11:49:21 UTC (rev 22850)
@@ -33,10 +33,11 @@
 BUILD_DEP_PKGS += CSWlibdjvulibre-dev
 BUILD_DEP_PKGS += CSWilmbase-dev
 BUILD_DEP_PKGS += CSWliblqr-dev
-BUILD_DEP_PKGS += CSWlibjasper-dev
+BUILD_DEP_PKGS += CSWopenjpeg-dev
 BUILD_DEP_PKGS += CSWlibrsvg-dev
 BUILD_DEP_PKGS += CSWliblcms2-dev
 BUILD_DEP_PKGS += CSWgraphviz-dev
+BUILD_DEP_PKGS += CSWlibfftw-dev
 
 PACKAGES += CSWlibmagickcore6q16hdri2
 CATALOGNAME_CSWlibmagickcore6q16hdri2 = libmagickcore6q16hdri2
@@ -112,7 +113,7 @@
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibdjvulibre21
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjasper1
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjpeg2-6
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgcc-s1
@@ -239,6 +240,7 @@
 CONFIGURE_ARGS += --with-rsvg
 CONFIGURE_ARGS += --with-gvc
 CONFIGURE_ARGS += --with-gslib
+CONFIGURE_ARGS += --with-openjp2
 
 # Disable perl completely until it's rebuilt with GCC
 CONFIGURE_ARGS += --without-perl

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 Jan 18 17:01:58 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 18 Jan 2014 16:01:58 +0000
Subject: SF.net SVN: gar:[22851] csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <3f63mv46NNz7b@mail.opencsw.org>

Revision: 22851
          http://sourceforge.net/p/gar/code/22851
Author:   rthurner
Date:     2014-01-18 16:01:56 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
subversion/trunk: adjust dependencies

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2014-01-18 11:49:21 UTC (rev 22850)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2014-01-18 16:01:56 UTC (rev 22851)
@@ -56,12 +56,12 @@
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibneon27
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibserf1-3
 RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibdbus1-3
 RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibgnome-keyring0
 RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibglib2-0-0
 CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3
+CHECKPKG_OVERRIDES_CSWsvn += file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0
 
 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
 
@@ -88,6 +88,10 @@
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0
 CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWsvn
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibapr1-0
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibaprutil1-0
 
 
 PACKAGES += CSWjavasvn
@@ -139,12 +143,14 @@
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython
 
 
 DISTFILES += CSWsvn.checkinstall
 DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
 DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
 
+
 # Fix: Add java headers for nested classes
 # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
 PATCHFILES += javahl_headers_for_nested_classes.diff

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From lblume at users.sourceforge.net  Sat Jan 18 21:57:36 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Sat, 18 Jan 2014 20:57:36 +0000
Subject: SF.net SVN: gar:[22852] csw/mgar/pkg/ImageMagick/trunk/Makefile
Message-ID: <3f6BL84jPHzRh@mail.opencsw.org>

Revision: 22852
          http://sourceforge.net/p/gar/code/22852
Author:   lblume
Date:     2014-01-18 20:57:32 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
ImageMagick/trunk: Incorrect name for the dependency

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-18 16:01:56 UTC (rev 22851)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-01-18 20:57:32 UTC (rev 22852)
@@ -113,7 +113,7 @@
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibdjvulibre21
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjpeg2-6
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjp2-6
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgcc-s1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From rthurner at users.sourceforge.net  Sun Jan 19 08:00:54 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 19 Jan 2014 07:00:54 +0000
Subject: SF.net SVN: gar:[22853] csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <3f6RkC04b9zqg@mail.opencsw.org>

Revision: 22853
          http://sourceforge.net/p/gar/code/22853
Author:   rthurner
Date:     2014-01-19 07:00:51 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
subversion/trunk: subversion, add dependencies required now on sparc??

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2014-01-18 20:57:32 UTC (rev 22852)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2014-01-19 07:00:51 UTC (rev 22853)
@@ -62,6 +62,7 @@
 RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibglib2-0-0
 CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3
 CHECKPKG_OVERRIDES_CSWsvn += file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWlibiconv2
 
 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
 
@@ -106,6 +107,16 @@
 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
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibserf1-3
 
 PACKAGES += CSWpmsvn
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
@@ -118,6 +129,13 @@
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0
 CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibsqlite3-0
 
 
 PACKAGES += CSWrbsvn
@@ -131,6 +149,15 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibserf1-3
 
 
 PACKAGES += CSWpythonsvn
@@ -144,6 +171,16 @@
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibserf1-3
 
 
 DISTFILES += CSWsvn.checkinstall

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 Jan 19 11:44:28 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 19 Jan 2014 10:44:28 +0000
Subject: SF.net SVN: gar:[22854] csw/mgar/pkg/openssl1/trunk
Message-ID: <3f6XjM4cYQz104@mail.opencsw.org>

Revision: 22854
          http://sourceforge.net/p/gar/code/22854
Author:   chninkel
Date:     2014-01-19 10:44:27 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
openssl1/trunk: updated pkcs11 engine patch straight from solaris userland source

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
    csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-19 07:00:51 UTC (rev 22853)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-19 10:44:27 UTC (rev 22854)
@@ -73,6 +73,9 @@
 
 DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE
 
+# List of engines that will be shipped in the packages
+ENGINES = 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi
+
 # configure targets patchs needs to be different for Solaris 9 as some map files
 # are not available 
 ifeq ($(shell /usr/bin/uname -r),5.9)
@@ -121,12 +124,9 @@
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifneq ($(shell /usr/bin/uname -r),5.9)
-# There is a problem with this patch under sparc when using tls protocol
-# See https://www.opencsw.org/mantis/view.php?id=5098
-ifneq ($(shell /usr/bin/uname -p),sparc)
-       PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30
+       PATCHFILES += openssl-1.0.1f-pkcs11-engine.patch
+       ENGINES += pk11
 endif
-endif
 
 # support for sparc t4 crypto engine 
 # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html
@@ -135,11 +135,12 @@
 # To update the patch, do:
 #   cd files && ./update-t4-patch.sh OPENSSL_VERSION
 #
-ifeq ($(shell /usr/bin/uname -rp),5.11 sparc) 
-	PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch
-	PATCHFILES += openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis
-endif
+PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine.sparc-patch
+PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis
 
+PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL))
+
+
 LICENSE = LICENSE
 
 ##### Build and installation information #####
@@ -183,6 +184,13 @@
 # but openssl doesn't use it by default so we manually enable it
 CONFIGURE_FLAGS = -DHAVE_ISSETUGID
 
+# PKCS11 Patch also works on sparc64 athena processors thanks for the FJAES 
+# instruction set. The presence of this instruction set is checked at runtime
+# by looking for the AV_SPARC_JFAES instruction set bit, unfortunately the
+# corresponding macro in not present in Solaris 9-11 headers, so we manually 
+# define it.
+CONFIGURE_FLAGS += -DAV_SPARC_FJAES=0
+
 # --libdir must only be given if the directory is actually different from lib or the creation will fail
 # as the directory is already there
 LIBDIR_64 = --libdir=lib/64
@@ -194,9 +202,7 @@
 ifneq ($(shell /usr/bin/uname -r),5.9)
 # There is a problem with this patch under sparc when using tls protocol
 # See https://www.opencsw.org/mantis/view.php?id=5098
-ifneq ($(shell /usr/bin/uname -p),sparc)
-        CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
-endif
+	CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
 endif 
 
 # For now we want the sun perl to be used
@@ -220,6 +226,7 @@
 
 TEST_SCRIPTS = 
 
+
 include gar/category.mk
 
 # We remove SSE2 hardware capability in the elf header of libcrypto as
@@ -238,7 +245,7 @@
 	cd $(WORKSRC) && ln -nf Configure configure
 	ln -nf $(WORKDIR)/map.openssl.libcrypto $(WORKSRC)/map.openssl.libcrypto 
 	ln -nf $(WORKDIR)/map.openssl.libssl $(WORKSRC)/map.openssl.libssl 
-	for ENGINE in 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi; do \
+	for ENGINE in 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi pk11; do \
 		ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/map.openssl.lib$$ENGINE; \
 	done 
 	ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/ccgost/map.openssl.libgost

Added: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-19 10:44:27 UTC (rev 22854)
@@ -0,0 +1,9007 @@
+--- /tmp/Configure	Fri Feb 11 14:40:39 2011
++++ openssl-1.0.0d/Configure	Fri Feb 11 14:41:36 2011
+@@ -10,7 +10,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] [no-asm] [no-dso] [no-krb5] [sctp] [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] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+ 
+ # Options:
+ #
+@@ -19,6 +19,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".
+@@ -657,6 +661,9 @@
+ my $idx_arflags = $idx++;
+ my $idx_multilib = $idx++;
+ 
++# PKCS#11 engine patch
++my $pk11_libname="";
++
+ my $prefix="";
+ my $libdir="";
+ my $openssldir="";
+@@ -876,6 +879,10 @@
+				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
+				$flags.=$_." ";
+				}
++			elsif (/^--pk11-libname=(.*)$/)
++				{
++				$pk11_libname=$1;
++				}
+			elsif (/^--prefix=(.*)$/)
+				{
+				$prefix=$1;
+@@ -1043,6 +1054,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;
+ }
+@@ -1209,6 +1226,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)
+@@ -1598,6 +1617,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/;
+--- /tmp/Makefile.org	Fri Feb 11 14:41:54 2011
++++ openssl-1.0.0d/Makefile.org	Fri Feb 11 14:38:01 2011
+@@ -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
+ 
+--- /tmp/Makefile	Mon Feb 14 14:59:22 2011
++++ openssl-1.0.0d/engines/Makefile	Mon Feb 14 15:00:35 2011
+@@ -26,7 +26,8 @@
+ APPS=
+ 
+ LIB=$(TOP)/libcrypto.a
+-LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi
++LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi \
++	  pk11
+ 
+ LIBSRC=	e_4758cca.c \
+ 	e_aep.c \
+@@ -38,7 +39,8 @@
+ 	e_sureware.c \
+ 	e_ubsec.c \
+ 	e_padlock.c \
+-	e_capi.c
++	e_capi.c \
++	e_pk11.c
+ LIBOBJ= e_4758cca.o \
+ 	e_aep.o \
+ 	e_atalla.o \
+@@ -49,7 +51,8 @@
+ 	e_sureware.o \
+ 	e_ubsec.o \
+ 	e_padlock.o \
+-	e_capi.o
++	e_capi.o \
++	e_pk11.o
+ 
+ SRC= $(LIBSRC)
+ 
+@@ -63,7 +66,8 @@
+ 	e_nuron_err.c e_nuron_err.h \
+ 	e_sureware_err.c e_sureware_err.h \
+ 	e_ubsec_err.c e_ubsec_err.h \
+-	e_capi_err.c e_capi_err.h
++	e_capi_err.c e_capi_err.h \
++	e_pk11.h e_pk11_uri.h e_pk11_err.h e_pk11_pub.c e_pk11_uri.c e_pk11_err.c
+ 
+ ALL=    $(GENERAL) $(SRC) $(HEADER)
+ 
+@@ -78,7 +82,7 @@
+ 		for l in $(LIBNAMES); do \
+ 			$(MAKE) -f ../Makefile.shared -e \
+ 				LIBNAME=$$l LIBEXTRAS=e_$$l.o \
+-				LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \
++				LIBDEPS='-L.. -lcrypto -lcryptoutil $(EX_LIBS)' \
+ 				link_o.$(SHLIB_TARGET); \
+ 		done; \
+ 	else \
+--- crypto/engine/eng_all.c Thu Sep  5 12:59:50 2013
++++ openssl-1.0.1e/crypto/engine/eng_all.c Thu Sep  5 12:59:50 2013
+@@ -59,6 +59,16 @@
+ #include "cryptlib.h"
+ #include "eng_int.h"
+
++/*
++ * pkcs11 engine no longer is a built-in engine, and ENGINE_load_pk11() needs to be
++ * defined in libcrypto.so for ssh.  Instead of load pkcs11 engine, it load dynamic
++ * engines.
++ */
++void ENGINE_load_pk11(void)
++	{
++	ENGINE_load_dynamic();
++	}
++
+ void ENGINE_load_builtin_engines(void)
+ 	{
+ 	/* Some ENGINEs need this */
+--- crypto/dso/dso_lib.c Thu Sep  5 12:59:50 2013
++++ openssl-1.0.1e/crypto/dso/dso_lib.c Thu Sep  5 12:59:50 2013
+@@ -426,6 +426,26 @@
+ 		DSOerr(DSO_F_DSO_CONVERT_FILENAME,DSO_R_NO_FILENAME);
+ 		return(NULL);
+ 		}
++	/*
++	 * For pkcs11 engine, use libpk11.so (instead of libpkcs11.so) to
++	 * avoid the name collision with PKCS#11 library.
++	 */
++	if (strcmp(filename, "pkcs11") == 0)
++		{
++#ifdef	_LP64
++		char *fullpath = "/lib/openssl/engines/64/libpk11.so";
++#else
++		char *fullpath = "/lib/openssl/engines/libpk11.so";
++#endif
++		result = OPENSSL_malloc(strlen(fullpath) + 1);
++		if(result == NULL)
++			{
++			DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE);
++			return(NULL);
++			}
++		BUF_strlcpy(result, fullpath, strlen(fullpath) + 1);
++		return (result);
++		}
+ 	if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
+ 		{
+ 		if(dso->name_converter != NULL)
+--- /tmp/engine.h       Fri Feb 11 14:46:24 2011
++++ openssl-1.0.0d/crypto/engine/engine.h       Fri Feb 11 14:47:32 2011
+@@ -351,6 +351,7 @@
+ #endif
+ #endif
+ void ENGINE_load_cryptodev(void);
++void ENGINE_load_pk11(void);
+ void ENGINE_load_rsax(void);
+ void ENGINE_load_rdrand(void);
+ void ENGINE_load_builtin_engines(void);
+Index: crypto//e_pk11.c
+===================================================================
+diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
+--- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-19 00:24:23.%N +0100
+@@ -0,0 +1,3710 @@
++/*
++ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
++ */
++
++/* crypto/engine/e_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 
++
++#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
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++#include 
++#endif
++
++#ifdef DEBUG_SLOT_SELECTION
++#define	DEBUG_SLOT_SEL(...) fprintf(stderr, __VA_ARGS__)
++#else
++#define	DEBUG_SLOT_SEL(...)
++#endif
++
++#include 
++#include 
++#include "e_pk11.h"
++#include "e_pk11_uri.h"
++
++static CK_BBOOL pk11_true = CK_TRUE;
++static CK_BBOOL pk11_false = CK_FALSE;
++#define	PK11_ENGINE_LIB_NAME "PKCS#11 engine"
++#include "e_pk11_err.c"
++#include "e_pk11_uri.c"
++#include "e_pk11_pub.c"
++
++/*
++ * 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 = NULL;
++
++#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;
++
++/* 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,
++	PK11_AES_128_CTR,
++	PK11_AES_192_CTR,
++	PK11_AES_256_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
++	};
++
++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;
++
++typedef struct PK11_DIGEST_st
++	{
++	enum pk11_digest_id	id;
++	int			nid;
++	CK_MECHANISM_TYPE	mech_type;
++	} PK11_DIGEST;
++
++/* 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);
++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, size_t 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_choose_rand_slot(CK_TOKEN_INFO token_info,
++    CK_SLOT_ID current_slot);
++static void pk11_choose_pubkey_slot(CK_MECHANISM_INFO mech_info,
++    CK_TOKEN_INFO token_info, CK_SLOT_ID current_slot, CK_RV rv,
++    int best_number_of_mechs, CK_SLOT_ID best_pubkey_slot_sofar);
++static void pk11_choose_cipher_digest(int *local_cipher_nids,
++    int *local_digest_nids, CK_FUNCTION_LIST_PTR pflist,
++    CK_SLOT_ID current_slot);
++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,
++    int *current_slot_n_cipher, int *local_cipher_nids,
++    PK11_CIPHER *cipher);
++static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id,
++    int *current_slot_n_digest, int *local_digest_nids,
++    PK11_DIGEST *digest);
++
++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);
++static int hw_aes_instruction_set_present(void);
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++
++#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;
++
++/*
++ * Static list of ciphers.
++ * Note, that ciphers array is indexed by member PK11_CIPHER.id,
++ * thus ciphers[i].id == i
++ * Rows must be kept in sync with enum pk11_cipher_id.
++ */
++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, },
++	{ PK11_AES_128_CTR,	NID_aes_128_ctr,	16,	16,  16,
++		CKK_AES,	CKM_AES_CTR, },
++	{ PK11_AES_192_CTR,	NID_aes_192_ctr,	16,	24,  24,
++		CKK_AES,	CKM_AES_CTR, },
++	{ PK11_AES_256_CTR,	NID_aes_256_ctr,	16,	32,  32,
++		CKK_AES,	CKM_AES_CTR, },
++	};
++
++/*
++ * Static list of digests.
++ * Note, that digests array is indexed by member PK11_DIGEST.id,
++ * thus digests[i].id == i
++ * Rows must be kept in sync with enum pk11_digest_id.
++ */
++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
++	};
++
++static EVP_CIPHER pk11_aes_128_ctr =
++	{
++	NID_aes_128_ctr,
++	16, 16, 16,
++	EVP_CIPH_CTR_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_aes_192_ctr,
++	16, 24, 16,
++	EVP_CIPH_CTR_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_aes_256_ctr,
++	16, 32, 16,
++	EVP_CIPH_CTR_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_bf_cbc =
++	{
++	NID_bf_cbc,
++	8, 16, 8,
++	EVP_CIPH_VARIABLE_LENGTH | 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_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,
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
++	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,
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
++	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,
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
++	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,
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
++	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,
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
++	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;
++
++/* Needed in e_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 = CK_FALSE;
++static CK_BBOOL pk11_atfork_initialized = CK_FALSE;
++static int pk11_pid = 0;
++static ENGINE* pk11_engine = NULL;
++
++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;
++			}
++		}
++	/* Free uri_lock */
++	(void) pthread_mutex_destroy(uri_lock);
++	OPENSSL_free(uri_lock);
++	uri_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);
++
++	if (!ENGINE_set_pkey_meths(e, pk11_engine_pkey_methods))
++		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);
++		DEBUG_SLOT_SEL("%s: registered RSA\n", PK11_DBG);
++		}
++#endif	/* OPENSSL_NO_RSA */
++#ifndef OPENSSL_NO_DSA
++	if (pk11_have_dsa == CK_TRUE)
++		{
++		if (!ENGINE_set_DSA(e, PK11_DSA()))
++			return (0);
++		DEBUG_SLOT_SEL("%s: registered DSA\n", PK11_DBG);
++		}
++#endif	/* OPENSSL_NO_DSA */
++#ifndef OPENSSL_NO_DH
++	if (pk11_have_dh == CK_TRUE)
++		{
++		if (!ENGINE_set_DH(e, PK11_DH()))
++			return (0);
++		DEBUG_SLOT_SEL("%s: registered DH\n", PK11_DBG);
++		}
++#endif	/* OPENSSL_NO_DH */
++	if (pk11_have_random)
++		{
++		if (!ENGINE_set_RAND(e, &pk11_random))
++			return (0);
++		DEBUG_SLOT_SEL("%s: registered random\n", PK11_DBG);
++		}
++	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);
++	}
++
++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)
++
++/*
++ * 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));
++	}
++
++/*
++ * Helper function that unsets reference to current engine (pk11_engine = NULL).
++ *
++ * Use of local variable only seems clumsy, it needs to be this way!
++ * This is to prevent double free in the unlucky scenario:
++ *     ENGINE_free calls pk11_destroy calls pk11_finish calls ENGINE_free
++ * Setting pk11_engine to NULL prior to ENGINE_free() avoids this.
++ */
++static void pk11_engine_free()
++	{
++	ENGINE* old_engine = pk11_engine;
++
++	if (old_engine)
++		{
++		pk11_engine = NULL;
++		}
++	}
++
++/*
++ * 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;
++
++	if (e != pk11_engine)
++		{
++		pk11_engine_free();
++		pk11_engine = e;
++		}
++
++	/*
++	 * 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();
++			}
++		}
++
++
++	/* 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);
++			goto err;
++			}
++		}
++
++#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)
++		{
++		DEBUG_SLOT_SEL("%s: C_GetOperationState() not supported, "
++		    "setting digest_count to 0\n", PK11_DBG);
++		digest_count = 0;
++		}
++
++	pk11_library_initialized = CK_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 = CK_TRUE;
++		}
++
++	return (1);
++
++err:
++	return (0);
++	}
++
++/* Destructor (complements the "ENGINE_pk11()" constructor) */
++/* ARGSUSED */
++static int pk11_destroy(ENGINE *e)
++	{
++	int rtn = 1;
++
++	free_PK11_LIBNAME();
++	ERR_unload_pk11_strings();
++	if (pk11_library_initialized == CK_TRUE)
++		rtn = pk11_finish(e);
++
++	return (rtn);
++	}
++
++/*
++ * Termination function to clean up the session, the token, and the pk11
++ * library.
++ */
++/* ARGSUSED */
++static int pk11_finish(ENGINE *e)
++	{
++	int i;
++
++	/*
++	 * Make sure, right engine instance is being destroyed.
++	 * Engine e may be the wrong instance if
++	 * 	1) either someone calls ENGINE_load_pk11 twice
++	 * 	2) or last ref. to an already finished engine is being destroyed
++	 */
++	if (e != pk11_engine)
++		goto err;
++
++	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 = CK_FALSE;
++	pk11_pid = 0;
++	pk11_engine_free();
++	/*
++	 * 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 uninitialized (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;
++	DEBUG_SLOT_SEL("%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype);
++	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 = CK_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 all non-NULL RSA parameters. For the RSA keys by reference code,
++ * public components 'n'/'e' are the key components we use to check for the
++ * cache hit even for the private keys. So, no matter whether we are destroying
++ * a public or a private key, we always free what we can.
++ */
++static void
++destroy_all_rsa_params(PK11_SESSION *sp)
++	{
++	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;
++		}
++	}
++
++/* 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;
++		destroy_all_rsa_params(sp);
++		}
++
++	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;
++		destroy_all_rsa_params(sp);
++		}
++
++	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 = CK_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 = CK_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 = CK_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 = CK_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 = CK_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 = CK_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;
++	CK_AES_CTR_PARAMS ctr_params;
++
++	/*
++	 * We expect pmech->mechanism to be already set and
++	 * pParameter/ulParameterLen initialized to NULL/0 before
++	 * pk11_init_symmetric() is called.
++	 */
++	OPENSSL_assert(pmech->mechanism != NULL);
++	OPENSSL_assert(pmech->pParameter == NULL);
++	OPENSSL_assert(pmech->ulParameterLen == 0);
++
++	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
++		{
++		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, size_t 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_aes_128_ctr:
++			*cipher = &pk11_aes_128_ctr;
++			break;
++		case NID_aes_192_ctr:
++			*cipher = &pk11_aes_192_ctr;
++			break;
++		case NID_aes_256_ctr:
++			*cipher = &pk11_aes_256_ctr;
++			break;
++		case NID_bf_cbc:
++			*cipher = &pk11_bf_cbc;
++			break;
++		case NID_rc4:
++			*cipher = &pk11_rc4;
++			break;
++		default:
++			*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;
++		/*
++		 * A special case. For "openssl dgst -dss1 -engine pkcs11 ...",
++		 * OpenSSL calls EVP_get_digestbyname() on "dss1" which ends up
++		 * calling pk11_engine_digests() for NID_dsa. Internally, if an
++		 * engine is not used, OpenSSL uses SHA1_Init() as expected for
++		 * DSA. So, we must return pk11_sha1() for NID_dsa as well. Note
++		 * that this must have changed between 0.9.8 and 1.0.0 since we
++		 * did not have the problem with the 0.9.8 version.
++		 */
++		case NID_sha1:
++		case NID_dsa:
++			*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, &pk11_false, sizeof (pk11_false)},
++		{CKA_ENCRYPT, &pk11_true, sizeof (pk11_true)},
++		{CKA_DECRYPT, &pk11_true, sizeof (pk11_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;
++
++	if (from->md_data == NULL || to->digest->ctx_size == 0)
++		return (1);
++
++	/* The copy-from state */
++	state = (PK11_CIPHER_STATE *) from->md_data;
++	if (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_pubkey_slot_sofar;
++	CK_SLOT_ID current_slot = 0;
++	int best_number_of_mechs = 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)
++		{
++		DEBUG_SLOT_SEL("%s: no crypto providers found\n", PK11_DBG);
++		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);
++		}
++
++	DEBUG_SLOT_SEL("%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME);
++	DEBUG_SLOT_SEL("%s: number of slots: %d\n", PK11_DBG, ulSlotCount);
++
++	pubkey_SLOTID = pSlotList[0];
++	for (i = 0; i < ulSlotCount; i++)
++		{
++		current_slot = pSlotList[i];
++		DEBUG_SLOT_SEL("%s: == checking slot: %d ==\n", PK11_DBG,
++		    current_slot);
++		rv = pFuncList->C_GetTokenInfo(current_slot, &token_info);
++		if (rv != CKR_OK)
++			continue;
++
++		DEBUG_SLOT_SEL("%s: token label: %.32s\n", PK11_DBG,
++		    token_info.label);
++
++		pk11_choose_rand_slot(token_info, current_slot);
++
++		pk11_choose_pubkey_slot(mech_info, token_info, current_slot,
++			rv, best_number_of_mechs, best_pubkey_slot_sofar);
++
++		pk11_choose_cipher_digest(&local_cipher_nids,
++			&local_digest_nids, pFuncList, current_slot);
++		}
++
++	if (best_number_of_mechs == 0)
++		{
++		DEBUG_SLOT_SEL("%s: no rsa/dsa/dh\n", PK11_DBG);
++		}
++	else
++		{
++		pubkey_SLOTID = best_pubkey_slot_sofar;
++		}
++
++	DEBUG_SLOT_SEL("%s: chosen pubkey slot: %d\n", PK11_DBG, pubkey_SLOTID);
++	DEBUG_SLOT_SEL("%s: chosen rand slot: %d\n", PK11_DBG, rand_SLOTID);
++	DEBUG_SLOT_SEL("%s: chosen cipher/digest slot: %d\n", PK11_DBG, SLOTID);
++	DEBUG_SLOT_SEL("%s: pk11_have_rsa %d\n", PK11_DBG, pk11_have_rsa);
++	DEBUG_SLOT_SEL("%s: pk11_have_dsa %d\n", PK11_DBG, pk11_have_dsa);
++	DEBUG_SLOT_SEL("%s: pk11_have_dh %d\n", PK11_DBG, pk11_have_dh);
++	DEBUG_SLOT_SEL("%s: pk11_have_random %d\n", PK11_DBG, pk11_have_random);
++	DEBUG_SLOT_SEL("%s: cipher_count %d\n", PK11_DBG, cipher_count);
++	DEBUG_SLOT_SEL("%s: digest_count %d\n", PK11_DBG, digest_count);
++
++	if (pSlotList != NULL)
++		OPENSSL_free(pSlotList);
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++	OPENSSL_free(hw_cnids);
++	OPENSSL_free(hw_dnids);
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++
++	if (any_slot_found != NULL)
++		*any_slot_found = 1;
++	return (1);
++	}
++
++static void pk11_choose_rand_slot(CK_TOKEN_INFO token_info,
++    CK_SLOT_ID current_slot)
++	{
++	DEBUG_SLOT_SEL("%s: checking rand slots\n", PK11_DBG);
++	if (((token_info.flags & CKF_RNG) != 0) && !pk11_have_random)
++		{
++		DEBUG_SLOT_SEL("%s: this token has CKF_RNG flag\n", PK11_DBG);
++		pk11_have_random = CK_TRUE;
++		rand_SLOTID = current_slot;
++		}
++	}
++
++static void pk11_choose_pubkey_slot(CK_MECHANISM_INFO mech_info,
++    CK_TOKEN_INFO token_info, CK_SLOT_ID current_slot, CK_RV rv,
++    int best_number_of_mechs, CK_SLOT_ID best_pubkey_slot_sofar)
++	{
++	CK_BBOOL slot_has_rsa = CK_FALSE;
++	CK_BBOOL slot_has_dsa = CK_FALSE;
++	CK_BBOOL slot_has_dh = CK_FALSE;
++	int current_number_of_mechs = 0;
++
++	DEBUG_SLOT_SEL("%s: checking pubkey slots\n", PK11_DBG);
++
++#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;
++			current_number_of_mechs++;
++			}
++		}
++#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;
++		current_number_of_mechs++;
++		}
++#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;
++			current_number_of_mechs++;
++			}
++		}
++#endif  /* OPENSSL_NO_DH */
++
++	if (current_number_of_mechs > best_number_of_mechs)
++		{
++		best_pubkey_slot_sofar = current_slot;
++		pk11_have_rsa = slot_has_rsa;
++		pk11_have_dsa = slot_has_dsa;
++		pk11_have_dh = slot_has_dh;
++		best_number_of_mechs = current_number_of_mechs;
++		/*
++		 * Cache the flags for later use. We might need those if
++		 * RSA keys by reference feature is used.
++		 */
++		pubkey_token_flags = token_info.flags;
++		DEBUG_SLOT_SEL("%s: pubkey flags changed to "
++		    "%lu.\n", PK11_DBG, pubkey_token_flags);
++		}
++	}
++
++static void pk11_choose_cipher_digest(int *local_cipher_nids,
++    int *local_digest_nids, CK_FUNCTION_LIST_PTR pflist,
++    CK_SLOT_ID current_slot)
++	{
++	int current_slot_n_cipher = 0;
++	int current_slot_n_digest = 0;
++
++	DEBUG_SLOT_SEL("%s: checking cipher/digest\n", PK11_DBG);
++
++	(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);
++
++	DEBUG_SLOT_SEL("%s: current_slot_n_cipher %d\n", PK11_DBG,
++		current_slot_n_cipher);
++	DEBUG_SLOT_SEL("%s: current_slot_n_digest %d\n", PK11_DBG,
++		current_slot_n_digest);
++	/*
++	 * 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) >
++	    (cipher_count + digest_count))
++		{
++		DEBUG_SLOT_SEL("%s: changing best slot to %d\n",
++			PK11_DBG, current_slot);
++		SLOTID = current_slot;
++		cipher_count = current_slot_n_cipher;
++		digest_count = 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));
++		}
++	}
++
++static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR pflist,
++    int slot_id, int *current_slot_n_cipher, int *local_cipher_nids,
++    PK11_CIPHER *cipher)
++	{
++	static CK_MECHANISM_INFO mech_info;
++	static CK_RV rv;
++	static CK_MECHANISM_TYPE last_checked_mech = (CK_MECHANISM_TYPE)-1;
++
++	DEBUG_SLOT_SEL("%s: checking mech: %x", PK11_DBG, cipher->mech_type);
++	if (cipher->mech_type != last_checked_mech)
++		{
++		rv = pflist->C_GetMechanismInfo(slot_id, cipher->mech_type,
++		    &mech_info);
++		}
++
++	last_checked_mech = cipher->mech_type;
++
++	if (rv != CKR_OK)
++		{
++		DEBUG_SLOT_SEL(" not found\n");
++		return;
++		}
++
++	if ((mech_info.flags & CKF_ENCRYPT) &&
++	    (mech_info.flags & CKF_DECRYPT))
++		{
++		if (mech_info.ulMinKeySize > cipher->min_key_len ||
++		    mech_info.ulMaxKeySize < cipher->max_key_len)
++			{
++			DEBUG_SLOT_SEL(" engine key size range <%i-%i> does not"
++			    " match mech range <%lu-%lu>\n",
++			    cipher->min_key_len, cipher->max_key_len,
++			    mech_info.ulMinKeySize, mech_info.ulMaxKeySize);
++			return;
++			}
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++		if (nid_in_table(cipher->nid, hw_cnids))
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++			{
++			DEBUG_SLOT_SEL(" usable\n");
++			local_cipher_nids[(*current_slot_n_cipher)++] =
++			    cipher->nid;
++			}
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++		else
++			{
++			DEBUG_SLOT_SEL(
++			    " rejected, software implementation only\n");
++			}
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++		}
++	else
++		{
++		DEBUG_SLOT_SEL(" unusable\n");
++		}
++
++	return;
++	}
++
++static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id,
++    int *current_slot_n_digest, int *local_digest_nids, PK11_DIGEST *digest)
++	{
++	CK_MECHANISM_INFO mech_info;
++	CK_RV rv;
++
++	DEBUG_SLOT_SEL("%s: checking mech: %x", PK11_DBG, digest->mech_type);
++	rv = pflist->C_GetMechanismInfo(slot_id, digest->mech_type, &mech_info);
++
++	if (rv != CKR_OK)
++		{
++		DEBUG_SLOT_SEL(" not found\n");
++		return;
++		}
++
++	if (mech_info.flags & CKF_DIGEST)
++		{
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++		if (nid_in_table(digest->nid, hw_dnids))
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++			{
++			DEBUG_SLOT_SEL(" usable\n");
++			local_digest_nids[(*current_slot_n_digest)++] =
++			    digest->nid;
++			}
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++		else
++			{
++			DEBUG_SLOT_SEL(
++			    " rejected, software implementation only\n");
++			}
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++		}
++	else
++		{
++		DEBUG_SLOT_SEL(" unusable\n");
++		}
++
++	return;
++	}
++
++/* Find what symmetric ciphers this slot supports. */
++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)
++	{
++	int i;
++
++	for (i = 0; i < PK11_CIPHER_MAX; ++i)
++		{
++		pk11_get_symmetric_cipher(pflist, current_slot,
++		    current_slot_n_cipher, local_cipher_nids, &ciphers[i]);
++		}
++	}
++
++/* Find what digest algorithms this slot supports. */
++static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist,
++    CK_SLOT_ID current_slot, int *current_slot_n_digest, int *local_digest_nids)
++	{
++	int i;
++
++	for (i = 0; i < PK11_DIGEST_MAX; ++i)
++		{
++		pk11_get_digest(pflist, current_slot, current_slot_n_digest,
++		    local_digest_nids, &digests[i]);
++		}
++	}
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++/*
++ * It would be great if we could use pkcs11_kernel directly since this library
++ * offers hardware slots only. That's the easiest way to achieve the situation
++ * where we use the hardware accelerators when present and OpenSSL native code
++ * otherwise. That presumes the fact that OpenSSL native code is faster than the
++ * code in the soft token. It's a logical assumption - Crypto Framework has some
++ * inherent overhead so going there for the software implementation of a
++ * mechanism should be logically slower in contrast to the OpenSSL native code,
++ * presuming that both implementations are of similar speed. For example, the
++ * soft token for AES is roughly three times slower than OpenSSL for 64 byte
++ * blocks and still 20% slower for 8KB blocks. So, if we want to ship products
++ * that use the PKCS#11 engine by default, we must somehow avoid that regression
++ * on machines without hardware acceleration. That's why switching to the
++ * pkcs11_kernel library seems like a very good idea.
++ *

@@ 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 Jan 19 13:06:12 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 19 Jan 2014 12:06:12 +0000
Subject: SF.net SVN: gar:[22855]
	csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
Message-ID: <3f6ZVP1TGzz16B@mail.opencsw.org>

Revision: 22855
          http://sourceforge.net/p/gar/code/22855
Author:   chninkel
Date:     2014-01-19 12:06:08 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
openssl1/trunk: updated changelog

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-01-19 10:44:27 UTC (rev 22854)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-01-19 12:06:08 UTC (rev 22855)
@@ -1,3 +1,10 @@
+openssl (1.0.1f,rev=2014.01.19) unstable
+
+  * Update pkcs11 engine patch from Oracle userland sources.
+  * Re-enabled pkcs11 engine support for sparc.
+
+   -- yann rouillard   Sun, 19 Jan 2014 13:05:33 +0100
+
 openssl (1.0.1f,rev=2014.01.06) unstable
 
   * New upstream release.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Sun Jan 19 18:48:32 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 19 Jan 2014 17:48:32 +0000
Subject: SF.net SVN: gar:[22856] csw/mgar/pkg/openssl1/trunk
Message-ID: <3f6k6k0DMSz1L0@mail.opencsw.org>

Revision: 22856
          http://sourceforge.net/p/gar/code/22856
Author:   chninkel
Date:     2014-01-19 17:48:29 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
openssl1/trunk: Updated t4 engine patch from Oracle userland sources

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
    csw/mgar/pkg/openssl1/trunk/files/update-t4-patch.sh

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch

Removed Paths:
-------------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-19 12:06:08 UTC (rev 22855)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-19 17:48:29 UTC (rev 22856)
@@ -135,8 +135,8 @@
 # To update the patch, do:
 #   cd files && ./update-t4-patch.sh OPENSSL_VERSION
 #
-PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine.sparc-patch
-PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis
+PATCHFILES.sparc.5.11 += openssl-1.0.1f-t4-engine.sparc.5.11.patch
+PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch
 
 PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL))
 

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-01-19 12:06:08 UTC (rev 22855)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-01-19 17:48:29 UTC (rev 22856)
@@ -2,6 +2,7 @@
 
   * Update pkcs11 engine patch from Oracle userland sources.
   * Re-enabled pkcs11 engine support for sparc.
+  * Update t4 engine patch from Oracle userland sources.
 
    -- yann rouillard   Sun, 19 Jan 2014 13:05:33 +0100
 

Copied: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch (from rev 22198, csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch.sparcv9+vis)
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch	2014-01-19 17:48:29 UTC (rev 22856)
@@ -0,0 +1,25 @@
+From 3b63574c8a3ba589f9a69bece6931a22a73675d2 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard 
+Date: Mon, 11 Mar 2013 23:41:45 +0100
+Subject: [PATCH] t4 engine complement patch for sparcv9+vis target
+
+---
+ Configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configure b/Configure
+index 3f32e5a..e3bf481 100755
+--- a/Configure
++++ b/Configure
+@@ -278,7 +278,7 @@ my %table=(
+ #
+ "solaris-sparcv8-cc-sunw","cc:-xtarget=v8 -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #
+-"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-sparcv9+vis-cc-sunw","cc:-xtarget=ultra -m32 -xarch=sparcvis -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ 
+ #### IRIX 5.x configs
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch	2014-01-19 12:06:08 UTC (rev 22855)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1e-t4-engine.sparc-patch	2014-01-19 17:48:29 UTC (rev 22856)
@@ -1,8618 +0,0 @@
-#
-# Engine t4 patch openssl-1.0.0d-t4-engine.sparc-patch.
-# This engine is SPARC-only.
-#
-Index: Configure
-===================================================================
-diff -ru openssl-1.0.0d/Configure openssl-1.0.0d/Configure
---- openssl-1.0.0d/Configure	2011-05-24 17:02:24.000000000 -0700
-+++ openssl-1.0.0d/Configure	2011-07-27 10:48:17.817470000 -0700
-@@ -135,8 +135,9 @@
-
- my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";
- my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
--my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";
--my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
-+my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o t4_des.o:aes_core.o aes_cbc.o aes-sparcv9.o t4_aes.o::t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void";
-+my $sparcv9_fips_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o:des_enc-sparc.o fcrypt_b.o t4_des.o:aes_core.o aes_cbc.o aes-sparcv9.o t4_aes.o::t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void";
-+my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o t4_des.o:t4_aes.o::t4_md5.o:t4_sha1.o t4_sha2.o:::::::void";
- my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";
- my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";
- my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
-@@ -264,9 +264,11 @@
- #
- "solaris64-x86_64-cc-sunw","cc:-xO3 -m64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -lc:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR DES_PTR DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign -M/usr/lib/ld/map.noexdata:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- #
--"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv9-cc-sunw","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv9-cc-sunw-fips","cc:-xtarget=ultra -m32 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_fips_asm}:dlfcn:solaris-shared:-KPIC:-m32 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- #
--"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
-+"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
-+"solaris64-sparcv9-cc-sunw-fips","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc -lsoftcrypto:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_fips_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
- # Option -xF=%all instructs the compiler to place functions and data
- # variables into separate section fragments. This enables the link editor
- # to discard unused sections and files when linking wanboot-openssl.o
-Index: crypto/aes/Makefile
-===================================================================
-diff -ru openssl-1.0.0d/crypto/aes/ openssl-1.0.0d/crypto/aes/Makefile
---- openssl-1.0.0d/crypto/aes/Makefile	2011-05-24 17:03:31.000000000 -0700
-+++ openssl-1.0.0d/crypto/aes/Makefile	2011-06-30 17:26:34.980110000 -0700
-@@ -17,6 +17,10 @@
- ASFLAGS= $(INCLUDES) $(ASFLAG)
- AFLAGS= $(ASFLAGS)
- 
-+BITS:=	$(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \
-+		then echo 32; else echo 64; fi)
-+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS)
-+
- GENERAL=Makefile
- #TEST=aestest.c
- TEST=
-@@ -69,6 +73,10 @@
- aes-sparcv9.s: asm/aes-sparcv9.pl
- 	$(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
- 
-+t4_aes.o: asm/t4_aes.S
-+	as $(ASFLAGSYF) -o $@ asm/t4_aes.S
-+	elfedit -e 'cap:hw1 -and -cmp vis vis3' $@
-+
- aes-ppc.s:	asm/aes-ppc.pl
- 	$(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@
- 
-Index: crypto/des/Makefile
-===================================================================
-diff -ru openssl-1.0.0d/crypto/des/ openssl-1.0.0d/crypto/des/Makefile
---- openssl-1.0.0d/crypto/des/Makefile	2011-07-26 17:47:28.530315349 -0700
-+++ openssl-1.0.0d/crypto/des/Makefile	2011-07-27 10:41:47.362058958 -0700
-@@ -17,6 +17,10 @@
- ASFLAGS= $(INCLUDES) $(ASFLAG)
- AFLAGS= $(ASFLAGS)
- 
-+BITS:=	$(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \
-+		then echo 32; else echo 64; fi)
-+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS)
-+
- GENERAL=Makefile
- TEST=destest.c
- APPS=
-@@ -61,6 +65,10 @@
- 
- des_enc-sparc.S:	asm/des_enc.m4
- 	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
-+ 
-+t4_des.o: asm/t4_des.S
-+	as $(ASFLAGSYF) -o $@ asm/t4_des.S
-+	elfedit -e 'cap:hw1 -and -cmp vis vis3' $@
- 
- des-586.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
- 	$(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
-Index: crypto/engine/Makefile
-===================================================================
-diff -ru openssl-1.0.0d/crypto/engine/Makefile openssl-1.0.0d/crypto/engine/Makefile
---- openssl-1.0.0d/crypto/engine/Makefile	2011-05-24 17:04:12.000000000 -0700
-+++ openssl-1.0.0d/crypto/engine/Makefile	2011-07-28 10:10:00.000000000 -0700
-@@ -22,12 +22,16 @@
- 	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 tb_pkmeth.c tb_asnmth.c \
- 	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
-+	eng_t4.c eng_t4_des.c eng_t4_md5.c \
-+	eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c eng_t4_montmul.c \
- 	eng_rsax.c eng_rdrand.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 tb_pkmeth.o tb_asnmth.o \
- 	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \
-+	eng_t4.o eng_t4_des.o eng_t4_md5.o \
-+	eng_t4_sha1.o eng_t4_sha256.o eng_t4_sha512.o eng_t4_montmul.o \
- 	eng_rsax.o eng_rdrand.o
- 
- SRC= $(LIBSRC)
-Index: crypto/engine/eng_all.c
-===================================================================
-diff -ru openssl-1.0.0d/crypto/engine/eng_all.c openssl-1.0.0d/crypto/engine/eng_all.c
---- openssl-1.0.0d/crypto/engine/eng_all.c	2011-05-24 17:02:20.000000000 -0700
-+++ openssl-1.0.0d/crypto/engine/eng_all.c	2011-06-22 17:34:25.145829355 -0700
-@@ -79,6 +79,10 @@
- #ifndef OPENSSL_NO_RDRAND
-	ENGINE_load_rdrand();
- #endif
-+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_T4)
-+	ENGINE_load_t4();
-+	ENGINE_register_all_complete();
-+#endif
-	ENGINE_load_dynamic();
- #ifndef OPENSSL_NO_HW_PKCS11
-	ENGINE_load_pk11();
-Index: crypto/engine/engine.h
-==================================================================
-diff -ru openssl-1.0.0d/crypto/engine/engine.h openssl-1.0.0d/crypto/engine/engine.h
---- openssl-1.0.0d/crypto/engine/engine.h	2011-05-24 17:02:20.000000000 -0700
-+++ openssl-1.0.0d/crypto/engine/engine.h	2011-05-24 18:05:29.075766123 -0700
-@@ -351,5 +351,6 @@
- #endif
- #endif
- void ENGINE_load_cryptodev(void);
-+void ENGINE_load_t4(void);
- void ENGINE_load_rsax(void);
- void ENGINE_load_rdrand(void);
-Index: crypto/md5/Makefile
-==================================================================
-diff -ru openssl-1.0.0d/crypto/md5/Makefile openssl-1.0.0d/crypto/md5/Makefile
---- openssl-1.0.0d/crypto/md5/Makefile	2011-05-24 17:03:14.000000000 -0700
-+++ openssl-1.0.0d/crypto/md5/Makefile	2011-08-27 16:01:49.000000000 -0700
-@@ -17,6 +17,10 @@
- ASFLAGS= $(INCLUDES) $(ASFLAG)
- AFLAGS= $(ASFLAGS)
- 
-+BITS:=	$(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \
-+		then echo 32; else echo 64; fi)
-+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS)
-+
- GENERAL=Makefile
- TEST=md5test.c
- APPS=
-@@ -52,6 +58,10 @@
- 	$(CC) $(CFLAGS) -E asm/md5-ia64.S | \
- 	$(PERL) -ne 's/;\s+/;\n/g; print;' > $@
- 
-+t4_md5.o: asm/t4_md5.S
-+	as $(ASFLAGSYF) -o $@ asm/t4_md5.S
-+	elfedit -e 'cap:hw1 -and -cmp vis vis3' $@
-+
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
- 
-Index: crypto/sha/Makefile
-==================================================================
-diff -ru openssl-1.0.0d/crypto/sha/Makefile openssl-1.0.0d/crypto/sha/Makefile
---- openssl-1.0.0d/crypto/sha/Makefile	2011-05-24 17:03:18.000000000 -0700
-+++ openssl-1.0.0d/crypto/sha/Makefile	2011-08-27 16:01:49.000000000 -0700
-@@ -17,6 +17,10 @@
- ASFLAGS= $(INCLUDES) $(ASFLAG)
- AFLAGS= $(ASFLAGS)
- 
-+BITS:=	$(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \
-+		then echo 32; else echo 64; fi)
-+ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS)
-+
- GENERAL=Makefile
- TEST=shatest.c sha1test.c sha256t.c sha512t.c
- APPS=
-@@ -91,6 +95,14 @@
- sha256-armv4.o:		sha256-armv4.S
- sha512-armv4.o:		sha512-armv4.S
- 
-+t4_sha1.o:	asm/t4_sha1.S
-+	as $(ASFLAGSYF) -o $@ asm/t4_sha1.S
-+	elfedit -e 'cap:hw1 -and -cmp vis vis3' $@
-+
-+t4_sha2.o:	asm/t4_sha2.S
-+	as $(ASFLAGSYF) -o $@ asm/t4_sha2.S
-+	elfedit -e 'cap:hw1 -and -cmp vis vis3' $@
-+
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
- 
-Index: util/libeay.num
-==================================================================
-diff -ru openssl-1.0.0d/util/libeay.num openssl-1.0.0d/util/libeay.num
---- openssl-1.0.0d/util/libeay.num	2010-07-25 09:56:06.000000000 -0700
-+++ openssl-1.0.0d/util/libeay.num	2011-05-25 11:19:15.585211842 -0700
-@@ -4179,6 +4179,7 @@
- UI_method_set_prompt_constructor        4551	EXIST:!VMS:FUNCTION:
- UI_method_set_prompt_constructr         4551	EXIST:VMS:FUNCTION:
- EVP_read_pw_string_min                  4552	EXIST::FUNCTION:
-+ENGINE_load_t4                          4553	EXIST::FUNCTION:ENGINE
- CRYPTO_cts128_encrypt                   4553	EXIST::FUNCTION:
- CRYPTO_cts128_decrypt_block             4554	EXIST::FUNCTION:
- CRYPTO_cfb128_1_encrypt                 4555	EXIST::FUNCTION:
-Index: crypto/engine/eng_t4_aes_asm.h
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_aes_asm.h openssl-1.0.1e/engine/eng_t4_aes_asm.h
---- openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_aes_asm.h 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,147 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1999-2007 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+#ifndef	ENG_T4_AES_ASM_H
-+#define	ENG_T4_AES_ASM_H
-+
-+/*
-+ * SPARC AES assembly language functions.
-+ *
-+ * Based on Solaris file aes_impl.h.
-+ */
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+#include 
-+
-+#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \
-+	defined(__sparcv8)) && ! defined(OPENSSL_NO_ASM)
-+
-+extern void t4_aes_expand128(uint64_t *rk, const uint32_t *key);
-+extern void t4_aes_expand192(uint64_t *rk, const uint32_t *key);
-+extern void t4_aes_expand256(uint64_t *rk, const uint32_t *key);
-+extern void t4_aes_encrypt128(const uint64_t *rk, const uint32_t *pt,
-+    uint32_t *ct);
-+extern void t4_aes_encrypt192(const uint64_t *rk, const uint32_t *pt,
-+    uint32_t *ct);
-+extern void t4_aes_encrypt256(const uint64_t *rk, const uint32_t *pt,
-+    uint32_t *ct);
-+extern void t4_aes_decrypt128(const uint64_t *rk, const uint32_t *ct,
-+    uint32_t *pt);
-+extern void t4_aes_decrypt192(const uint64_t *rk, const uint32_t *ct,
-+    uint32_t *pt);
-+extern void t4_aes_decrypt256(const uint64_t *rk, const uint32_t *ct,
-+    uint32_t *pt);
-+extern void t4_aes128_load_keys_for_encrypt(uint64_t *ks);
-+extern void t4_aes192_load_keys_for_encrypt(uint64_t *ks);
-+extern void t4_aes256_load_keys_for_encrypt(uint64_t *ks);
-+extern void t4_aes128_ecb_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy);
-+extern void t4_aes192_ecb_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy);
-+extern void t4_aes256_ecb_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *dummy);
-+extern void t4_aes128_cbc_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes192_cbc_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes256_cbc_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes128_ctr_crypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes192_ctr_crypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes256_ctr_crypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes128_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes192_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes256_cfb128_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_encrypt, uint64_t *iv);
-+extern void t4_aes128_load_keys_for_decrypt(uint64_t *ks);
-+extern void t4_aes192_load_keys_for_decrypt(uint64_t *ks);
-+extern void t4_aes256_load_keys_for_decrypt(uint64_t *ks);
-+extern void t4_aes128_ecb_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy);
-+extern void t4_aes192_ecb_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy);
-+extern void t4_aes256_ecb_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *dummy);
-+extern void t4_aes128_cbc_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+extern void t4_aes192_cbc_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+extern void t4_aes256_cbc_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+extern void t4_aes128_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+extern void t4_aes192_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+extern void t4_aes256_cfb128_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_decrypt, uint64_t *iv);
-+
-+#endif	/* (sun4v||__sparv9||__sparcv8plus||__sparvc8) && !OPENSSL_NO_ASM */
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+#endif	/* ENG_T4_AES_ASM_H */
-Index: crypto/engine/eng_t4_bignum.h
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_bignum.h openssl-1.0.1e/engine/eng_t4_bignum.h
---- openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_bignum.h 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,287 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1999-2011 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+/*
-+ * This file is a copy of the ON gate's usr/src/common/bignum/bignum.h file
-+ */
-+
-+#ifndef _BIGNUM_H
-+#define	_BIGNUM_H
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+#include 
-+
-+#if defined(__sparcv9) || defined(__amd64) || defined(__sparc)
-+						/* 64-bit chunk size */
-+#ifndef UMUL64
-+#define	UMUL64	/* 64-bit multiplication results are supported */
-+#endif
-+#else
-+#define	BIGNUM_CHUNK_32
-+#endif
-+
-+
-+#define	BITSINBYTE	8
-+
-+/* Bignum "digits" (aka "chunks" or "words") are either 32- or 64-bits */
-+#ifdef BIGNUM_CHUNK_32
-+#define	BIG_CHUNK_SIZE		32
-+#define	BIG_CHUNK_TYPE		uint32_t
-+#define	BIG_CHUNK_TYPE_SIGNED	int32_t
-+#define	BIG_CHUNK_HIGHBIT	0x80000000
-+#define	BIG_CHUNK_ALLBITS	0xffffffff
-+#define	BIG_CHUNK_LOWHALFBITS	0xffff
-+#define	BIG_CHUNK_HALF_HIGHBIT	0x8000
-+
-+#else
-+#define	BIG_CHUNK_SIZE		64
-+#define	BIG_CHUNK_TYPE		uint64_t
-+#define	BIG_CHUNK_TYPE_SIGNED	int64_t
-+#define	BIG_CHUNK_HIGHBIT	0x8000000000000000ULL
-+#define	BIG_CHUNK_ALLBITS	0xffffffffffffffffULL
-+#define	BIG_CHUNK_LOWHALFBITS	0xffffffffULL
-+#define	BIG_CHUNK_HALF_HIGHBIT	0x80000000ULL
-+#endif
-+
-+#define	BITLEN2BIGNUMLEN(x)	((x) > 0 ? \
-+				((((x) - 1) / BIG_CHUNK_SIZE) + 1) : 0)
-+#define	CHARLEN2BIGNUMLEN(x)	((x) > 0 ? \
-+				((((x) - 1) / sizeof (BIG_CHUNK_TYPE)) + 1) : 0)
-+
-+#define	BIGNUM_WORDSIZE	(BIG_CHUNK_SIZE / BITSINBYTE)  /* word size in bytes */
-+#define	BIG_CHUNKS_FOR_160BITS	BITLEN2BIGNUMLEN(160)
-+
-+
-+/*
-+ * leading 0's are permitted
-+ * 0 should be represented by size>=1, size>=len>=1, sign=1,
-+ * value[i]=0 for 0
-+
-+#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \
-+	defined(__sparcv8)) && ! defined(OPENSSL_NO_ASM)
-+
-+extern void t4_des_expand(uint64_t *rk, const uint32_t *key);
-+extern void t4_des_encrypt(const uint64_t *rk, const uint64_t *pt,
-+    uint64_t *ct);
-+extern void t4_des_load_keys(uint64_t *ks);
-+void t4_des_ecb_crypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+extern void t4_des_cbc_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+extern void t4_des_cbc_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+extern void t4_des3_load_keys(uint64_t *ks);
-+extern void t4_des3_ecb_crypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+extern void t4_des3_cbc_encrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+extern void t4_des3_cbc_decrypt(uint64_t *ks, uint64_t *asm_in,
-+    uint64_t *asm_out, size_t amount_to_crypt, uint64_t *iv);
-+
-+
-+#endif	/* (sun4v||__sparv9||__sparcv8plus||__sparvc8) && !OPENSSL_NO_ASM */
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+#endif	/* ENG_T4_DES_ASM_H */
-Index: crypto/engine/eng_t4_err.h
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_err.h openssl-1.0.1e/engine/eng_t4_err.h
---- openssl-1.0.1e/crypto/engine/eng_t4_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_err.h 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,97 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1998-2011 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
-+ *    openssl-core 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+#ifndef	ENG_T4_ERR_H
-+#define	ENG_T4_ERR_H
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+static void ERR_unload_t4_strings(void);
-+#pragma inline(ERR_unload_t4_strings)
-+static void ERR_t4_error(int function, int reason, char *file, int line);
-+
-+#define	T4err(f, r)	ERR_t4_error((f), (r), __FILE__, __LINE__)
-+
-+/* Function codes */
-+#define	T4_F_INIT 				100
-+#define	T4_F_DESTROY 				101
-+#define	T4_F_FINISH				102
-+#define	T4_F_CIPHER_INIT_AES			103
-+#define	T4_F_ADD_NID				104
-+#define	T4_F_GET_ALL_CIPHERS			105
-+#define	T4_F_CIPHER_DO_AES			106
-+#define	T4_F_CIPHER_CLEANUP			107
-+#define	T4_F_CIPHER_INIT_DES			108
-+#define	T4_F_CIPHER_DO_DES			109
-+
-+/* Reason codes */
-+#define	T4_R_CIPHER_KEY				100
-+#define	T4_R_CIPHER_NID				101
-+#define	T4_R_IV_LEN_INCORRECT			102
-+#define	T4_R_KEY_LEN_INCORRECT			103
-+#define	T4_R_ASN1_OBJECT_CREATE			104
-+#define	T4_R_NOT_BLOCKSIZE_LENGTH		105
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+
-+#endif	/* ENG_T4_ERR_H */
-Index: crypto/engine/eng_t4_sha2_asm.h
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_sha2_asm.h openssl-1.0.1e/engine/eng_t4_sha2_asm.h
---- openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_sha2_asm.h 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,135 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This
-+ * product includes cryptographic software written by Eric Young
-+ * (eay at cryptsoft.com).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1998-2011 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
-+ *    openssl-core 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+#ifndef	ENG_T4_SHA2_ASM_H
-+#define	ENG_T4_SHA2_ASM_H
-+
-+/*
-+ * SPARC T4 SHA2 (SHA256/SHA512) assembly language functions and context.
-+ * The context must match that used by the Solaris SPARC T4 assembly
-+ * (except for OpenSSL-specific fields num and md_len that aren't in Solaris).
-+ *
-+ * Based on OpenSSL file openssl/sha.h and Solaris file sys/sha2.h.
-+ */
-+
-+#include 
-+#include 
-+#include 
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef OPENSSL_NO_SHA256
-+/*
-+ * The contents of this structure are a private interface between the
-+ * Init/Update/Multiblock/Final functions.
-+ * Callers must never attempt to read or write any of the fields
-+ * in this structure directly.
-+ */
-+typedef struct t4_SHA256state_st {
-+	uint32_t algotype;		/* Solaris-only field; unused here */
-+	uint32_t algotype_pad;		/* Pad to align next field 0 mod 8 */
-+	uint32_t h[8];			/* State (ABCDEFGH) */
-+	uint32_t h_pad[8];		/* Pad fields to match T4_SHA512_CTX */
-+	uint32_t Nl, Nh;		/* Number of bits, module 2^64 */
-+	uint32_t Nl_pad, Nh_pad;	/* Pad fields to match T4_SHA512_CTX */
-+	uint32_t data[SHA_LBLOCK];	/* Input */
-+	unsigned int num, md_len;	/* Fields unused by Solaris assembly */
-+} T4_SHA256_CTX;
-+#endif	/* !OPENSSL_NO_SHA256 */
-+
-+
-+#ifndef OPENSSL_NO_SHA512
-+/*
-+ * The contents of this structure are a private interface between the
-+ * Init/Update/Multiblock/Final functions.
-+ * Callers must never attempt to read or write any of the fields
-+ * in this structure directly.
-+ */
-+typedef struct t4_SHA512state_st {
-+	uint32_t algotype;		/* Solaris-only field; unused here */
-+	uint64_t h[8];			/* State (ABCDEFGH) */
-+	uint64_t Nl, Nh;		/* Number of bits, module 2^128 */
-+	union {
-+		uint64_t	d[SHA_LBLOCK];
-+		unsigned char	p[SHA512_CBLOCK];
-+	} u;				/* Input */
-+	unsigned int num, md_len;	/* Fields unused by Solaris assembly */
-+} T4_SHA512_CTX;
-+#endif	/* !OPENSSL_NO_SHA512 */
-+
-+/*
-+ * SPARC T4 assembly language functions
-+ */
-+#ifndef	OPENSSL_NO_SHA256
-+extern void t4_sha256_multiblock(T4_SHA256_CTX *c, const void *input,
-+	size_t num);
-+#endif
-+#ifndef	OPENSSL_NO_SHA512
-+extern void t4_sha512_multiblock(T4_SHA512_CTX *c, const void *input,
-+	size_t num);
-+#endif
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+#endif	/* ENG_T4_SHA2_ASM_H */
-Index: crypto/engine/eng_t4.c
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4.c openssl-1.0.1e/engine/eng_t4.c
---- openssl-1.0.1e/crypto/engine/eng_t4.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4.c 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,1010 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1998-2011 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
-+ *    openssl-core 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+/*
-+ * This engine supports SPARC microprocessors that provide AES and other
-+ * cipher and hash instructions, such as the T4 microprocessor.
-+ */
-+
-+#include 
-+
-+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AES_T4) && \
-+	!defined(OPENSSL_NO_AES)
-+#include 
-+#include 	/* getisax() */
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include "eng_t4_aes_asm.h"
-+
-+#define	T4_LIB_NAME "SPARC T4 engine"
-+#include "eng_t4_err.c"
-+
-+/* Copied from Solaris aes_impl.h */
-+#ifndef	MAX_AES_NR
-+#define	MAX_AES_NR		14 /* Maximum number of rounds */
-+#endif
-+#ifndef	MAX_AES_NB
-+#define	MAX_AES_NB		4  /* Number of columns comprising a state */
-+#endif
-+
-+/* Index for the supported ciphers */
-+typedef enum {
-+	T4_AES_128_CBC,
-+	T4_AES_192_CBC,
-+	T4_AES_256_CBC,
-+#ifndef	SOLARIS_NO_AES_CFB128
-+	T4_AES_128_CFB128,
-+	T4_AES_192_CFB128,
-+	T4_AES_256_CFB128,
-+#endif	/* !SOLARIS_NO_AES_CFB128 */
-+	T4_AES_128_CTR,
-+	T4_AES_192_CTR,
-+	T4_AES_256_CTR,
-+	T4_AES_128_ECB,
-+	T4_AES_192_ECB,
-+	T4_AES_256_ECB,
-+	T4_CIPHER_MAX
-+} t4_cipher_id;
-+
-+/* T4 cipher context; must be 8-byte aligned (last field must be uint64_t)  */
-+typedef struct t4_cipher_ctx {
-+	t4_cipher_id	index;
-+	uint64_t	*iv;
-+	uint64_t	aligned_iv_buffer[2]; /* use if original IV unaligned */
-+	/* Encryption and decryption key schedule are the same: */
-+	uint64_t	t4_ks[((MAX_AES_NR) + 1) * (MAX_AES_NB)];
-+} t4_cipher_ctx_t;
-+
-+typedef struct t4_cipher {
-+	t4_cipher_id	id;
-+	int		nid;
-+	int		iv_len;
-+	int		min_key_len;
-+	int		max_key_len;
-+	unsigned long	flags;
-+} t4_cipher_t;
-+
-+/* Constants used when creating the ENGINE */
-+static const char *ENGINE_T4_ID = "t4";
-+static const char *ENGINE_T4_NAME = "SPARC T4 engine support";
-+static const char *ENGINE_NO_T4_NAME = "SPARC T4 engine support (no T4)";
-+
-+
-+#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \
-+	defined(__sparcv8)) && !defined(OPENSSL_NO_ASM)
-+#define	COMPILE_HW_T4
-+static int t4_bind_helper(ENGINE *e, const char *id);
-+#pragma inline(t4_bind_helper)
-+#endif
-+
-+/*
-+ * This makes the engine "built-in" with OpenSSL.
-+ * On non-T4 CPUs this just returns.
-+ * Called by ENGINE_load_builtin_engines().
-+ */
-+void
-+ENGINE_load_t4(void)
-+{
-+#ifdef	COMPILE_HW_T4
-+	ENGINE *toadd = ENGINE_new();
-+	if (toadd != NULL) {
-+		if (t4_bind_helper(toadd, ENGINE_T4_ID) != 0) {
-+			(void) ENGINE_add(toadd);
-+			(void) ENGINE_free(toadd);
-+			ERR_clear_error();
-+		} else {
-+			(void) ENGINE_free(toadd);
-+		}
-+	}
-+#endif
-+}
-+
-+
-+#ifdef	COMPILE_HW_T4
-+static int t4_bind(ENGINE *e);
-+#ifndef	DYNAMIC_ENGINE
-+#pragma inline(t4_bind)
-+#endif
-+static t4_cipher_id get_cipher_index_by_nid(int nid);
-+#pragma inline(get_cipher_index_by_nid)
-+static void t4_instructions_present(_Bool *aes_present, _Bool *des_present,
-+    _Bool *digest_present, _Bool *montmul_present);
-+#pragma inline(t4_instructions_present)
-+
-+/* Digest registration function. Called by ENGINE_set_ciphers() */
-+int t4_get_all_digests(ENGINE *e, const EVP_MD **digest,
-+    const int **nids, int nid);
-+
-+/* RSA_METHOD structure used by ENGINE_set_RSA() */
-+extern RSA_METHOD *t4_RSA(void);
-+
-+/* DH_METHOD structure used by ENGINE_set_DH() */
-+extern DH_METHOD *t4_DH(void);
-+
-+/* DSA_METHOD structure used by ENGINE_set_DSA() */
-+extern DSA_METHOD *t4_DSA(void);
-+
-+/* Static variables */
-+/* This can't be const as NID*ctr is inserted when the engine is initialized */
-+static int t4_cipher_nids[] = {
-+	NID_aes_128_cbc, NID_aes_192_cbc, NID_aes_256_cbc,
-+#ifndef	SOLARIS_NO_AES_CFB128
-+	NID_aes_128_cfb128, NID_aes_192_cfb128, NID_aes_256_cfb128,
-+#endif
-+	NID_aes_128_ctr, NID_aes_192_ctr, NID_aes_256_ctr,
-+	NID_aes_128_ecb, NID_aes_192_ecb, NID_aes_256_ecb,
-+#ifndef	OPENSSL_NO_DES
-+	/* Must be at end of list (see t4_des_cipher_count in t4_bind() */
-+	NID_des_cbc, NID_des_ede3_cbc, NID_des_ecb, NID_des_ede3_ecb,
-+#endif
-+};
-+static const int t4_des_cipher_count = 4;
-+static int t4_cipher_count =
-+	(sizeof (t4_cipher_nids) / sizeof (t4_cipher_nids[0]));
-+
-+/*
-+ * Cipher Table for all supported symmetric ciphers.
-+ * Must be in same order as t4_cipher_id.
-+ */
-+static t4_cipher_t t4_cipher_table[] = {
-+	/* ID			NID			IV min- max-key flags */
-+	{T4_AES_128_CBC,	NID_aes_128_cbc,	16, 16, 16, 0},
-+	{T4_AES_192_CBC,	NID_aes_192_cbc,	16, 24, 24, 0},
-+	{T4_AES_256_CBC,	NID_aes_256_cbc,	16, 32, 32, 0},
-+#ifndef	SOLARIS_NO_AES_CFB128
-+	{T4_AES_128_CFB128,	NID_aes_128_cfb128,	16, 16, 16,
-+							EVP_CIPH_NO_PADDING},
-+	{T4_AES_192_CFB128,	NID_aes_192_cfb128,	16, 24, 24,
-+							EVP_CIPH_NO_PADDING},
-+	{T4_AES_256_CFB128,	NID_aes_256_cfb128,	16, 32, 32,
-+							EVP_CIPH_NO_PADDING},
-+#endif
-+	{T4_AES_128_CTR,	NID_aes_128_ctr,	16, 16, 16,
-+							EVP_CIPH_NO_PADDING},
-+	{T4_AES_192_CTR,	NID_aes_192_ctr,	16, 24, 24,
-+							EVP_CIPH_NO_PADDING},
-+	{T4_AES_256_CTR,	NID_aes_256_ctr,	16, 32, 32,
-+							EVP_CIPH_NO_PADDING},
-+	{T4_AES_128_ECB,	NID_aes_128_ecb,	0, 16, 16, 0},
-+	{T4_AES_192_ECB,	NID_aes_192_ecb,	0, 24, 24, 0},
-+	{T4_AES_256_ECB,	NID_aes_256_ecb,	0, 32, 32, 0},
-+};
-+
-+
-+/* Formal declaration for functions in EVP_CIPHER structure */
-+static int t4_cipher_init_aes(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+    const unsigned char *iv, int enc);
-+
-+static int t4_cipher_do_aes_128_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_192_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_256_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+#ifndef	SOLARIS_NO_AES_CFB128
-+static int t4_cipher_do_aes_128_cfb128(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_192_cfb128(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_256_cfb128(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+#endif
-+static int t4_cipher_do_aes_128_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_192_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_256_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_128_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_192_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_aes_256_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+
-+
-+/*
-+ * Cipher Algorithms
-+ *
-+ * OpenSSL's libcrypto EVP stuff. This is how this engine gets wired to EVP.
-+ * EVP_CIPHER is defined in evp.h.  To maintain binary compatibility the
-+ * definition cannot be modified.
-+ * Stuff specific to the t4 engine is kept in t4_cipher_ctx_t, which is
-+ * pointed to by cipher_data or md_data
-+ *
-+ * Fields: nid, block_size, key_len, iv_len, flags,
-+ *	init(), do_cipher(), cleanup(),
-+ *	ctx_size,
-+ *	set_asn1_parameters(), get_asn1_parameters(), ctrl(), app_data
-+ */
-+
-+static const EVP_CIPHER t4_aes_128_cbc = {
-+	NID_aes_128_cbc,
-+	16, 16, 16,
-+	EVP_CIPH_CBC_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_128_cbc, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_192_cbc = {
-+	NID_aes_192_cbc,
-+	16, 24, 16,
-+	EVP_CIPH_CBC_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_192_cbc, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_256_cbc = {
-+	NID_aes_256_cbc,
-+	16, 32, 16,
-+	EVP_CIPH_CBC_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_256_cbc, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+
-+#ifndef	SOLARIS_NO_AES_CFB128
-+static const EVP_CIPHER t4_aes_128_cfb128 = {
-+	NID_aes_128_cfb128,
-+	16, 16, 16,
-+	EVP_CIPH_CFB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_128_cfb128, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_192_cfb128 = {
-+	NID_aes_192_cfb128,
-+	16, 24, 16,
-+	EVP_CIPH_CFB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_192_cfb128, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_256_cfb128 = {
-+	NID_aes_256_cfb128,
-+	16, 32, 16,
-+	EVP_CIPH_CFB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_256_cfb128, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+#endif	/* !SOLARIS_NO_AES_CFB128 */
-+
-+static EVP_CIPHER t4_aes_128_ctr = {
-+	NID_aes_128_ctr,
-+	16, 16, 16,
-+	EVP_CIPH_CTR_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_128_ctr, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static EVP_CIPHER t4_aes_192_ctr = {
-+	NID_aes_192_ctr,
-+	16, 24, 16,
-+	EVP_CIPH_CTR_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_192_ctr, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+static EVP_CIPHER t4_aes_256_ctr = {
-+	NID_aes_256_ctr,
-+	16, 32, 16,
-+	EVP_CIPH_CTR_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_256_ctr, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+
-+/*
-+ * ECB modes don't use an Initial Vector, so that's why set_asn1_parameters,
-+ * get_asn1_parameters, and cleanup fields are set to NULL.
-+ */
-+static const EVP_CIPHER t4_aes_128_ecb = {
-+	NID_aes_128_ecb,
-+	16, 16, 0,
-+	EVP_CIPH_ECB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_128_ecb, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	NULL, NULL, NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_192_ecb = {
-+	NID_aes_192_ecb,
-+	16, 24, 0,
-+	EVP_CIPH_ECB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_192_ecb, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	NULL, NULL, NULL, NULL
-+};
-+static const EVP_CIPHER t4_aes_256_ecb = {
-+	NID_aes_256_ecb,
-+	16, 32, 0,
-+	EVP_CIPH_ECB_MODE,
-+	t4_cipher_init_aes, t4_cipher_do_aes_256_ecb, NULL,
-+	sizeof (t4_cipher_ctx_t),
-+	NULL, NULL, NULL, NULL
-+};
-+
-+#ifndef	OPENSSL_NO_DES
-+extern const EVP_CIPHER t4_des_cbc;
-+extern const EVP_CIPHER t4_des3_cbc;
-+extern const EVP_CIPHER t4_des_ecb;
-+extern const EVP_CIPHER t4_des3_ecb;
-+#endif	/* OPENSSL_NO_DES */
-+
-+
-+/*
-+ * Message Digest variables
-+ */
-+static const int t4_digest_nids[] = {
-+#ifndef	OPENSSL_NO_MD5
-+	NID_md5,
-+#endif
-+#ifndef	OPENSSL_NO_SHA
-+#ifndef	OPENSSL_NO_SHA1
-+	NID_sha1,
-+#endif
-+#ifndef	OPENSSL_NO_SHA256
-+	NID_sha224,
-+	NID_sha256,
-+#endif
-+#ifndef	OPENSSL_NO_SHA512
-+	NID_sha384,
-+	NID_sha512,
-+#endif
-+#endif	/* !OPENSSL_NO_SHA */
-+};
-+static const int t4_digest_count =
-+	(sizeof (t4_digest_nids) / sizeof (t4_digest_nids[0]));
-+
-+#ifndef	OPENSSL_NO_MD5
-+extern const EVP_MD t4_md5;
-+#endif
-+#ifndef	OPENSSL_NO_SHA
-+#ifndef	OPENSSL_NO_SHA1
-+extern const EVP_MD t4_sha1;
-+#endif
-+#ifndef	OPENSSL_NO_SHA256
-+extern const EVP_MD t4_sha224;
-+extern const EVP_MD t4_sha256;
-+#endif
-+#ifndef	OPENSSL_NO_SHA512
-+extern const EVP_MD t4_sha384;
-+extern const EVP_MD t4_sha512;
-+#endif
-+#endif	/* !OPENSSL_NO_SHA */
-+
-+/*
-+ * Message Digest functions
-+ */
-+
-+/*
-+ * Registered by the ENGINE with ENGINE_set_digests().
-+ * Finds out how to deal with a particular digest NID in the ENGINE.
-+ */
-+/* ARGSUSED */
-+int
-+t4_get_all_digests(ENGINE *e, const EVP_MD **digest,
-+    const int **nids, int nid)
-+{
-+	if (digest == NULL) { /* return a list of all supported digests */
-+		*nids = (t4_digest_count > 0) ? t4_digest_nids : NULL;
-+		return (t4_digest_count);
-+	}
-+
-+	switch (nid) {
-+#ifndef	OPENSSL_NO_MD5
-+	case NID_md5:
-+		*digest = &t4_md5;
-+		break;
-+#endif
-+#ifndef	OPENSSL_NO_SHA
-+#ifndef	OPENSSL_NO_SHA1
-+	/*
-+	 * A special case. For "openssl dgst -dss1 ...",
-+	 * OpenSSL calls EVP_get_digestbyname() on "dss1" which ends up
-+	 * calling t4_get_all_digests() for NID_dsa. Internally, if an
-+	 * engine is not used, OpenSSL uses SHA1_Init() as expected for
-+	 * DSA. So, we must return t4_sha1 for NID_dsa as well. Note
-+	 * that this must have changed between 0.9.8 and 1.0.0 since we
-+	 * did not have the problem with the 0.9.8 version.
-+	 */
-+	case NID_dsa:
-+	case NID_sha1:
-+		*digest = &t4_sha1;
-+		break;
-+#endif
-+#ifndef	OPENSSL_NO_SHA256
-+	case NID_sha224:
-+		*digest = &t4_sha224;
-+		break;
-+	case NID_sha256:
-+		*digest = &t4_sha256;
-+		break;
-+#endif
-+#ifndef	OPENSSL_NO_SHA512
-+	case NID_sha384:
-+		*digest = &t4_sha384;
-+		break;
-+	case NID_sha512:
-+		*digest = &t4_sha512;
-+		break;
-+#endif
-+#endif	/* !OPENSSL_NO_SHA */
-+	default:
-+		/* digest not supported */
-+		*digest = NULL;
-+		return (0);
-+	}
-+
-+	return (1);
-+}
-+
-+
-+/*
-+ * Utility Functions
-+ */
-+
-+/*
-+ * Set aes_present, des_present, digest_present and montmul_present
-+ * to B_FALSE or B_TRUE depending on
-+ * whether the current SPARC processor supports AES, DES,
-+ * MD5/SHA1/SHA256/SHA512 and MONTMUL, respectively.
-+ */
-+static void
-+t4_instructions_present(_Bool *aes_present, _Bool *des_present,
-+    _Bool *digest_present, _Bool *montmul_present)
-+{
-+#ifdef	OPENSSL_NO_DES
-+#undef	AV_SPARC_DES
-+#define	AV_SPARC_DES	0
-+#endif
-+#ifdef	OPENSSL_NO_MD5
-+#undef	AV_SPARC_MD5
-+#define	AV_SPARC_MD5	0
-+#endif
-+#ifndef	OPENSSL_NO_SHA
-+#ifdef	OPENSSL_NO_SHA1
-+#undef	AV_SPARC_SHA1
-+#define	AV_SPARC_SHA1	0
-+#endif
-+#ifdef	OPENSSL_NO_SHA256
-+#undef	AV_SPARC_SHA256
-+#define	AV_SPARC_SHA256	0
-+#endif
-+#ifdef	OPENSSL_NO_SHA512
-+#undef	AV_SPARC_SHA512
-+#define	AV_SPARC_SHA512	0
-+#endif
-+#else
-+#undef	AV_SPARC_SHA1
-+#undef	AV_SPARC_SHA256
-+#undef	AV_SPARC_SHA512
-+#define	AV_SPARC_SHA1	0
-+#define	AV_SPARC_SHA256	0
-+#define	AV_SPARC_SHA512	0
-+#endif	/* !OPENSSL_NO_SHA */
-+
-+#define	DIGEST_MASK	(AV_SPARC_MD5 | AV_SPARC_SHA1 | AV_SPARC_SHA256 | \
-+	AV_SPARC_SHA512)
-+	uint_t		ui;
-+
-+	(void) getisax(&ui, 1);
-+	*aes_present = ((ui & AV_SPARC_AES) != 0);
-+	*des_present = ((ui & AV_SPARC_DES) != 0);
-+	*digest_present = ((ui & DIGEST_MASK) == DIGEST_MASK);
-+	*montmul_present = ((ui & AV_SPARC_MONT) != 0);
-+}
-+
-+
-+
-+/*
-+ * Cipher functions
-+ */
-+
-+
-+/*
-+ * Registered by the ENGINE with ENGINE_set_ciphers().
-+ * Finds out how to deal with a particular cipher NID in the ENGINE.
-+ */
-+/* ARGSUSED */
-+static int
-+t4_get_all_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-+    const int **nids, int nid)
-+{
-+	if (cipher == NULL) { /* return a list of all supported ciphers */
-+		*nids = (t4_cipher_count > 0) ? t4_cipher_nids : NULL;
-+		return (t4_cipher_count);
-+	}
-+
-+	switch (nid) {
-+	case NID_aes_128_cbc:
-+		*cipher = &t4_aes_128_cbc;
-+		break;
-+	case NID_aes_192_cbc:
-+		*cipher = &t4_aes_192_cbc;
-+		break;
-+	case NID_aes_256_cbc:
-+		*cipher = &t4_aes_256_cbc;
-+		break;
-+	case NID_aes_128_ecb:
-+		*cipher = &t4_aes_128_ecb;
-+		break;
-+	case NID_aes_192_ecb:
-+		*cipher = &t4_aes_192_ecb;
-+		break;
-+	case NID_aes_256_ecb:
-+		*cipher = &t4_aes_256_ecb;
-+		break;
-+#ifndef	SOLARIS_NO_AES_CFB128
-+	case NID_aes_128_cfb128:
-+		*cipher = &t4_aes_128_cfb128;
-+		break;
-+	case NID_aes_192_cfb128:
-+		*cipher = &t4_aes_192_cfb128;
-+		break;
-+	case NID_aes_256_cfb128:
-+		*cipher = &t4_aes_256_cfb128;
-+		break;
-+#endif	/* !SOLARIS_NO_AES_CFB128 */
-+#ifndef	OPENSSL_NO_DES
-+	case NID_des_cbc:
-+		*cipher = &t4_des_cbc;
-+		break;
-+	case NID_des_ede3_cbc:
-+		*cipher = &t4_des3_cbc;
-+		break;
-+	case NID_des_ecb:
-+		*cipher = &t4_des_ecb;
-+		break;
-+	case NID_des_ede3_ecb:
-+		*cipher = &t4_des3_ecb;
-+		break;
-+#endif	/* !OPENSSL_NO_DES */
-+	case NID_aes_128_ctr:
-+		*cipher = &t4_aes_128_ctr;
-+		break;
-+	case NID_aes_192_ctr:
-+		*cipher = &t4_aes_192_ctr;
-+		break;
-+	case NID_aes_256_ctr:
-+		*cipher = &t4_aes_256_ctr;
-+		break;
-+
-+	default:
-+		/* cipher not supported */
-+		*cipher = NULL;
-+		return (0);
-+	}
-+
-+	return (1);
-+}
-+
-+
-+/* Called by t4_cipher_init_aes() */
-+static t4_cipher_id
-+get_cipher_index_by_nid(int nid)
-+{
-+	t4_cipher_id i;
-+
-+	for (i = (t4_cipher_id)0; i < T4_CIPHER_MAX; ++i)
-+		if (t4_cipher_table[i].nid == nid)
-+			return (i);
-+	return (T4_CIPHER_MAX);
-+}
-+
-+
-+/* ARGSUSED2 */
-+static int
-+t4_cipher_init_aes(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+    const unsigned char *iv, int enc)
-+{
-+	t4_cipher_ctx_t	*tctx = ctx->cipher_data;
-+	uint64_t	*t4_ks = tctx->t4_ks;
-+	t4_cipher_t	*t4_cipher;
-+	t4_cipher_id	index;
-+	int		key_len = ctx->key_len;
-+	uint64_t	aligned_key_buffer[4]; /* 16, 24, or 32 bytes long */
-+	uint64_t	*aligned_key;
-+
-+	if (key == NULL) {
-+		T4err(T4_F_CIPHER_INIT_AES, T4_R_CIPHER_KEY);
-+		return (0);
-+	}
-+
-+	/* Get the cipher entry index in t4_cipher_table from nid */
-+	index = get_cipher_index_by_nid(ctx->cipher->nid);
-+	if (index >= T4_CIPHER_MAX) {
-+		T4err(T4_F_CIPHER_INIT_AES, T4_R_CIPHER_NID);
-+		return (0); /* Error */
-+	}
-+	t4_cipher = &t4_cipher_table[index];
-+
-+	/* Check key size and iv size */
-+	if (ctx->cipher->iv_len < t4_cipher->iv_len) {
-+		T4err(T4_F_CIPHER_INIT_AES, T4_R_IV_LEN_INCORRECT);
-+		return (0); /* Error */
-+	}
-+	if ((key_len < t4_cipher->min_key_len) ||
-+	    (key_len > t4_cipher->max_key_len)) {
-+		T4err(T4_F_CIPHER_INIT_AES, T4_R_KEY_LEN_INCORRECT);
-+		return (0); /* Error */
-+	}
-+
-+	/* Set cipher flags, if any */
-+	ctx->flags |= t4_cipher->flags;
-+
-+	/* Align the key */
-+	if (((unsigned long)key & 0x7) == 0) /* already aligned */
-+		aligned_key = (uint64_t *)key;
-+	else { /* key is not 8-byte aligned */
-+#ifdef	DEBUG_T4
-+		(void) fprintf(stderr, "T4: key is not 8 byte aligned\n");
-+#endif
-+		(void) memcpy(aligned_key_buffer, key, key_len);
-+		aligned_key = aligned_key_buffer;
-+	}
-+
-+
-+	/*
-+	 * Expand the key schedule.
-+	 * Copy original key to start of t4_ks key schedule. Note that the
-+	 * encryption and decryption key schedule are the same for T4.
-+	 */
-+	switch (key_len) {
-+		case 16:
-+			t4_aes_expand128(&t4_ks[2],
-+			    (const uint32_t *)aligned_key);
-+			t4_ks[0] = aligned_key[0];
-+			t4_ks[1] = aligned_key[1];
-+			break;
-+		case 24:
-+			t4_aes_expand192(&t4_ks[3],
-+			    (const uint32_t *)aligned_key);
-+			t4_ks[0] = aligned_key[0];
-+			t4_ks[1] = aligned_key[1];
-+			t4_ks[2] = aligned_key[2];
-+			break;
-+		case 32:
-+			t4_aes_expand256(&t4_ks[4],
-+			    (const uint32_t *)aligned_key);
-+			t4_ks[0] = aligned_key[0];
-+			t4_ks[1] = aligned_key[1];
-+			t4_ks[2] = aligned_key[2];
-+			t4_ks[3] = aligned_key[3];
-+			break;
-+		default:
-+			T4err(T4_F_CIPHER_INIT_AES, T4_R_CIPHER_KEY);
-+			return (0);
-+	}
-+
-+	/* Save index to cipher */
-+	tctx->index = index;
-+
-+	/* Align IV, if needed */
-+	if (t4_cipher->iv_len <= 0) { /* no IV (such as with ECB mode) */
-+		tctx->iv = NULL;
-+	} else if (((unsigned long)ctx->iv & 0x7) == 0) { /* already aligned */
-+		tctx->iv = (uint64_t *)ctx->iv;
-+	} else {
-+		/* IV is not 8 byte aligned */
-+		(void) memcpy(tctx->aligned_iv_buffer, ctx->iv,
-+		    ctx->cipher->iv_len);
-+		tctx->iv = tctx->aligned_iv_buffer;
-+#ifdef	DEBUG_T4
-+		(void) fprintf(stderr,
-+		    "t4_cipher_init_aes: IV is not 8 byte aligned\n");
-+		(void) fprintf(stderr,
-+		    "t4_cipher_init_aes: ctx->cipher->iv_len =%d\n",
-+		    ctx->cipher->iv_len);
-+		(void) fprintf(stderr, "t4_cipher_init_aes: after "
-+		    "re-alignment, tctx->iv = %p\n", (void *)tctx->iv);
-+#endif	/* DEBUG_T4 */
-+	}
-+
-+	return (1);
-+}
-+
-+
-+/*
-+ * ENCRYPT_UPDATE or DECRYPT_UPDATE
-+ */
-+#define	T4_CIPHER_DO_AES(t4_cipher_do_aes, t4_aes_load_keys_for_encrypt, \
-+    t4_aes_encrypt, t4_aes_load_keys_for_decrypt, t4_aes_decrypt, iv)	\
-+static int								\
-+t4_cipher_do_aes(EVP_CIPHER_CTX *ctx, unsigned char *out,		\
-+    const unsigned char *in, size_t inl)				\
-+{									\
-+	t4_cipher_ctx_t	*tctx = ctx->cipher_data;			\
-+	uint64_t	*t4_ks = tctx->t4_ks;				\
-+	unsigned long	outl = inl;					\
-+	unsigned char	*bufin_alloc = NULL, *bufout_alloc = NULL;	\
-+	unsigned char	*bufin, *bufout;				\
-+									\
-+	/* "in" and "out" must be 8 byte aligned */			\
-+	if (((unsigned long)in & 0x7) == 0) { /* already aligned */	\
-+		bufin = (unsigned char *)in;				\
-+	} else { /* "in" is not 8 byte aligned */			\
-+		if (((unsigned long)out & 0x7) == 0) { /* aligned */	\
-+			/* use output buffer for input */		\
-+			bufin = out;					\
-+		} else {						\
-+			bufin = bufin_alloc = OPENSSL_malloc(inl);	\
-+			if (bufin_alloc == NULL)			\
-+				return (0); /* error */			\
-+		}							\
-+		(void) memcpy(bufin, in, inl);				\
-+	}								\
-+									\
-+	if (((unsigned long)out & 0x7) == 0) { /* already aligned */	\
-+		bufout = out;						\
-+	} else { /* "out" is not 8 byte aligned */			\
-+		if (bufin_alloc != NULL) {				\
-+			/* use allocated input buffer for output */	\
-+			bufout = bufin_alloc;				\
-+		} else {						\
-+			bufout = bufout_alloc = OPENSSL_malloc(outl);	\
-+			if (bufout_alloc == NULL) {			\
-+				OPENSSL_free(bufin_alloc);		\
-+				return (0); /* error */			\
-+			}						\
-+		}							\
-+	}								\
-+									\
-+	/* Data length must be an even multiple of block size. */	\
-+	if ((inl & 0xf) != 0) {						\
-+		OPENSSL_free(bufout_alloc);				\
-+		OPENSSL_free(bufin_alloc);				\
-+		T4err(T4_F_CIPHER_DO_AES, T4_R_NOT_BLOCKSIZE_LENGTH);	\
-+		return (0);						\
-+	}								\
-+									\
-+	if (ctx->encrypt) {						\
-+		t4_aes_load_keys_for_encrypt(t4_ks);			\
-+		t4_aes_encrypt(t4_ks, (uint64_t *)bufin,		\
-+		    (uint64_t *)bufout, (size_t)inl, iv);		\
-+	} else { /* decrypt */						\
-+		t4_aes_load_keys_for_decrypt(t4_ks);			\
-+		t4_aes_decrypt(t4_ks, (uint64_t *)bufin,		\
-+		    (uint64_t *)bufout, (size_t)inl, iv);		\
-+	}								\
-+									\
-+	/* Cleanup */							\
-+	if (bufin_alloc != NULL) {					\
-+		if (bufout == bufin_alloc)				\
-+			(void) memcpy(out, bufout, outl);		\
-+		OPENSSL_free(bufin_alloc);				\
-+	}								\
-+	if (bufout_alloc != NULL) {					\
-+		(void) memcpy(out, bufout_alloc, outl);			\
-+		OPENSSL_free(bufout_alloc);				\
-+	}								\
-+									\
-+	return (1);							\
-+}
-+
-+
-+/* AES CBC mode. */
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_128_cbc,
-+	t4_aes128_load_keys_for_encrypt, t4_aes128_cbc_encrypt,
-+	t4_aes128_load_keys_for_decrypt, t4_aes128_cbc_decrypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_192_cbc,
-+	t4_aes192_load_keys_for_encrypt, t4_aes192_cbc_encrypt,
-+	t4_aes192_load_keys_for_decrypt, t4_aes192_cbc_decrypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_256_cbc,
-+	t4_aes256_load_keys_for_encrypt, t4_aes256_cbc_encrypt,
-+	t4_aes256_load_keys_for_decrypt, t4_aes256_cbc_decrypt, tctx->iv)
-+
-+/*
-+ * AES CFB128 mode.
-+ * CFB128 decrypt uses load_keys_for_encrypt() as the mode uses
-+ * the raw AES encrypt operation for the decryption, too.
-+ */
-+#ifndef	SOLARIS_NO_AES_CFB128
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_128_cfb128,
-+	t4_aes128_load_keys_for_encrypt, t4_aes128_cfb128_encrypt,
-+	t4_aes128_load_keys_for_encrypt, t4_aes128_cfb128_decrypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_192_cfb128,
-+	t4_aes192_load_keys_for_encrypt, t4_aes192_cfb128_encrypt,
-+	t4_aes192_load_keys_for_encrypt, t4_aes192_cfb128_decrypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_256_cfb128,
-+	t4_aes256_load_keys_for_encrypt, t4_aes256_cfb128_encrypt,
-+	t4_aes256_load_keys_for_encrypt, t4_aes256_cfb128_decrypt, tctx->iv)
-+#endif	/* !SOLARIS_NO_AES_CFB128 */
-+
-+/* AES CTR mode. */
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_128_ctr,
-+	t4_aes128_load_keys_for_encrypt, t4_aes128_ctr_crypt,
-+	t4_aes128_load_keys_for_decrypt, t4_aes128_ctr_crypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_192_ctr,
-+	t4_aes192_load_keys_for_encrypt, t4_aes192_ctr_crypt,
-+	t4_aes192_load_keys_for_decrypt, t4_aes192_ctr_crypt, tctx->iv)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_256_ctr,
-+	t4_aes256_load_keys_for_encrypt, t4_aes256_ctr_crypt,
-+	t4_aes256_load_keys_for_decrypt, t4_aes256_ctr_crypt, tctx->iv)
-+
-+/* AES ECB mode. */
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_128_ecb,
-+	t4_aes128_load_keys_for_encrypt, t4_aes128_ecb_encrypt,
-+	t4_aes128_load_keys_for_decrypt, t4_aes128_ecb_decrypt, NULL)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_192_ecb,
-+	t4_aes192_load_keys_for_encrypt, t4_aes192_ecb_encrypt,
-+	t4_aes192_load_keys_for_decrypt, t4_aes192_ecb_decrypt, NULL)
-+T4_CIPHER_DO_AES(t4_cipher_do_aes_256_ecb,
-+	t4_aes256_load_keys_for_encrypt, t4_aes256_ecb_encrypt,
-+	t4_aes256_load_keys_for_decrypt, t4_aes256_ecb_decrypt, NULL)
-+
-+
-+/*
-+ * Is the t4 engine available?
-+ * Passed to ENGINE_set_init_function().
-+ */
-+/* ARGSUSED */
-+static int
-+t4_init(ENGINE *e)
-+{
-+	return (1);
-+}
-+
-+
-+/* Passed to ENGINE_set_destroy_function(). */
-+/* ARGSUSED */
-+static int
-+t4_destroy(ENGINE *e)
-+{
-+	ERR_unload_t4_strings();
-+	return (1);
-+}
-+
-+
-+/*
-+ * Called by t4_bind_helper().
-+ * Note: too early to use T4err() functions on errors.
-+ */
-+/* ARGSUSED */
-+static int
-+t4_bind(ENGINE *e)
-+{
-+	_Bool aes_engage, digest_engage, des_engage, montmul_engage;
-+
-+	t4_instructions_present(&aes_engage, &des_engage, &digest_engage,
-+	    &montmul_engage);
-+#ifdef	DEBUG_T4
-+	(void) fprintf(stderr,
-+	    "t4_bind: engage aes=%d, des=%d, digest=%d\n",
-+	    aes_engage, des_engage, digest_engage);
-+#endif
-+#ifndef	OPENSSL_NO_DES
-+	if (!des_engage) { /* Remove DES ciphers from list */
-+		t4_cipher_count -= t4_des_cipher_count;
-+	}
-+#endif
-+
-+#ifdef	DEBUG_T4
-+	(void) fprintf(stderr, "t4_cipher_count = %d; t4_cipher_nids[] =\n",
-+	    t4_cipher_count);
-+	for (int i = 0; i < t4_cipher_count; ++i) {
-+		(void) fprintf(stderr, " %d", t4_cipher_nids[i]);
-+	}
-+	(void) fprintf(stderr, "\n");
-+#endif	/* DEBUG_T4 */
-+
-+	/* Register T4 engine ID, name, and functions */
-+	if (!ENGINE_set_id(e, ENGINE_T4_ID) ||
-+	    !ENGINE_set_name(e,
-+	    aes_engage ? ENGINE_T4_NAME: ENGINE_NO_T4_NAME) ||
-+	    !ENGINE_set_init_function(e, t4_init) ||
-+	    (aes_engage && !ENGINE_set_ciphers(e, t4_get_all_ciphers)) ||
-+	    (digest_engage && !ENGINE_set_digests(e, t4_get_all_digests)) ||
-+#ifndef OPENSSL_NO_RSA
-+	    (montmul_engage && !ENGINE_set_RSA(e, t4_RSA())) ||
-+#endif	/* OPENSSL_NO_RSA */
-+#ifndef OPENSSL_NO_DH
-+	    (montmul_engage && !ENGINE_set_DH(e, t4_DH())) ||
-+#endif	/* OPENSSL_NO_DH */
-+#ifndef OPENSSL_NO_DSA
-+	    (montmul_engage && !ENGINE_set_DSA(e, t4_DSA())) ||
-+#endif	/* OPENSSL_NO_DSA */
-+	    !ENGINE_set_destroy_function(e, t4_destroy)) {
-+		return (0);
-+	}
-+
-+	return (1);
-+}
-+
-+
-+/*
-+ * Called by ENGINE_load_t4().
-+ * Note: too early to use T4err() functions on errors.
-+ */
-+static int
-+t4_bind_helper(ENGINE *e, const char *id)
-+{
-+	if (id != NULL && (strcmp(id, ENGINE_T4_ID) != 0)) {
-+		(void) fprintf(stderr, "T4: bad t4 engine ID\n");
-+		return (0);
-+	}
-+	if (!t4_bind(e)) {
-+		(void) fprintf(stderr,
-+		    "T4: failed to bind t4 engine\n");
-+		return (0);
-+	}
-+
-+	return (1);
-+}
-+
-+
-+#ifdef	DYNAMIC_ENGINE
-+IMPLEMENT_DYNAMIC_CHECK_FN()
-+IMPLEMENT_DYNAMIC_BIND_FN(t4_bind_helper)
-+#endif	/* DYNAMIC_ENGINE */
-+#endif	/* COMPILE_HW_T4 */
-+#endif	/* !OPENSSL_NO_HW && !OPENSSL_NO_HW_AES_T4 && !OPENSSL_NO_AES */
-Index: crypto/engine/eng_t4_des.c
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_des.c openssl-1.0.1e/engine/eng_t4_des.c
---- openssl-1.0.1e/crypto/engine/eng_t4_des.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_des.c 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,486 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1998-2011 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
-+ *    openssl-core 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+/*
-+ * This engine supports SPARC microprocessors that provide DES and other
-+ * cipher and hash instructions, such as the T4 microprocessor.
-+ *
-+ * This file implements the DES and DES3 cipher operations.
-+ */
-+
-+#include 
-+
-+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_DES_T4) && \
-+	!defined(OPENSSL_NO_DES)
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include "eng_t4_des_asm.h"
-+
-+#include "eng_t4_err.c"
-+
-+/* Index for the supported DES ciphers */
-+typedef enum {
-+	T4_DES_CBC,
-+	T4_DES3_CBC,
-+	T4_DES_ECB,
-+	T4_DES3_ECB,
-+	T4_DES_MAX
-+} t4_des_cipher_id;
-+
-+/* From Solaris file usr/src/common/crypto/des/des_impl.c */
-+typedef struct {
-+	uint64_t ksch_encrypt[16];
-+	uint64_t ksch_decrypt[16];
-+} t4_keysched_t;
-+
-+typedef struct {
-+	uint64_t ksch_encrypt[16 * 3];
-+	uint64_t ksch_decrypt[16 * 3];
-+} t4_keysched3_t;
-+
-+/* T4 cipher context; must be 8-byte aligned (last field must be uint64_t)  */
-+typedef struct t4_des_cipher_ctx {
-+	t4_des_cipher_id	index;
-+	uint64_t		*iv;
-+	uint64_t		aligned_iv_buffer; /* use if IV unaligned */
-+	union {
-+		t4_keysched_t	des;
-+		t4_keysched3_t	des3;
-+	} ks;
-+} t4_des_cipher_ctx_t;
-+
-+typedef struct t4_cipher {
-+	t4_des_cipher_id	id;
-+	int			nid;
-+	int			iv_len;
-+	int			min_key_len;
-+	int			max_key_len;
-+} t4_des_cipher_t;
-+
-+
-+#if (defined(sun4v) || defined(__sparcv9) || defined(__sparcv8plus) || \
-+	defined(__sparcv8)) && !defined(OPENSSL_NO_ASM)
-+#define	COMPILE_HW_T4
-+#endif
-+
-+#ifdef	COMPILE_HW_T4
-+static t4_des_cipher_id get_des_cipher_index_by_nid(int nid);
-+#pragma inline(get_des_cipher_index_by_nid)
-+
-+
-+/*
-+ * Cipher Table for all supported symmetric ciphers.
-+ * Must be in same order as t4_des_cipher_id.
-+ */
-+static t4_des_cipher_t t4_des_cipher_table[] = {
-+	/* ID			NID		IV	min-key	max-key */
-+	{T4_DES_CBC,	NID_des_cbc,		8,	8,	8},
-+	{T4_DES3_CBC,	NID_des_ede3_cbc,	8,	24,	24},
-+	{T4_DES_ECB,	NID_des_ecb,		0,	8,	8},
-+	{T4_DES3_ECB,	NID_des_ede3_ecb,	0,	24,	24},
-+};
-+
-+
-+/* Formal declaration for functions in EVP_CIPHER structure */
-+static int t4_cipher_init_des(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+    const unsigned char *iv, int enc);
-+
-+static int t4_cipher_do_des_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_des3_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_des_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+static int t4_cipher_do_des3_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+    const unsigned char *in, size_t inl);
-+
-+
-+/*
-+ * Cipher Algorithms
-+ *
-+ * OpenSSL's libcrypto EVP stuff. This is how this engine gets wired to EVP.
-+ * EVP_CIPHER is defined in evp.h.  To maintain binary compatibility the
-+ * definition cannot be modified.
-+ * Stuff specific to the t4 engine is kept in t4_des_cipher_ctx_t, which is
-+ * pointed to by cipher_data or md_data
-+ *
-+ * Fields: nid, block_size, key_len, iv_len, flags,
-+ *	init(), do_cipher(), cleanup(),
-+ *	ctx_size,
-+ *	set_asn1_parameters(), get_asn1_parameters(), ctrl(), app_data
-+ */
-+
-+const EVP_CIPHER t4_des_cbc = {
-+	NID_des_cbc,
-+	8, 8, 8,
-+	EVP_CIPH_CBC_MODE,
-+	t4_cipher_init_des, t4_cipher_do_des_cbc, NULL,
-+	sizeof (t4_des_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+const EVP_CIPHER t4_des3_cbc = {
-+	NID_des_ede3_cbc,
-+	8, 24, 8,
-+	EVP_CIPH_CBC_MODE,
-+	t4_cipher_init_des, t4_cipher_do_des3_cbc, NULL,
-+	sizeof (t4_des_cipher_ctx_t),
-+	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv,
-+	NULL, NULL
-+};
-+
-+/*
-+ * ECB modes don't use an Initial Vector, so that's why set_asn1_parameters,
-+ * get_asn1_parameters, and cleanup fields are set to NULL.
-+ */
-+const EVP_CIPHER t4_des_ecb = {
-+	NID_des_ecb,
-+	8, 8, 8,
-+	EVP_CIPH_ECB_MODE,
-+	t4_cipher_init_des, t4_cipher_do_des_ecb, NULL,
-+	sizeof (t4_des_cipher_ctx_t),
-+	NULL, NULL, NULL, NULL
-+};
-+const EVP_CIPHER t4_des3_ecb = {
-+	NID_des_ede3_ecb,
-+	8, 24, 8,
-+	EVP_CIPH_ECB_MODE,
-+	t4_cipher_init_des, t4_cipher_do_des3_ecb, NULL,
-+	sizeof (t4_des_cipher_ctx_t),
-+	NULL, NULL, NULL, NULL
-+};
-+
-+
-+/*
-+ * DES Cipher functions
-+ */
-+
-+/* Called by t4_cipher_init_des() */
-+static t4_des_cipher_id
-+get_des_cipher_index_by_nid(int nid)
-+{
-+	t4_des_cipher_id i;
-+
-+	for (i = (t4_des_cipher_id)0; i < T4_DES_MAX; ++i)
-+		if (t4_des_cipher_table[i].nid == nid)
-+			return (i);
-+	return (T4_DES_MAX);
-+}
-+
-+
-+/*
-+ * Initialize encryption and decryption key schedules for DES or DES3.
-+ * Called by t4_cipher_init_des().
-+ *
-+ * Modified from Solaris DES function des_init_keysched().
-+ */
-+static int
-+t4_des_init_keysched(const unsigned char *cipherKey,
-+    unsigned int keysize, void *ks)
-+{
-+	uint64_t *encryption_ks, *decryption_ks;
-+	uint64_t keysched[16 * 3];	/* 128 or 384 bytes for DES or DES3 */
-+	uint64_t key_uint64[3];		/* 8 or 24 bytes for DES or DES3 */
-+	uint64_t *aligned_key;
-+	uint64_t tmp;
-+	uint_t	i, j;
-+
-+	switch (keysize) {
-+	case 8: /* DES */
-+		encryption_ks = ((t4_keysched_t *)ks)->ksch_encrypt;
-+		decryption_ks = ((t4_keysched_t *)ks)->ksch_decrypt;
-+		break;
-+	case 24: /* DES3 */
-+		encryption_ks = ((t4_keysched3_t *)ks)->ksch_encrypt;
-+		decryption_ks = ((t4_keysched3_t *)ks)->ksch_decrypt;
-+		break;
-+	default:
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_CIPHER_KEY);
-+		return (0);
-+	}
-+
-+	/* Align key, if needed */
-+	if (((unsigned long)cipherKey & 0x7) == 0) { /* aligned */
-+		/* LINTED: pointer alignment */
-+		aligned_key = (uint64_t *)cipherKey;
-+	} else { /* unaligned--copy byte-by-byte */
-+		for (i = 0, j = 0; j < keysize; ++i, j += 8) {
-+			key_uint64[i] = (((uint64_t)cipherKey[j] << 56) |
-+			    ((uint64_t)cipherKey[j + 1] << 48) |
-+			    ((uint64_t)cipherKey[j + 2] << 40) |
-+			    ((uint64_t)cipherKey[j + 3] << 32) |
-+			    ((uint64_t)cipherKey[j + 4] << 24) |
-+			    ((uint64_t)cipherKey[j + 5] << 16) |
-+			    ((uint64_t)cipherKey[j + 6] << 8) |
-+			    (uint64_t)cipherKey[j + 7]);
-+		}
-+		aligned_key = key_uint64;
-+	}
-+
-+	/* Expand key schedule */
-+	switch (keysize) {
-+	case 8: /* DES */
-+		t4_des_expand(keysched, (const uint32_t *)aligned_key);
-+		break;
-+
-+	case 24: /* DES3 */
-+		t4_des_expand(keysched, (const uint32_t *)aligned_key);
-+		t4_des_expand(keysched + 16,
-+		    (const uint32_t *)&aligned_key[1]);
-+		for (i = 0; i < 8; ++i) {
-+			tmp = keysched[16 + i];
-+			keysched[16 + i] = keysched[31 - i];
-+			keysched[31 - i] = tmp;
-+		}
-+		t4_des_expand(keysched + 32,
-+		    (const uint32_t *)&aligned_key[2]);
-+		break;
-+
-+	default:
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_CIPHER_KEY);
-+		return (0);
-+	}
-+
-+	/* Save encryption key schedule */
-+	memcpy(encryption_ks, keysched, keysize * 16);
-+
-+	/* Reverse key schedule */
-+	for (i = 0; i < keysize; ++i) {
-+		tmp = keysched[i];
-+		keysched[i] = keysched[2 * keysize - 1 - i];
-+		keysched[2 * keysize -1 -i] = tmp;
-+	}
-+
-+	/* Save decryption key schedule */
-+	memcpy(decryption_ks, keysched, keysize * 16);
-+
-+	return (1);
-+}
-+
-+
-+/* ARGSUSED2 */
-+static int
-+t4_cipher_init_des(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+    const unsigned char *iv, int enc)
-+{
-+	t4_des_cipher_ctx_t	*tctx = ctx->cipher_data;
-+	uint64_t		*encryption_ks, *decryption_ks;
-+	t4_des_cipher_t		*t4_cipher;
-+	t4_des_cipher_id	index;
-+	unsigned int		key_len = ctx->key_len;
-+	uint64_t		aligned_key_buffer[3]; /* 8 or 24 bytes long */
-+	uint64_t		*aligned_key;
-+
-+	if (key == NULL) {
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_CIPHER_KEY);
-+		return (0);
-+	}
-+
-+	/* Get the cipher entry index in t4_des_cipher_table from nid */
-+	index = get_des_cipher_index_by_nid(ctx->cipher->nid);
-+	if (index >= T4_DES_MAX) {
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_CIPHER_NID);
-+		return (0); /* Error */
-+	}
-+	t4_cipher = &t4_des_cipher_table[index];
-+
-+	/* Check key size and iv size */
-+	if (ctx->cipher->iv_len < t4_cipher->iv_len) {
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_IV_LEN_INCORRECT);
-+		return (0); /* Error */
-+	}
-+	if ((key_len < t4_cipher->min_key_len) ||
-+	    (key_len > t4_cipher->max_key_len)) {
-+		T4err(T4_F_CIPHER_INIT_DES, T4_R_KEY_LEN_INCORRECT);
-+		return (0); /* Error */
-+	}
-+
-+	/* Expand key schedule */
-+	if (t4_des_init_keysched(key, key_len, &tctx->ks) == 0)
-+		return (0); /* Error */
-+
-+	/* Save index to cipher */
-+	tctx->index = index;
-+
-+	/* Align IV, if needed */
-+	if (t4_cipher->iv_len <= 0) { /* no IV (such as with ECB mode) */
-+		tctx->iv = NULL;
-+	} else if (((unsigned long)ctx->iv & 0x7) == 0) { /* already aligned */
-+		tctx->iv = (uint64_t *)ctx->iv;
-+	} else {
-+		/* IV is not 8 byte aligned */
-+		(void) memcpy(&tctx->aligned_iv_buffer, ctx->iv,
-+		    ctx->cipher->iv_len);
-+		tctx->iv = &tctx->aligned_iv_buffer;
-+#ifdef	DEBUG_T4
-+		(void) fprintf(stderr,
-+		    "t4_cipher_init_des: IV is not 8 byte aligned\n");
-+		(void) fprintf(stderr,
-+		    "t4_cipher_init_des: ctx->cipher->iv_len =%d\n",
-+		    ctx->cipher->iv_len);
-+		(void) fprintf(stderr, "t4_cipher_init_des: after "
-+		    "re-alignment, tctx->iv = %p\n", (void *)tctx->iv);
-+#endif	/* DEBUG_T4 */
-+	}
-+
-+	return (1);
-+}
-+
-+
-+/*
-+ * ENCRYPT_UPDATE or DECRYPT_UPDATE
-+ */
-+#define	T4_CIPHER_DO_DES(t4_cipher_do_des, t4_des_load_keys,		\
-+    t4_des_encrypt, t4_des_decrypt, ksched_encrypt, ksched_decrypt, iv)	\
-+static int								\
-+t4_cipher_do_des(EVP_CIPHER_CTX *ctx, unsigned char *out,		\
-+    const unsigned char *in, size_t inl)				\
-+{									\
-+	t4_des_cipher_ctx_t	*tctx = ctx->cipher_data;		\
-+	unsigned long	outl = inl;					\
-+	unsigned char	*bufin_alloc = NULL, *bufout_alloc = NULL;	\
-+	unsigned char	*bufin, *bufout;				\
-+									\
-+	/* "in" and "out" must be 8 byte aligned */			\
-+	if (((unsigned long)in & 0x7) == 0) { /* already aligned */	\
-+		bufin = (unsigned char *)in;				\
-+	} else { /* "in" is not 8 byte aligned */			\
-+		if (((unsigned long)out & 0x7) == 0) { /* aligned */	\
-+			/* use output buffer for input */		\
-+			bufin = out;					\
-+		} else {						\
-+			bufin = bufin_alloc = OPENSSL_malloc(inl);	\
-+			if (bufin_alloc == NULL)			\
-+				return (0); /* error */			\
-+		}							\
-+		(void) memcpy(bufin, in, inl);				\
-+	}								\
-+									\
-+	/* Data length must be an even multiple of block size. */	\
-+	if ((inl & 0x7) != 0) {						\
-+		OPENSSL_free(bufout_alloc);				\
-+		OPENSSL_free(bufin_alloc);				\
-+		T4err(T4_F_CIPHER_DO_DES, T4_R_NOT_BLOCKSIZE_LENGTH);	\
-+		return (0);						\
-+	}								\
-+									\
-+	if (((unsigned long)out & 0x7) == 0) { /* already aligned */	\
-+		bufout = out;						\
-+	} else { /* "out" is not 8 byte aligned */			\
-+		if (bufin_alloc != NULL) {				\
-+			/* use allocated input buffer for output */	\
-+			bufout = bufin_alloc;				\
-+		} else {						\
-+			bufout = bufout_alloc = OPENSSL_malloc(outl);	\
-+			if (bufout_alloc == NULL) {			\
-+				OPENSSL_free(bufin_alloc);		\
-+				return (0); /* error */			\
-+			}						\
-+		}							\
-+	}								\
-+									\
-+	if (ctx->encrypt) {						\
-+		uint64_t	*ksch_encrypt = ksched_encrypt;		\
-+		t4_des_load_keys(ksch_encrypt);				\
-+		t4_des_encrypt(ksch_encrypt, (uint64_t *)bufin,		\
-+		    (uint64_t *)bufout, (size_t)inl, iv);		\
-+	} else { /* decrypt */						\
-+		uint64_t	*ksch_decrypt = ksched_decrypt;		\
-+		t4_des_load_keys(ksch_decrypt);				\
-+		t4_des_decrypt(ksch_decrypt, (uint64_t *)bufin,		\
-+		    (uint64_t *)bufout, (size_t)inl, iv);		\
-+	}								\
-+									\
-+	/* Cleanup */							\
-+	if (bufin_alloc != NULL) {					\
-+		if (bufout == bufin_alloc)				\
-+			(void) memcpy(out, bufout, outl);		\
-+		OPENSSL_free(bufin_alloc);				\
-+	}								\
-+	if (bufout_alloc != NULL) {					\
-+		(void) memcpy(out, bufout_alloc, outl);			\
-+		OPENSSL_free(bufout_alloc);				\
-+	}								\
-+									\
-+	return (1);							\
-+}
-+
-+
-+/* DES CBC mode. */
-+T4_CIPHER_DO_DES(t4_cipher_do_des_cbc, t4_des_load_keys,
-+	t4_des_cbc_encrypt, t4_des_cbc_decrypt,
-+	tctx->ks.des.ksch_encrypt, tctx->ks.des.ksch_decrypt, tctx->iv)
-+T4_CIPHER_DO_DES(t4_cipher_do_des3_cbc, t4_des3_load_keys,
-+	t4_des3_cbc_encrypt, t4_des3_cbc_decrypt,
-+	tctx->ks.des3.ksch_encrypt, tctx->ks.des3.ksch_decrypt, tctx->iv)
-+
-+/* DES ECB mode. */
-+T4_CIPHER_DO_DES(t4_cipher_do_des_ecb, t4_des_load_keys,
-+	t4_des_ecb_crypt, t4_des_ecb_crypt,
-+	tctx->ks.des.ksch_encrypt, tctx->ks.des.ksch_decrypt, NULL)
-+T4_CIPHER_DO_DES(t4_cipher_do_des3_ecb, t4_des3_load_keys,
-+	t4_des3_ecb_crypt, t4_des3_ecb_crypt,
-+	tctx->ks.des3.ksch_encrypt, tctx->ks.des3.ksch_decrypt, NULL)
-+
-+
-+#endif	/* COMPILE_HW_T4 */
-+#endif	/* !OPENSSL_NO_HW && !OPENSSL_NO_HW_DES_T4 && !OPENSSL_NO_DES */
-Index: crypto/engine/eng_t4_err.c
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_err.c openssl-1.0.1e/engine/eng_t4_err.c
---- openssl-1.0.1e/crypto/engine/eng_t4_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1e/crypto/engine/eng_t4_err.c 2013-03-11 18:15:54.571043544 +0100
-@@ -0,0 +1,157 @@
-+/*
-+ * This product includes cryptographic software developed by the OpenSSL
-+ * Project for use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ */
-+
-+/*
-+ * ====================================================================
-+ * Copyright (c) 1998-2011 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
-+ *    openssl-core 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.
-+ * ====================================================================
-+ */
-+
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+#include 
-+#include "eng_t4_err.h"
-+
-+/* BEGIN ERROR CODES */
-+
-+#ifndef	OPENSSL_NO_ERR
-+
-+#define	ERR_FUNC(func)		ERR_PACK(0, func, 0)
-+#define	ERR_REASON(reason)	ERR_PACK(0, 0, reason)
-+
-+static ERR_STRING_DATA t4_str_functs[] = {
-+	{ERR_FUNC(T4_F_INIT),			"T4_INIT"},
-+	{ERR_FUNC(T4_F_DESTROY),		"T4_DESTROY"},
-+	{ERR_FUNC(T4_F_FINISH),			"T4_FINISH"},
-+	{ERR_FUNC(T4_F_CIPHER_INIT_AES),	"T4_CIPHER_INIT_AES"},
-+	{ERR_FUNC(T4_F_ADD_NID),		"T4_ADD_NID"},
-+	{ERR_FUNC(T4_F_GET_ALL_CIPHERS),	"T4_GET_ALL_CIPHERS"},
-+	{ERR_FUNC(T4_F_CIPHER_DO_AES),		"T4_CIPHER_DO_AES"},
-+	{ERR_FUNC(T4_F_CIPHER_CLEANUP),		"T4_CIPHER_CLEANUP"},
-+	{ERR_FUNC(T4_F_CIPHER_INIT_DES),	"T4_CIPHER_INIT_DES"},
-+	{ERR_FUNC(T4_F_CIPHER_DO_DES),		"T4_CIPHER_DO_DES"},
-+	{0, NULL}
-+};
-+
-+static ERR_STRING_DATA t4_str_reasons[] = {
-+	{ERR_REASON(T4_R_CIPHER_KEY),		"invalid cipher key"},
-+	{ERR_REASON(T4_R_CIPHER_NID),		"invalid cipher NID"},
-+	{ERR_REASON(T4_R_IV_LEN_INCORRECT),	"IV length incorrect"},
-+	{ERR_REASON(T4_R_KEY_LEN_INCORRECT),	"key length incorrect"},
-+	{ERR_REASON(T4_R_ASN1_OBJECT_CREATE),	"ASN1_OBJECT_create failed"},
-+	{ERR_REASON(T4_R_NOT_BLOCKSIZE_LENGTH),	"blocksize length not even"},
-+	{0, NULL}
-+};
-+#endif	/* OPENSSL_NO_ERR */
-+
-+
-+#ifdef T4_LIB_NAME
-+static ERR_STRING_DATA T4_lib_name[] = {
-+	{0, T4_LIB_NAME},
-+	{0, NULL}
-+};
-+#endif
-+
-+static int t4_error_code = 0;
-+static int t4_error_init = 1;
-+
-+
-+static void
-+ERR_load_t4_strings(void)
-+{
-+	if (t4_error_code == 0)
-+		t4_error_code = ERR_get_next_error_library();
-+
-+	if (t4_error_init != 0) {
-+		t4_error_init = 0;
-+
-+#ifndef OPENSSL_NO_ERR
-+		ERR_load_strings(t4_error_code, t4_str_functs);
-+		ERR_load_strings(t4_error_code, t4_str_reasons);
-+#endif
-+
-+#ifdef T4_LIB_NAME
-+		T4_lib_name->error =
-+		    ERR_PACK(t4_error_code, 0, 0);
-+		ERR_load_strings(0, T4_lib_name);
-+#endif
-+	}
-+}
-+
-+
-+static void
-+ERR_unload_t4_strings(void)
-+{
-+	if (t4_error_init == 0) {
-+#ifndef OPENSSL_NO_ERR
-+		ERR_unload_strings(t4_error_code, t4_str_functs);
-+		ERR_unload_strings(t4_error_code, t4_str_reasons);
-+#endif
-+
-+#ifdef T4_LIB_NAME
-+		ERR_unload_strings(0, T4_lib_name);
-+#endif
-+		t4_error_init = 1;
-+	}
-+}
-+
-+
-+static void
-+ERR_t4_error(int function, int reason, char *file, int line)
-+{
-+	if (t4_error_init != 0) {
-+		ERR_load_t4_strings();
-+	}
-+
-+	if (t4_error_code == 0)
-+		t4_error_code = ERR_get_next_error_library();
-+	ERR_PUT_error(t4_error_code, function, reason, file, line);
-+}
-Index: crypto/engine/eng_t4_md5.c
-===================================================================
-diff -uNr openssl-1.0.1e/engine/eng_t4_md5.c openssl-1.0.1e/engine/eng_t4_md5.c

@@ 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 Jan 19 18:49:54 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 19 Jan 2014 17:49:54 +0000
Subject: SF.net SVN: gar:[22857] csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.
	1f-t4-engine.sparc.5.11.patch
Message-ID: <3f6k735ZMJz1MX@mail.opencsw.org>

Revision: 22857
          http://sourceforge.net/p/gar/code/22857
Author:   chninkel
Date:     2014-01-19 17:49:52 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
openssl1/trunk: Fixed t4 engine patch which was depending on another solaris patch that we don't use here (wantboot)

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch	2014-01-19 17:48:29 UTC (rev 22856)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch	2014-01-19 17:49:52 UTC (rev 22857)
@@ -103,10 +103,9 @@
  .global	OPENSSL_cleanse
  .align	32
  OPENSSL_cleanse:
-@@ -398,6 +433,102 @@
+@@ -398,5 +433,101 @@
  .size	OPENSSL_cleanse,.-OPENSSL_cleanse
  
- #ifndef _BOOT
 +.global	_sparcv9_vis1_instrument_bus
 +.align	8
 +_sparcv9_vis1_instrument_bus:
@@ -211,7 +210,7 @@
 diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c
 --- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700
 +++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700
-@@ -4,31 +4,55 @@
+@@ -4,27 +4,52 @@
  #include 
  #include 
  #include 
@@ -228,13 +227,9 @@
 +#if defined(__GNUC__) && defined(__linux)
 +__attribute__((visibility("hidden")))
 +#endif
- #ifndef	_BOOT
++
 -static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
 +unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_TICK_PRIVILEGED,0};
- #else
--static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
-+unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_VIS1,0};
- #endif
  
  int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
  	{
@@ -280,7 +275,7 @@
  	}
  
  unsigned long	_sparcv9_rdtick(void);
-@@ -36,11 +60,18 @@
+@@ -36,10 +60,17 @@
  unsigned long	_sparcv9_vis1_instrument(void);
  void		_sparcv9_vis2_probe(void);
  void		_sparcv9_fmadd_probe(void);
@@ -292,7 +287,6 @@
 +size_t		_sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
 +#endif
  
- #ifndef _BOOT
  unsigned long OPENSSL_rdtsc(void)
  	{
 -	if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
@@ -322,18 +316,9 @@
 +	else
 +		return 0;
 +	}
- #endif
-
- #if defined(_BOOT)
-@@ -58,7 +107,7 @@
-  */
- void OPENSSL_cpuid_setup(void)
- 	{
--	OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
-+	OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1;
- 	}
  
- #elif 0 && defined(__sun) && defined(__SVR4)
+ #if 0 && defined(__sun) && defined(__SVR4)
+ /* This code path is disabled, because of incompatibility of
 @@ -85,11 +116,11 @@
  	if (!strcmp (name,"SUNW,UltraSPARC") ||
  	    !strncmp(name,"SUNW,UltraSPARC-I",17))  /* covers II,III,IV */
@@ -2324,7 +2309,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/sparc_arch.h openssl-1.0.1f/crypto/sparc_arch.h
 --- openssl-1.0.1f/crypto/sparc_arch.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/sparc_arch.h 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/sparc_arch.h 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,101 @@
 +#ifndef __SPARC_ARCH_H__
 +#define	__SPARC_ARCH_H__
@@ -2431,7 +2416,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl
 --- openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,434 @@
 +#!/usr/bin/env perl
 +
@@ -2871,7 +2856,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl
 --- openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,902 @@
 +#!/usr/bin/env perl
 +
@@ -3779,7 +3764,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl
 --- openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,602 @@
 +#!/usr/bin/env perl
 +
@@ -4387,7 +4372,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl
 --- openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,1680 @@
 +#!/usr/bin/env perl
 +
@@ -6073,7 +6058,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl
 --- openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,373 @@
 +#!/usr/bin/env perl
 +
@@ -6452,7 +6437,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl
 --- openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,198 @@
 +#!/usr/bin/env perl
 +#
@@ -6656,7 +6641,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl
 --- openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-01-19 13:44:18.%N +0100
 @@ -0,0 +1,1222 @@
 +#!/usr/bin/env perl
 +

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From bonivart at users.sourceforge.net  Sun Jan 19 21:13:58 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 19 Jan 2014 20:13:58 +0000
Subject: SF.net SVN: gar:[22858] csw/mgar/pkg/clamav/trunk
Message-ID: <3f6nKF1SBDz4l@mail.opencsw.org>

Revision: 22858
          http://sourceforge.net/p/gar/code/22858
Author:   bonivart
Date:     2014-01-19 20:13:53 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
clamav/trunk: update to 0.98.1

Modified Paths:
--------------
    csw/mgar/pkg/clamav/trunk/Makefile
    csw/mgar/pkg/clamav/trunk/checksums

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2014-01-19 17:49:52 UTC (rev 22857)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2014-01-19 20:13:53 UTC (rev 22858)
@@ -1,5 +1,5 @@
 NAME       = clamav
-VERSION    = 0.98
+VERSION    = 0.98.1
 GARTYPE = v2
 
 DESCRIPTION = Clam AntiVirus
@@ -16,16 +16,17 @@
 RUNTIME_DEP_PKGS_CSWclamav  = CSWlibclam6
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0
 
 PACKAGES                     += CSWlibclam6
 CATALOGNAME_CSWlibclam6       = libclam6
 SPKG_DESC_CSWlibclam6         = $(DESCRIPTION) Library
 RUNTIME_DEP_PKGS_CSWlibclam6  = CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibxml2-2
 INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav
 
 PACKAGES                         += CSWlibclam6-dev
@@ -83,18 +84,24 @@
 
 #SKIPTEST = 1
 
+# Only "needed" for examples
+CHECKPKG_OVERRIDES_CSWclamav += missing-dependency|CSWperl
+
 # These are harmless examples
-CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.18
+CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.20
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
 
 # We don't split to three separate packages
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.18|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.18|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.18|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.20|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.20|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.20|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
 
 # Weirdly needed for sparc
 CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6
 
+# Weirdly needed for i386
+CHECKPKG_OVERRIDES_CSWclamav += surplus-dependency|CSWlibbz2-1-0
+
 include gar/category.mk
 
 DOCS  = AUTHORS BUGS ChangeLog

Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums	2014-01-19 17:49:52 UTC (rev 22857)
+++ csw/mgar/pkg/clamav/trunk/checksums	2014-01-19 20:13:53 UTC (rev 22858)
@@ -1 +1 @@
-ca0b8c930efcb8be1d47592d268006c5  clamav-0.98.tar.gz
+4ab14833d959d5d62c64ce8d9bd16a5e  clamav-0.98.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Sun Jan 19 23:14:56 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 19 Jan 2014 22:14:56 +0000
Subject: SF.net SVN: gar:[22859] csw/mgar/pkg/lftp/trunk
Message-ID: <3f6r0v71SlzDl@mail.opencsw.org>

Revision: 22859
          http://sourceforge.net/p/gar/code/22859
Author:   chninkel
Date:     2014-01-19 22:14:53 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
lftp: updated to 4.4.14

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	2014-01-19 20:13:53 UTC (rev 22858)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2014-01-19 22:14:53 UTC (rev 22859)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = lftp
-VERSION = 4.4.13
+VERSION = 4.4.14
 GARTYPE = v2
 
 DESCRIPTION = A sophisticated command-line ftp/http client

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2014-01-19 20:13:53 UTC (rev 22858)
+++ csw/mgar/pkg/lftp/trunk/checksums	2014-01-19 22:14:53 UTC (rev 22859)
@@ -1 +1 @@
-23eeb89e66f71a059c77674e631c358a  lftp-4.4.13.tar.gz
+e999f33f5f119b20090664ce3c0a9ffd  lftp-4.4.14.tar.gz

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-01-19 20:13:53 UTC (rev 22858)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-01-19 22:14:53 UTC (rev 22859)
@@ -1,3 +1,9 @@
+lftp (4.4.14,REV=2014.01.19) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard   Sun, 19 Jan 2014 23:05:26 +0100
+
 lftp (4.4.13,REV=2013.11.29) unstable
 
   * New upstream release.

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 Jan 20 07:32:11 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 20 Jan 2014 06:32:11 +0000
Subject: SF.net SVN: gar:[22860] csw/mgar/pkg/trac/trunk/Makefile
Message-ID: <3f732Y3WL3zXC@mail.opencsw.org>

Revision: 22860
          http://sourceforge.net/p/gar/code/22860
Author:   rthurner
Date:     2014-01-20 06:32:07 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
trac/trunk: remove unused overrides

Modified Paths:
--------------
    csw/mgar/pkg/trac/trunk/Makefile

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2014-01-19 22:14:53 UTC (rev 22859)
+++ csw/mgar/pkg/trac/trunk/Makefile	2014-01-20 06:32:07 UTC (rev 22860)
@@ -32,15 +32,6 @@
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn
 CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/share/doc/trac/contrib/bugzilla2trac.py
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/share/doc/trac/contrib/trac-svn-hook
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModPython
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracPlugins
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModWSGI
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracFineGrainedPermissions
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracInstall
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModPython
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracFastCgi
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracInstall
 
 
 TEST_SCRIPTS           =

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 Jan 20 07:34:32 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 20 Jan 2014 06:34:32 +0000
Subject: SF.net SVN: gar:[22861] csw/mgar/pkg/trac/trunk/Makefile
Message-ID: <3f735H69QHzbb@mail.opencsw.org>

Revision: 22861
          http://sourceforge.net/p/gar/code/22861
Author:   rthurner
Date:     2014-01-20 06:34:28 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
trac/trunk: remove unused override

Modified Paths:
--------------
    csw/mgar/pkg/trac/trunk/Makefile

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2014-01-20 06:32:07 UTC (rev 22860)
+++ csw/mgar/pkg/trac/trunk/Makefile	2014-01-20 06:34:28 UTC (rev 22861)
@@ -31,7 +31,6 @@
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpysetuptools
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn
-CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/share/doc/trac/contrib/bugzilla2trac.py
 
 
 TEST_SCRIPTS           =

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 Jan 20 07:53:56 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 20 Jan 2014 06:53:56 +0000
Subject: SF.net SVN: gar:[22862] csw/mgar/pkg/trac/trunk/Makefile
Message-ID: <3f73Wg1jJPzgL@mail.opencsw.org>

Revision: 22862
          http://sourceforge.net/p/gar/code/22862
Author:   rthurner
Date:     2014-01-20 06:53:56 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
trac/trunk: add overrides again, x86 complains, solaris requires them ...

Modified Paths:
--------------
    csw/mgar/pkg/trac/trunk/Makefile

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2014-01-20 06:34:28 UTC (rev 22861)
+++ csw/mgar/pkg/trac/trunk/Makefile	2014-01-20 06:53:56 UTC (rev 22862)
@@ -32,7 +32,26 @@
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn
 
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracInstall
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracPlugins
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracFineGrainedPermissions
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracModWSGI
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracModWSGI
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracFineGrainedPermissions
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracPlugins
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracInstall
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracInstall
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracFastCgi
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/trac/wiki/default-pages/TracModWSGI
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracModWSGI
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracFastCgi
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/trac/wiki/default-pages/TracInstall
 
+
 TEST_SCRIPTS           =
 
 include gar/category.mk

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Tue Jan 21 22:50:58 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 21 Jan 2014 21:50:58 +0000
Subject: SF.net SVN: gar:[22863] csw/mgar/pkg/zsh/trunk
Message-ID: <3f83NK70qdzK1@mail.opencsw.org>

Revision: 22863
          http://sourceforge.net/p/gar/code/22863
Author:   opk
Date:     2014-01-21 21:50:56 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
/tmp/opk-mgar/zsh/trunk: update zsh to 5.0.5

Modified Paths:
--------------
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/checksums

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2014-01-20 06:53:56 UTC (rev 22862)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2014-01-21 21:50:56 UTC (rev 22863)
@@ -1,5 +1,5 @@
 NAME = zsh
-VERSION = 5.0.4
+VERSION = 5.0.5
 GARTYPE = v2
 
 DESCRIPTION = Powerful UNIX shell
@@ -30,8 +30,8 @@
 CONFIGURE_ARGS += --enable-pcre
 CONFIGURE_ARGS += --enable-etcdir=$(sysconfdir)
 
-CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION)
-
+CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh
+EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/zsh-$(VERSION)
 ETCSHELLS = /opt/csw/bin/zsh
 
 include gar/category.mk

Modified: csw/mgar/pkg/zsh/trunk/checksums
===================================================================
--- csw/mgar/pkg/zsh/trunk/checksums	2014-01-20 06:53:56 UTC (rev 22862)
+++ csw/mgar/pkg/zsh/trunk/checksums	2014-01-21 21:50:56 UTC (rev 22863)
@@ -1 +1 @@
-9829fe8932c25740173a272e8959cf8c  zsh-5.0.4.tar.bz2
+6156dc2f19b0a067bdbc0fb7f81e2017  zsh-5.0.5.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From wahwah at users.sourceforge.net  Wed Jan 22 10:09:15 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 22 Jan 2014 09:09:15 +0000
Subject: SF.net SVN: gar:[22864] csw/mgar/pkg/llvm/trunk
Message-ID: <3f8LQt0hJ7ztG@mail.opencsw.org>

Revision: 22864
          http://sourceforge.net/p/gar/code/22864
Author:   wahwah
Date:     2014-01-22 09:09:13 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
llvm/trunk: Commit my local changes. Nothing works. The helper idea is probably stupid.

Modified Paths:
--------------
    csw/mgar/pkg/llvm/trunk/Makefile
    csw/mgar/pkg/llvm/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/llvm/trunk/files/gar_helper.sh

Modified: csw/mgar/pkg/llvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/llvm/trunk/Makefile	2014-01-21 21:50:56 UTC (rev 22863)
+++ csw/mgar/pkg/llvm/trunk/Makefile	2014-01-22 09:09:13 UTC (rev 22864)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = llvm
-VERSION = 2.9
+VERSION = 3.0
 GARTYPE = v2
 
 DESCRIPTION = Collection of modular and reusable compiler and toolchain technologies
@@ -11,12 +11,15 @@
 endef
 
 MASTER_SITES = http://llvm.org/releases/$(VERSION)/
-DISTFILES  = $(DISTNAME).tgz
+DISTFILES   = llvm-$(VERSION).tar.gz
+DISTFILES  += clang-$(VERSION).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 = 
+DISTNAME = llvm-$(VERSION).src
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+NOGITPATCH = 1
+
 GARCOMPILER = GNU
 
 libdir = $(prefix)/lib/llvm
@@ -28,6 +31,10 @@
 # http://lists.cs.uiuc.edu/pipermail/llvmbugs/2010-December/015968.html
 CONFIGURE_ARGS += --enable-bindings=none
 # CONFIGURE_ARGS += --enable-libffi
+CONFIGURE_ARGS += --enable-shared
+# CONFIGURE_ARGS += --with-llvmgcc
+# CONFIGURE_ARGS += --with-llvmgxx
+# CONFIGURE_ARGS += --with-clang
 
 PATCHFILES += 0001-limits.h-used-for-MAX_PATH.patch
 PATCHFILES += 0002-OpenCSW-bash-for-tests.patch
@@ -39,14 +46,14 @@
 
 ENABLE_OPTIMIZED = 1
 OPTIMIZE_OPTION = -O0
-SHELL = /opt/csw/bin/bash
 CONFIG_SHELL = /opt/csw/bin/bash
 EXTRA_CONFIGURE_EXPORTS  = ENABLE_OPTIMIZED
 EXTRA_CONFIGURE_EXPORTS += OPTIMIZE_OPTION
 EXTRA_CONFIGURE_EXPORTS += CONFIG_SHELL
 EXTRA_BUILD_EXPORTS  = ENABLE_OPTIMIZED
 EXTRA_BUILD_EXPORTS += OPTIMIZE_OPTION
-EXTRA_TEST_EXPORTS = SHELL
+# SHELL = /opt/csw/bin/bash
+# EXTRA_TEST_EXPORTS = SHELL
 
 NM = /opt/csw/bin/gnm
 EXTRA_CONFIGURE_EXPORTS += NM
@@ -67,9 +74,17 @@
 # http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
 # http://opencsw.wikidot.com/porting-faq#toc6
 # ifeq ($(ISA),sparcv8)
-OPT_FLAGS_GCC = -O0
+# OPT_FLAGS_GCC = -O0
 # endif
 # ifeq ($(ISA),i386)
 # OPT_FLAGS_GCC =
 # endif
 
+# pre-configure-modulated:
+# 	(cd $(WORKSRC)/tools && gln -s -v ../../clang-$(VERSION) clang)
+# 	@$(MAKECOOKIE)
+
+pre-configure-modulated:
+	(cd $(WORKSRC)/tools; gln -v -s ../../clang-$(VERSION).src clang)
+	# $(FILEDIR)/gar_helper.sh $@ "$(WORKSRC)"
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/llvm/trunk/checksums
===================================================================
--- csw/mgar/pkg/llvm/trunk/checksums	2014-01-21 21:50:56 UTC (rev 22863)
+++ csw/mgar/pkg/llvm/trunk/checksums	2014-01-22 09:09:13 UTC (rev 22864)
@@ -1 +1,2 @@
-793138412d2af2c7c7f54615f8943771  llvm-2.9.tgz
+43350706ae6cf05d0068885792ea0591  clang-3.0.tar.gz
+a8e5f5f1c1adebae7b4a654c376a6005  llvm-3.0.tar.gz

Added: csw/mgar/pkg/llvm/trunk/files/gar_helper.sh
===================================================================
--- csw/mgar/pkg/llvm/trunk/files/gar_helper.sh	                        (rev 0)
+++ csw/mgar/pkg/llvm/trunk/files/gar_helper.sh	2014-01-22 09:09:13 UTC (rev 22864)
@@ -0,0 +1,20 @@
+#!/opt/csw/bin/bash
+# vim:sw=2 ts=2 sts=2 expandtab:
+
+echo "called: $0 $*"
+
+readonly WORKSRC=$2
+
+case "$1" in
+  post-extract-modulated)
+    pushd ${WORKSRC}
+    pushd tools
+    ln -s ../../clang-3.0.src clang
+    popd
+    popd
+    ;;
+  *)
+    echo "Dunno what to do with '$1'."
+    ;;
+esac
+exit 1


Property changes on: csw/mgar/pkg/llvm/trunk/files/gar_helper.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
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 Jan 22 21:32:22 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 20:32:22 +0000
Subject: SF.net SVN: gar:[22865] csw/mgar/pkg/cpan/Class-Container/trunk
Message-ID: <3f8db610xdz7W@mail.opencsw.org>

Revision: 22865
          http://sourceforge.net/p/gar/code/22865
Author:   dmichelsen
Date:     2014-01-22 20:32:20 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
cpan/Class-Container/trunk: Update to makemake and sanitize package name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Container/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Class-Container/trunk/files/COPYING

Modified: csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2014-01-22 09:09:13 UTC (rev 22864)
+++ csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2014-01-22 20:32:20 UTC (rev 22865)
@@ -6,21 +6,24 @@
 
 DESCRIPTION = Glues object frameworks together transparently
 define BLURB
-  This class facilitates building frameworks of several classes that
-  inter-operate. It was first designed and built for HTML::Mason, in which the
-  Compiler, Lexer, Interpreter, Resolver, Component, Buffer, and several other
-  objects must create each other transparently, passing the appropriate
-  parameters to the right class, possibly substituting other subclasses for
-  any of these objects.
 endef
 
-DISTFILES = COPYING
+CATALOG_RELEASE = unstable
 
-DEP_PKGS = CSWpmparamsvalidate
+LICENSE_TEXT = This module is licensed under the perl license
 
-PACKAGES = CSWpmclscontainer
-CATALOGNAME = pm_clscontainer
+PACKAGES += CSWpm-class-container
+CATALOGNAME_CSWpm-class-container = pm_class_container
+SPKG_DESC_CSWpm-class-container = Glues object frameworks together transparently
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-class-container = 1
+RUNTIME_DEP_PKGS_CSWpm-class-container += CSWpm-params-validate
+OBSOLETED_BY_CSWpm-class-container += CSWpmclscontainer
+CATALOGNAME_CSWpmclscontainer = pm_clscontainer_stub
 
-ARCHALL = 1
+CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL
+BUILD_SCRIPTS = $(WORKSRC)/Build
+TEST_SCRIPTS = $(WORKSRC)/Build
+INSTALL_SCRIPTS = $(WORKSRC)/Build
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Class-Container/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Class-Container/trunk/checksums	2014-01-22 09:09:13 UTC (rev 22864)
+++ csw/mgar/pkg/cpan/Class-Container/trunk/checksums	2014-01-22 20:32:20 UTC (rev 22865)
@@ -1,2 +1 @@
-887efd6c24205452c5327aaba29886c4  COPYING
 6896bdb4464b96ad638e22b0400acbc9  Class-Container-0.12.tar.gz

Deleted: csw/mgar/pkg/cpan/Class-Container/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Class-Container/trunk/files/COPYING	2014-01-22 09:09:13 UTC (rev 22864)
+++ csw/mgar/pkg/cpan/Class-Container/trunk/files/COPYING	2014-01-22 20:32:20 UTC (rev 22865)
@@ -1,11 +0,0 @@
-AUTHOR
-    Originally by Ken Williams  and Dave Rolsky
-     for the HTML::Mason project. Important feedback
-    contributed by Jonathan Swartz . Extended by Ken
-    Williams for the AI::Categorizer project.
-
-    Currently maintained by Ken Williams.
-
-COPYRIGHT
-    This program is free software; you can redistribute it and/or modify it
-    under the same terms as Perl itself.

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 Jan 22 21:43:42 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 20:43:42 +0000
Subject: SF.net SVN: gar:[22866] csw/mgar/pkg/cpan/Sort-Naturally/trunk
Message-ID: <3f8dr76k99zCn@mail.opencsw.org>

Revision: 22866
          http://sourceforge.net/p/gar/code/22866
Author:   dmichelsen
Date:     2014-01-22 20:43:42 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
cpan/Sort-Naturally/trunk: Update to 1.03 and makemake

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile
    csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING

Modified: csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile	2014-01-22 20:32:20 UTC (rev 22865)
+++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile	2014-01-22 20:43:42 UTC (rev 22866)
@@ -1,18 +1,23 @@
 NAME = Sort-Naturally
-VERSION = 1.02
+VERSION = 1.03
 CATEGORIES = cpan
 GARTYPE = v2
-AUTHOR = SBURKE
+AUTHOR = BINGOS
 
 DESCRIPTION = Sort lexically, but sort numeral parts numerically
 define BLURB
 endef
 
-DISTFILES = COPYING
+CATALOG_RELEASE = unstable
 
-PACKAGES = CSWpmsortnaturally
-CATALOGNAME = pm_sortnaturally
+LICENSE_TEXT = This module is licensed under the perl license
 
-ARCHALL = 1
+PACKAGES += CSWpm-sort-naturally
+CATALOGNAME_CSWpm-sort-naturally = pm_sort_naturally
+SPKG_DESC_CSWpm-sort-naturally = Sort lexically, but sort numeral parts numerically
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-sort-naturally = 1
+OBSOLETED_BY_CSWpm-sort-naturally += CSWpmsortnaturally
+CATALOGNAME_CSWpmsortnaturally = pm_sortnaturally_stub
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums	2014-01-22 20:32:20 UTC (rev 22865)
+++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/checksums	2014-01-22 20:43:42 UTC (rev 22866)
@@ -1 +1 @@
-a173f3f8f519ebae6e5e578e843f6e1c  Sort-Naturally-1.02.tar.gz
+fef2e36d1b1ea23ee79ec68b5872453f  Sort-Naturally-1.03.tar.gz

Deleted: csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING	2014-01-22 20:32:20 UTC (rev 22865)
+++ csw/mgar/pkg/cpan/Sort-Naturally/trunk/files/COPYING	2014-01-22 20:43:42 UTC (rev 22866)
@@ -1,11 +0,0 @@
-Copyright 2001, Sean M. Burke , all rights
-reserved.
-
-The programs and documentation in this dist are distributed in
-the hope that they will be useful, but without any warranty; without
-even the implied warranty of merchantability or fitness for a
-particular purpose.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-

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 Jan 22 21:49:21 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 20:49:21 +0000
Subject: SF.net SVN: gar:[22867] csw/mgar/pkg/wget/trunk
Message-ID: <3f8dyg4hmTzJ6@mail.opencsw.org>

Revision: 22867
          http://sourceforge.net/p/gar/code/22867
Author:   dmichelsen
Date:     2014-01-22 20:49:21 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
wget/trunk: Update to 1.15

Modified Paths:
--------------
    csw/mgar/pkg/wget/trunk/Makefile
    csw/mgar/pkg/wget/trunk/checksums

Modified: csw/mgar/pkg/wget/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wget/trunk/Makefile	2014-01-22 20:43:42 UTC (rev 22866)
+++ csw/mgar/pkg/wget/trunk/Makefile	2014-01-22 20:49:21 UTC (rev 22867)
@@ -4,7 +4,7 @@
 #     https://lists.gnu.org/archive/html/bug-wget/2011-09/msg00001.html
 
 NAME = wget
-VERSION = 1.14
+VERSION = 1.15
 
 DESCRIPTION = A network utility to retrieve files from the Web
 define BLURB
@@ -31,6 +31,7 @@
 RUNTIME_DEP_PKGS_CSWwget += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWwget += CSWlibidn11
 RUNTIME_DEP_PKGS_CSWwget += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWwget += CSWlibuuid1
 
 EXTRA_MODULATORS = STATIC
 MODULATIONS_STATIC = disable enable

Modified: csw/mgar/pkg/wget/trunk/checksums
===================================================================
--- csw/mgar/pkg/wget/trunk/checksums	2014-01-22 20:43:42 UTC (rev 22866)
+++ csw/mgar/pkg/wget/trunk/checksums	2014-01-22 20:49:21 UTC (rev 22867)
@@ -1 +1 @@
-316f6f59292c9098ad81fd54f658c579  wget-1.14.tar.xz
+7a279d5ac5594919124d5526e7143e28  wget-1.15.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  Wed Jan 22 22:02:53 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 21:02:53 +0000
Subject: SF.net SVN: gar:[22868] csw/mgar/pkg/cpan
Message-ID: <3f8fGH1cKMzNM@mail.opencsw.org>

Revision: 22868
          http://sourceforge.net/p/gar/code/22868
Author:   dmichelsen
Date:     2014-01-22 21:02:50 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
cpan/File-Find-Rule-Perl: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/branches/
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/tags/
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/Makefile
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/checksums
    csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/files/

Index: csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk
===================================================================
--- csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk	2014-01-22 20:49:21 UTC (rev 22867)
+++ csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk	2014-01-22 21:02:50 UTC (rev 22868)

Property changes on: csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/Makefile	2014-01-22 21:02:50 UTC (rev 22868)
@@ -0,0 +1,24 @@
+NAME = File-Find-Rule-Perl
+VERSION = 1.13
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = ADAMK
+
+DESCRIPTION = Common rules for searching for Perl things
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE = LICENSE
+
+PACKAGES += CSWpm-file-find-rule-perl
+CATALOGNAME_CSWpm-file-find-rule-perl = pm_file_find_rule_perl
+SPKG_DESC_CSWpm-file-find-rule-perl = Common rules for searching for Perl things
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-file-find-rule-perl = 1
+RUNTIME_DEP_PKGS_CSWpm-file-find-rule-perl += CSWpm-file-find-rule
+RUNTIME_DEP_PKGS_CSWpm-file-find-rule-perl += CSWpm-params-util
+RUNTIME_DEP_PKGS_CSWpm-file-find-rule-perl += CSWpm-parse-cpan-meta
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/File-Find-Rule-Perl/trunk/checksums	2014-01-22 21:02:50 UTC (rev 22868)
@@ -0,0 +1 @@
+c3ee4f00f643f82fdb6f1cbcebfa90de  File-Find-Rule-Perl-1.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 Jan 22 22:10:17 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 21:10:17 +0000
Subject: SF.net SVN: gar:[22869] csw/mgar/pkg/cpan
Message-ID: <3f8fQq0GyTzTt@mail.opencsw.org>

Revision: 22869
          http://sourceforge.net/p/gar/code/22869
Author:   dmichelsen
Date:     2014-01-22 21:10:16 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
cpan/Test-Version: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Test-Version/
    csw/mgar/pkg/cpan/Test-Version/branches/
    csw/mgar/pkg/cpan/Test-Version/tags/
    csw/mgar/pkg/cpan/Test-Version/trunk/
    csw/mgar/pkg/cpan/Test-Version/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Version/trunk/checksums
    csw/mgar/pkg/cpan/Test-Version/trunk/files/

Index: csw/mgar/pkg/cpan/Test-Version/trunk
===================================================================
--- csw/mgar/pkg/cpan/Test-Version/trunk	2014-01-22 21:02:50 UTC (rev 22868)
+++ csw/mgar/pkg/cpan/Test-Version/trunk	2014-01-22 21:10:16 UTC (rev 22869)

Property changes on: csw/mgar/pkg/cpan/Test-Version/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/cpan/Test-Version/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-Version/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Test-Version/trunk/Makefile	2014-01-22 21:10:16 UTC (rev 22869)
@@ -0,0 +1,25 @@
+NAME = Test-Version
+VERSION = 1.002004
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = XENO
+
+DESCRIPTION = Check to see that version's in modules are sane
+define BLURB
+endef
+
+CATALOG_RELEASE = unstable
+
+LICENSE = LICENSE
+
+BUILD_DEP_PKGS += CSWpm-test-exception
+BUILD_DEP_PKGS += CSWpm-test-tester
+
+PACKAGES += CSWpm-test-version
+CATALOGNAME_CSWpm-test-version = pm_test_version
+SPKG_DESC_CSWpm-test-version = Check to see that version's in modules are sane
+ARCHALL_CSWpm-test-version = 1
+RUNTIME_DEP_PKGS_CSWpm-test-version += CSWpm-file-find-rule-perl
+RUNTIME_DEP_PKGS_CSWpm-test-version += CSWpm-module-metadata
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Test-Version/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Test-Version/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Test-Version/trunk/checksums	2014-01-22 21:10:16 UTC (rev 22869)
@@ -0,0 +1 @@
+58d140bdfbed940453da85e9a73145c8  Test-Version-1.002004.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 Jan 22 22:17:50 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jan 2014 21:17:50 +0000
Subject: SF.net SVN: gar:[22870] csw/mgar/pkg/cpan/Tree-Simple/trunk
Message-ID: <3f8fbY2kBxzYr@mail.opencsw.org>

Revision: 22870
          http://sourceforge.net/p/gar/code/22870
Author:   dmichelsen
Date:     2014-01-22 21:17:48 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
cpan/Tree-Simple/trunk: Update to 1.23 and makemake

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Tree-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Tree-Simple/trunk/checksums

Modified: csw/mgar/pkg/cpan/Tree-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Tree-Simple/trunk/Makefile	2014-01-22 21:10:16 UTC (rev 22869)
+++ csw/mgar/pkg/cpan/Tree-Simple/trunk/Makefile	2014-01-22 21:17:48 UTC (rev 22870)
@@ -1,25 +1,33 @@
 NAME = Tree-Simple
-VERSION = 1.18
+VERSION = 1.23
 CATEGORIES = cpan
 GARTYPE = v2
-AUTHOR = STEVAN
+AUTHOR = RSAVAGE
 
-DESCRIPTION = a simple tree object
+DESCRIPTION = A simple tree object
 define BLURB
-  This module in an fully object-oriented implementation of a simple n-ary
-  tree.  It is built upon the concept of parent-child relationships, so
-  therefore every Tree::Simple object has both a parent and a set of children
-  (who themselves may have children, and so on). Every Tree::Simple object
-  also has siblings, as they are just the children of their immediate parent.
 endef
 
-RUNTIME_DEP_PKGS_CSWpmtreesimple = CSWpmtstexception
-BUILD_DEP_PKGS_CSWpmtreesimple = CSWpmtstexception
+MODDIST = Tree-Simple-1.23.tgz
 
-PACKAGES = CSWpmtreesimple
-CATALOGNAME = pm_treesimple
-ARCHALL = 1
+CATALOG_RELEASE = unstable
 
-LICENSE = README
+LICENSE_TEXT = This module is licensed under the perl license, please see for details https://www.gnu.org/licenses/license-list.html#PerlLicense
 
+BUILD_DEP_PKGS += CSWpm-test-version
+BUILD_DEP_PKGS += CSWpm-test-exception
+
+PACKAGES += CSWpm-tree-simple
+CATALOGNAME_CSWpm-tree-simple = pm_tree_simple
+SPKG_DESC_CSWpm-tree-simple = A simple tree object
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-tree-simple = 1
+OBSOLETED_BY_CSWpm-tree-simple += CSWpmtreesimple
+CATALOGNAME_CSWpmtreesimple = pm_treesimple_stub
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL
+BUILD_SCRIPTS = $(WORKSRC)/Build
+TEST_SCRIPTS = $(WORKSRC)/Build
+INSTALL_SCRIPTS = $(WORKSRC)/Build
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Tree-Simple/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Tree-Simple/trunk/checksums	2014-01-22 21:10:16 UTC (rev 22869)
+++ csw/mgar/pkg/cpan/Tree-Simple/trunk/checksums	2014-01-22 21:17:48 UTC (rev 22870)
@@ -1 +1 @@
-70462938108a8b8658b1b1d2f12dbeab  Tree-Simple-1.18.tar.gz
+827b2d3d9d7c876aa92fcc7357ecf348  Tree-Simple-1.23.tgz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 23 12:57:45 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 23 Jan 2014 11:57:45 +0000
Subject: SF.net SVN: gar:[22871] csw/mgar/pkg
Message-ID: <3f926z6dKJz1V1@mail.opencsw.org>

Revision: 22871
          http://sourceforge.net/p/gar/code/22871
Author:   opk
Date:     2014-01-23 11:57:45 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
add packaging of wmctrl

Added Paths:
-----------
    csw/mgar/pkg/wmctrl/
    csw/mgar/pkg/wmctrl/Makefile
    csw/mgar/pkg/wmctrl/branches/
    csw/mgar/pkg/wmctrl/tags/
    csw/mgar/pkg/wmctrl/trunk/
    csw/mgar/pkg/wmctrl/trunk/Makefile
    csw/mgar/pkg/wmctrl/trunk/checksums
    csw/mgar/pkg/wmctrl/trunk/files/
    csw/mgar/pkg/wmctrl/trunk/files/0001-remove-gcc-specific-flags.patch

Added: csw/mgar/pkg/wmctrl/Makefile
===================================================================
--- csw/mgar/pkg/wmctrl/Makefile	                        (rev 0)
+++ csw/mgar/pkg/wmctrl/Makefile	2014-01-23 11:57:45 UTC (rev 22871)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/wmctrl/trunk
===================================================================
--- csw/mgar/pkg/wmctrl/trunk	2014-01-22 21:17:48 UTC (rev 22870)
+++ csw/mgar/pkg/wmctrl/trunk	2014-01-23 11:57:45 UTC (rev 22871)

Property changes on: csw/mgar/pkg/wmctrl/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/wmctrl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wmctrl/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/wmctrl/trunk/Makefile	2014-01-23 11:57:45 UTC (rev 22871)
@@ -0,0 +1,28 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = wmctrl
+VERSION = 1.07
+GARTYPE = v2
+
+DESCRIPTION = Command-line tool to interact with the X Window Manager
+define BLURB
+  wmctrl provides command line access to almost all the features
+  defined in the EWMH specification. It can be used, for example, to
+  get information about the window manager, to get a detailed list of
+  desktops and managed windows, to switch and resize desktops, to make
+  windows full-screen, always-above or sticky, and to activate, close,
+  move, resize, maximize and minimize them.
+endef
+
+MASTER_SITES = http://tomas.styblo.name/wmctrl/dist/
+DISTFILES  = $(DISTNAME).tar.gz
+LICENSE = COPYING
+
+RUNTIME_DEP_PKGS_CSWwmctrl += CSWlibglib2-0-0
+
+PATCHFILES += 0001-remove-gcc-specific-flags.patch
+CONFIGURE_ARGS = $(DIRPATHS)
+TEST_SCRIPTS =
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/wmctrl/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/wmctrl/trunk/checksums
===================================================================
--- csw/mgar/pkg/wmctrl/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/wmctrl/trunk/checksums	2014-01-23 11:57:45 UTC (rev 22871)
@@ -0,0 +1 @@
+1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz

Added: csw/mgar/pkg/wmctrl/trunk/files/0001-remove-gcc-specific-flags.patch
===================================================================
--- csw/mgar/pkg/wmctrl/trunk/files/0001-remove-gcc-specific-flags.patch	                        (rev 0)
+++ csw/mgar/pkg/wmctrl/trunk/files/0001-remove-gcc-specific-flags.patch	2014-01-23 11:57:45 UTC (rev 22871)
@@ -0,0 +1,25 @@
+From 6e326d38e74027686a891e7b5aa95434a271a8a5 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle 
+Date: Thu, 23 Jan 2014 12:49:37 +0100
+Subject: [PATCH] remove gcc specific flags
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ec70e02..6dd0a0b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -113,7 +113,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-AM_CFLAGS = -Wall
++AM_CFLAGS =
+ AM_CPPFLAGS = @X_CFLAGS@ @GLIB_CFLAGS@
+ LDADD = @X_LIBS@ @X_PRE_LIBS@ -lX11 -lXmu @X_EXTRA_LIBS@ @GLIB_LIBS@
+ 
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 23 13:02:50 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 23 Jan 2014 12:02:50 +0000
Subject: SF.net SVN: gar:[22872] csw/mgar/pkg/wmctrl/trunk/Makefile
Message-ID: <3f92Dh22tNzp@mail.opencsw.org>

Revision: 22872
          http://sourceforge.net/p/gar/code/22872
Author:   opk
Date:     2014-01-23 12:02:47 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
additional wmctrl dependency needed on sparc

Modified Paths:
--------------
    csw/mgar/pkg/wmctrl/trunk/Makefile

Modified: csw/mgar/pkg/wmctrl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wmctrl/trunk/Makefile	2014-01-23 11:57:45 UTC (rev 22871)
+++ csw/mgar/pkg/wmctrl/trunk/Makefile	2014-01-23 12:02:47 UTC (rev 22872)
@@ -19,7 +19,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 LICENSE = COPYING
 
-RUNTIME_DEP_PKGS_CSWwmctrl += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWwmctrl += CSWlibglib2-0-0 CSWlibintl8
 
 PATCHFILES += 0001-remove-gcc-specific-flags.patch
 CONFIGURE_ARGS = $(DIRPATHS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 23 14:27:38 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 23 Jan 2014 13:27:38 +0000
Subject: SF.net SVN: gar:[22873] csw/mgar/pkg/meld/trunk
Message-ID: <3f946Y2HbszBS@mail.opencsw.org>

Revision: 22873
          http://sourceforge.net/p/gar/code/22873
Author:   opk
Date:     2014-01-23 13:27:36 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
update meld to 1.8.3

Modified Paths:
--------------
    csw/mgar/pkg/meld/trunk/Makefile
    csw/mgar/pkg/meld/trunk/checksums

Modified: csw/mgar/pkg/meld/trunk/Makefile
===================================================================
--- csw/mgar/pkg/meld/trunk/Makefile	2014-01-23 12:02:47 UTC (rev 22872)
+++ csw/mgar/pkg/meld/trunk/Makefile	2014-01-23 13:27:36 UTC (rev 22873)
@@ -2,20 +2,29 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = meld
-VERSION = 1.5.4
+VERSION = 1.8.3
 GARTYPE = v2
 
 DESCRIPTION = Visual diff and merge tool
 define BLURB
-  Long description
+  Meld is a visual diff and merge tool targeted at developers. Meld
+  helps you compare files, directories and version controlled
+  projects. It provides tow- and three-way comparison of both files
+  and directories and has support for many popular version control
+  systems.
 endef
 
-MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/1.5/
+MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/$(basename $(VERSION))/
 DISTFILES  = $(DISTNAME).tar.xz
 
 # PATCHFILES += 0001-Allow-to-use-a-different-install-utility.patch
 PATCHFILES += 0001-Use-conditionals-for-installation-places.patch
 
+REINPLACEMENTS += python
+REINPLACE_MATCH_python = \#!.*python.*
+REINPLACE_WITH_python = \#!$(bindir)/python
+REINPLACE_FILES_python += bin/meld
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 INSTALL_SCRIPTS = meld
@@ -24,21 +33,10 @@
 EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
 
 ARCHALL_CSWmeld = 1
-RUNTIME_DEP_PKGS_CSWmeld += CSWpython
+RUNTIME_DEP_PKGS_CSWmeld += CSWpy-gtk CSWpy-gobject
 
-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 += surplus-dependency|CSWpy-gobject
+CHECKPKG_OVERRIDES_CSWmeld += surplus-dependency|CSWpy-gtk
 CHECKPKG_OVERRIDES_CSWmeld += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWmeld += catalogname-does-not-start-with-py_
 

Modified: csw/mgar/pkg/meld/trunk/checksums
===================================================================
--- csw/mgar/pkg/meld/trunk/checksums	2014-01-23 12:02:47 UTC (rev 22872)
+++ csw/mgar/pkg/meld/trunk/checksums	2014-01-23 13:27:36 UTC (rev 22873)
@@ -1 +1 @@
-2f3929551d876ff45acf21b2c1e3e71a  meld-1.5.4.tar.xz
+8254815c9358283e5e6a9d90f6846746  meld-1.8.3.tar.xz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From janholzh at users.sourceforge.net  Thu Jan 23 16:32:12 2014
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 23 Jan 2014 15:32:12 +0000
Subject: SF.net SVN: gar:[22874] csw/mgar/pkg
Message-ID: <3f96tW5TgJzPD@mail.opencsw.org>

Revision: 22874
          http://sourceforge.net/p/gar/code/22874
Author:   janholzh
Date:     2014-01-23 15:32:11 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
Initial commit under clang instead of llvm since thats what people are probably looking for. Does seem to work on X86. Can't compile on sparc as our gcc explodes. It probably still needs some tweaks but can be tested

Added Paths:
-----------
    csw/mgar/pkg/clang/
    csw/mgar/pkg/clang/Makefile
    csw/mgar/pkg/clang/branches/
    csw/mgar/pkg/clang/tags/
    csw/mgar/pkg/clang/trunk/
    csw/mgar/pkg/clang/trunk/Makefile
    csw/mgar/pkg/clang/trunk/checksums
    csw/mgar/pkg/clang/trunk/files/
    csw/mgar/pkg/clang/trunk/files/0001-use_a_tail_that_works.patch
    csw/mgar/pkg/clang/trunk/files/0002-fix-endiness.patch
    csw/mgar/pkg/clang/trunk/files/0003-fix_Solaris_opencsw_gcc.patch
    csw/mgar/pkg/clang/trunk/files/map.clang

Added: csw/mgar/pkg/clang/Makefile
===================================================================
--- csw/mgar/pkg/clang/Makefile	                        (rev 0)
+++ csw/mgar/pkg/clang/Makefile	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/clang/trunk
===================================================================
--- csw/mgar/pkg/clang/trunk	2014-01-23 13:27:36 UTC (rev 22873)
+++ csw/mgar/pkg/clang/trunk	2014-01-23 15:32:11 UTC (rev 22874)

Property changes on: csw/mgar/pkg/clang/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/clang/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clang/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/Makefile	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,69 @@
+# TODO (release-critical prefixed with !, non release-critical with *)
+# most stuff from here: https://github.com/joyent/pkgsrc/blob/trunk/lang/clang/Makefile
+#
+NAME = llvm
+VERSION = 3.4
+GARTYPE = v2
+
+DESCRIPTION = Clangis a compiler front end for the C, C++, Objective-C and Objective-C++ programming languages
+define BLURB
+  Clang is a compiler front end for the C, C++, Objective-C and Objective-C++ programming languages.It uses LLVM as its back end.
+endef
+
+MASTER_SITES = http://llvm.org/releases/$(VERSION)/
+DISTFILES  = llvm-$(VERSION).src.tar.gz
+DISTFILES  += clang-$(VERSION).src.tar.gz
+PATCHFILES += 0001-use_a_tail_that_works.patch
+PATCHFILES += 0002-fix-endiness.patch
+PATCHFILES += 0003-fix_Solaris_opencsw_gcc.patch
+
+PACKAGES = CSWclang
+CATALOGNAME_CSWclang = clang
+SPKG_DESC_CSWclang += $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWclang += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWclang += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWclang += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWclang += CSWlibz1
+# Kind of bad but it needs crtbegin.o and crtend.o which are in /opt/csw/lib/gcc/*/4.x.x/ with new gcc clang needs to be rebuild because of this.
+RUNTIME_DEP_PKGS_CSWclang += CSWgcc4core
+CHECKPKG_OVERRIDES_CSWclang += surplus-dependency|CSWgcc4core
+
+CHECKPKG_OVERRIDES_CSWclang += bad-rpath-entry
+CHECKPKG_OVERRIDES_CSWclang += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWclang += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWclang += no-direct-binding
+CHECKPKG_OVERRIDES_CSWclang += soname-equals-filename|file=/opt/csw/lib/BugpointPasses.so
+CHECKPKG_OVERRIDES_CSWclang += soname-equals-filename|file=/opt/csw/lib/LLVMHello.so
+CHECKPKG_OVERRIDES_CSWclang += soname-equals-filename|file=/opt/csw/lib/libLTO.so
+CHECKPKG_OVERRIDES_CSWclang += soname-equals-filename|file=/opt/csw/lib/libclang.so
+
+
+NOGITPATCH = 1
+
+GARCOMPILER = GNU
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-assertions
+CONFIGURE_ARGS += --disable-bindings # disable OCaml
+CONFIGURE_ARGS += --disable-timestamps
+CONFIGURE_ARGS += --enable-optimized
+CONFIGURE_ARGS += --with-extra-ld-options="-mimpure-text -lrt"
+CONFIGURE_ARGS += --with-gcc-toolchain="/opt/csw/gcc4/bin"
+CONFIGURE_ARGS += --with-c-include-dirs="/usr/include:/opt/csw/include"
+
+# Solaris 10 needs a special map file since we need newer libc 
+# This sets the minumum Solaris 10 Version to Update 9
+#This is do to use of futimens the check is here: http://llvm.org/viewvc/llvm-project?view=revision&revision=185601 the check is there but it checks in the headers but default map file prevents use of it. Needs fix not sure what to set where so it's update 9 for now
+        LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.clang)"
+DISTFILES += map.clang
+
+EXTRA_CFLAGS += -mimpure-text
+
+SKIPTEST = 1
+#TEST_TARGET = unittests
+
+include gar/category.mk
+
+post-extract:
+	mv $(WORKDIR)/clang-$(VERSION) $(WORKDIR)/llvm-$(VERSION)/tools/clang
+	echo "int sun_ld_needs_a_symbol=0;" >> $(WORKSRC)/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/clang/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/clang/trunk/checksums
===================================================================
--- csw/mgar/pkg/clang/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/checksums	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,2 @@
+b378f1e2c424e03289effc75268d3d2c  clang-3.4.src.tar.gz
+46ed668a1ce38985120dbf6344cf6116  llvm-3.4.src.tar.gz

Added: csw/mgar/pkg/clang/trunk/files/0001-use_a_tail_that_works.patch
===================================================================
--- csw/mgar/pkg/clang/trunk/files/0001-use_a_tail_that_works.patch	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/files/0001-use_a_tail_that_works.patch	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,23 @@
+From 66a87373e049ad52a919d8cc71c76a3b0c25ddb9 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter 
+Date: Mon, 22 Apr 2013 14:32:37 +0200
+Subject: [PATCH] use_a_tail_that_works
+
+---
+ unittests/ExecutionEngine/JIT/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittests/ExecutionEngine/JIT/Makefile b/unittests/ExecutionEngine/JIT/Makefile
+index 9e0bb9e..dbe4022 100644
+--- a/unittests/ExecutionEngine/JIT/Makefile
++++ b/unittests/ExecutionEngine/JIT/Makefile
+@@ -45,5 +45,5 @@ LD.Flags += $(RDYNAMIC)
+ # Symbol exports are necessary (at least for now) when building with LTO.
+ $(LLVMUnitTestExe): $(NativeExportsFile)
+ $(PROJ_OBJ_DIR)/JITTests.exports: $(PROJ_SRC_DIR)/JITTests.def $(PROJ_OBJ_DIR)/.dir
+-	tail -n +2 $< > $@
++	/usr/xpg4/bin/tail -n +2 $< > $@
+ 
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/clang/trunk/files/0002-fix-endiness.patch
===================================================================
--- csw/mgar/pkg/clang/trunk/files/0002-fix-endiness.patch	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/files/0002-fix-endiness.patch	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,37 @@
+From 9ad289ac739368dd2eb7e5ec0aa6da8017fb5e27 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter 
+Date: Wed, 22 Jan 2014 11:33:43 +0100
+Subject: [PATCH] fix-endiness
+
+---
+ include/llvm/Support/Host.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
+index 28c4cc7..138c2c0 100644
+--- a/include/llvm/Support/Host.h
++++ b/include/llvm/Support/Host.h
+@@ -18,6 +18,20 @@
+ 
+ #if defined(__linux__) || defined(__GNU__)
+ #include 
++#elif defined(__sun) & defined(__SVR4)
++# ifndef BYTE_ORDER
++# define LITTLE_ENDIAN 1234
++# define BIG_ENDIAN 4321
++# if defined(__sun) & defined(__SVR4)
++# include 
++# ifdef _LITTLE_ENDIAN
++# define BYTE_ORDER LITTLE_ENDIAN
++# endif
++# ifdef _BIG_ENDIAN
++# define BYTE_ORDER BIG_ENDIAN
++# endif
++# endif /* sun */
++# endif /* BYTE_ORDER */
+ #else
+ #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32)
+ #include 
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/clang/trunk/files/0003-fix_Solaris_opencsw_gcc.patch
===================================================================
--- csw/mgar/pkg/clang/trunk/files/0003-fix_Solaris_opencsw_gcc.patch	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/files/0003-fix_Solaris_opencsw_gcc.patch	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,191 @@
+From cff1b46375ed812e052023d0ca71c47b2d5c5ae8 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter 
+Date: Wed, 22 Jan 2014 12:37:53 +0100
+Subject: [PATCH] fix_Solaris_opencsw_gcc
+
+---
+ tools/clang/lib/Driver/Tools.cpp | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+index 29713ed..2f58fbc 100644
+--- a/tools/clang/lib/Driver/Tools.cpp
++++ b/tools/clang/lib/Driver/Tools.cpp
+@@ -4653,7 +4653,7 @@ void darwin::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   // asm_final spec is empty.
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5085,7 +5085,7 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   Args.AddAllArgs(CmdArgs, options::OPT_F);
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5176,7 +5176,7 @@ void solaris::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5187,18 +5187,18 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA,
+                                   const ArgList &Args,
+                                   const char *LinkingOutput) const {
+   // FIXME: Find a real GCC, don't hard-code versions here
+-  std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/";
++  std::string GCCLibPath = "/opt/csw/lib/gcc/";
+   const llvm::Triple &T = getToolChain().getTriple();
+   std::string LibPath = "/usr/lib/";
+   llvm::Triple::ArchType Arch = T.getArch();
+   switch (Arch) {
+   case llvm::Triple::x86:
+     GCCLibPath +=
+-        ("i386-" + T.getVendorName() + "-" + T.getOSName()).str() + "/4.5.2/";
++        ("i386-" + T.getVendorName() + "-" + T.getOSName()).str() + "/4.8.2/";
+     break;
+   case llvm::Triple::x86_64:
+     GCCLibPath += ("i386-" + T.getVendorName() + "-" + T.getOSName()).str();
+-    GCCLibPath += "/4.5.2/amd64/";
++    GCCLibPath += "/4.8.2/amd64/";
+     LibPath += "amd64/";
+     break;
+   default:
+@@ -5282,7 +5282,7 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5394,7 +5394,7 @@ void auroraux::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5452,7 +5452,7 @@ void openbsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5584,7 +5584,7 @@ void openbsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5608,7 +5608,7 @@ void bitrig::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5724,7 +5724,7 @@ void bitrig::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5799,7 +5799,7 @@ void freebsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6063,7 +6063,7 @@ void netbsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+     CmdArgs.push_back(II.getFilename());
+   }
+ 
+-  const char *Exec = Args.MakeArgString((getToolChain().GetProgramPath("as")));
++  const char *Exec = Args.MakeArgString((getToolChain().GetProgramPath("gas")));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6183,7 +6183,7 @@ void netbsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
+ 
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+-  const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++  const char *Exec = Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6302,7 +6302,7 @@ void gnutools::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ 
+   // Handle the debug info splitting at object creation time if we're
+@@ -6654,7 +6654,7 @@ void minix::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6708,7 +6708,7 @@ void minix::Link::ConstructJob(Compilation &C, const JobAction &JA,
+          Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
+   }
+ 
+-  const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++  const char *Exec = Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6741,7 +6741,7 @@ void dragonfly::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("as"));
++    Args.MakeArgString(getToolChain().GetProgramPath("gas"));
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6892,7 +6892,7 @@ void dragonfly::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString("/usr/ccs/bin/ld");
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/clang/trunk/files/map.clang
===================================================================
--- csw/mgar/pkg/clang/trunk/files/map.clang	                        (rev 0)
+++ csw/mgar/pkg/clang/trunk/files/map.clang	2014-01-23 15:32:11 UTC (rev 22874)
@@ -0,0 +1,3 @@
+libc.so - SUNW_1.22.6 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.6;
+libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2;
+libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 23 21:50:46 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 23 Jan 2014 20:50:46 +0000
Subject: SF.net SVN: gar:[22875] csw/mgar/pkg/qiv/trunk
Message-ID: <3f9Fxw2Wfzzp9@mail.opencsw.org>

Revision: 22875
          http://sourceforge.net/p/gar/code/22875
Author:   opk
Date:     2014-01-23 20:50:45 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
qiv/trunk: update to 2.3.1

Modified Paths:
--------------
    csw/mgar/pkg/qiv/trunk/Makefile
    csw/mgar/pkg/qiv/trunk/checksums
    csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch

Modified: csw/mgar/pkg/qiv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qiv/trunk/Makefile	2014-01-23 15:32:11 UTC (rev 22874)
+++ csw/mgar/pkg/qiv/trunk/Makefile	2014-01-23 20:50:45 UTC (rev 22875)
@@ -2,14 +2,14 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = qiv
-VERSION = 2.2.4
+VERSION = 2.3.1
 GARTYPE = v2
 
 DESCRIPTION = Quick image viewer
 define BLURB
   Quick Image Viewer (qiv) is a fast and simple image viewer based
   on GDK and imlib. Features include zooming, fullscreen, statusbar,
-  screensaver mode, brighness/contrast control, transparency,
+  screensaver mode, brightness/contrast control, transparency,
   slideshow, exif autorotation and a browse mode.
 endef
 
@@ -18,10 +18,12 @@
 LICENSE = README.COPYING
 
 RUNTIME_DEP_PKGS += CSWlibmagic1 CSWlibgdk-x11-2-0-0 CSWlibgdk-pixbuf2-0-0 \
-  CSWlibgobject2-0-0 CSWlibimlib2-1 CSWlibglib2-0-0 CSWpango
+  CSWlibgobject2-0-0 CSWlibimlib2-1 CSWlibglib2-0-0 CSWlibpango1-0-0 \
+  CSWlibtiff5 CSWliblcms2-2 CSWlibexif12 CSWlibjpeg7
 
 PATCHFILES += 0001-adapt-Makefile-for-opencsw.patch
 CONFIGURE_SCRIPTS =
+EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
 BUILD_ARGS = -f Makefile.Solaris
 TEST_SCRIPTS =
 INSTALL_ARGS = -f Makefile.Solaris

Modified: csw/mgar/pkg/qiv/trunk/checksums
===================================================================
--- csw/mgar/pkg/qiv/trunk/checksums	2014-01-23 15:32:11 UTC (rev 22874)
+++ csw/mgar/pkg/qiv/trunk/checksums	2014-01-23 20:50:45 UTC (rev 22875)
@@ -1 +1 @@
-1425f89c90f9c045858fccf24d894c97  qiv-2.2.4.tgz
+93aea7469be64ebd35277a6dac079fc8  qiv-2.3.1.tgz

Modified: csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch
===================================================================
--- csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch	2014-01-23 15:32:11 UTC (rev 22874)
+++ csw/mgar/pkg/qiv/trunk/files/0001-adapt-Makefile-for-opencsw.patch	2014-01-23 20:50:45 UTC (rev 22875)
@@ -1,14 +1,14 @@
-From 51625c4d79ede0386f6034bd08a113ee626b8aa0 Mon Sep 17 00:00:00 2001
+From 1e2f9e4981200dff4884c21eb9add3c1a18ad01e Mon Sep 17 00:00:00 2001
 From: Oliver Kiddle 
-Date: Fri, 5 Jul 2013 14:56:15 +0200
+Date: Thu, 23 Jan 2014 21:46:32 +0100
 Subject: [PATCH] adapt Makefile for opencsw
 
 ---
- Makefile.Solaris | 30 ++++++++++++------------------
- 1 file changed, 12 insertions(+), 18 deletions(-)
+ Makefile.Solaris | 46 ++++++++++++----------------------------------
+ 1 file changed, 12 insertions(+), 34 deletions(-)
 
 diff --git a/Makefile.Solaris b/Makefile.Solaris
-index 3513f4d..74dd04c 100644
+index 527ec58..94c3c2a 100644
 --- a/Makefile.Solaris
 +++ b/Makefile.Solaris
 @@ -26,11 +26,11 @@ FILTER = 1
@@ -23,9 +23,9 @@
 -COMPRESS_PROG = gzip -9f
 +COMPRESS_PROG = true
  
- # Comment this line out if your system doesn't have libXinerama
- # installed (for centering on dual-screen)
-@@ -47,8 +47,8 @@ MAGIC = -DHAVE_MAGIC
+ # Comment this line out if your system doesn't have lcms2 installed
+ # (for minimal Color Management support)
+@@ -51,13 +51,13 @@ EXIF = -DHAVE_EXIF
  # Do not edit below here!
  ######################################################################
  
@@ -36,36 +36,53 @@
  	    -fcaller-saves -ffast-math -fno-strength-reduce \
  	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
  
-@@ -129,21 +129,15 @@ distclean : clean
+-INCLUDES  := $(shell pkg-config --cflags gdk-2.0 imlib2)
+-LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11 lXext
++INCLUDES  := -I/opt/csw/include $(shell pkg-config --cflags gdk-2.0 imlib2)
++LIBS      := $(filter-out -lintl,$(shell pkg-config --libs gdk-2.0 imlib2)) -lX11 -lXext
  
+ # [as] thinks that this is not portable enough:
+ # [lc] I use a virtual screen of 1600x1200, and the resolution is 1024x768,
+@@ -140,33 +140,11 @@ distclean : clean
+ 
  install: $(PROGRAM)
  	@echo "Installing QIV..."
 -	@if [ ! -d $(PREFIX)/bin ]; then \
 -	  install -d -m 0755 $(PREFIX)/bin; \
 -	  echo install -d -m 0755 $(PREFIX)/bin; \
-+	@if [ ! -d $(DESTDIR)$(bindir) ]; then \
-+	  ginstall -d -m 0755 $(DESTDIR)$(bindir); \
-+	  echo ginstall -d -m 0755 $(DESTDIR)$(bindir); \
-         fi
+-        fi
 -	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
 -	@if [ ! -d $(PREFIX)/man/man1 ]; then \
 -	  echo install -d -m 0755 $(PREFIX)/man/man1; \
 -	  install -d -m 0755 $(PREFIX)/man/man1; \
-+	ginstall -s -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)
-+	@if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then \
-+	  echo ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1; \
-+	  ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1; \
- 	fi
+-	fi
 -	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 -	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
+-	install -D -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
+-	install -D -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
+-	@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
+-	  echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
+-	  install -d -m 0755 $(PREFIX)/share/pixmaps; \
+-	fi
+-	install -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
+-	@if [ ! -e $(PREFIX)/share/applications ]; then \
+-	  echo install -d -m 0755 $(PREFIX)/share/applications; \
+-	  install -d -m 0755 $(PREFIX)/share/applications; \
+-	fi
+-	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
 -	@if ./qiv -f ./intro.jpg ; \
 -	then echo "-- Test Passed --" ; \
 -	else echo "-- Test Failed --" ; \
 -	fi
--	@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
-+	ginstall -m 0644 $(PROGRAM).1 $(DESTDIR)$(mandir)/man1
+-	@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/bin/qiv-command\n\n"
++	ginstall -D -s -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
++	ginstall -D -m 0644 $(PROGRAM).1 $(DESTDIR)$(mandir)/man1/$(PROGRAM).1
++	$(COMPRESS_PROG) $(DESTDIR)/man/man1/$(PROGRAM).1
++	ginstall -D -m 0644 qiv.png $(DESTDIR)$(datadir)/share/pixmaps/qiv.png
++	ginstall -D -m 0644 qiv.desktop $(DESTDIR)$(datadir)/applications/qiv.desktop
++	ginstall -D -m 0644 contrib/qiv-command.example $(DESTDIR)$(datadir)/doc/qiv/qiv-command.example
  
  # the end... ;-)
 -- 
-1.8.3.1
+1.8.4.1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Fri Jan 24 13:03:58 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Fri, 24 Jan 2014 12:03:58 +0000
Subject: SF.net SVN: gar:[22876] csw/mgar/pkg
Message-ID: <3f9fCj72pfz7W@mail.opencsw.org>

Revision: 22876
          http://sourceforge.net/p/gar/code/22876
Author:   opk
Date:     2014-01-24 12:03:57 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
update hexedit to 1.2.13 and build it in gar

Added Paths:
-----------
    csw/mgar/pkg/hexedit/
    csw/mgar/pkg/hexedit/Makefile
    csw/mgar/pkg/hexedit/branches/
    csw/mgar/pkg/hexedit/tags/
    csw/mgar/pkg/hexedit/trunk/
    csw/mgar/pkg/hexedit/trunk/Makefile
    csw/mgar/pkg/hexedit/trunk/checksums
    csw/mgar/pkg/hexedit/trunk/files/

Added: csw/mgar/pkg/hexedit/Makefile
===================================================================
--- csw/mgar/pkg/hexedit/Makefile	                        (rev 0)
+++ csw/mgar/pkg/hexedit/Makefile	2014-01-24 12:03:57 UTC (rev 22876)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/hexedit/trunk
===================================================================
--- csw/mgar/pkg/hexedit/trunk	2014-01-23 20:50:45 UTC (rev 22875)
+++ csw/mgar/pkg/hexedit/trunk	2014-01-24 12:03:57 UTC (rev 22876)

Property changes on: csw/mgar/pkg/hexedit/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/hexedit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hexedit/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/hexedit/trunk/Makefile	2014-01-24 12:03:57 UTC (rev 22876)
@@ -0,0 +1,24 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = hexedit
+VERSION = 1.2.13
+GARTYPE = v2
+
+DESCRIPTION = View and edit files in hexadecimal or in ASCII
+define BLURB
+  hexedit shows a file both in ASCII and in hexadecimal. The file can
+  be a device as the file is read a piece at a time. You can modify the
+  file and search through it.
+endef
+
+MASTER_SITES = http://rigaux.org/
+DISTFILES  = $(DISTNAME)-$(VERSION).src.tgz
+DISTNAME = hexedit
+
+RUNTIME_DEP_PKGS = CSWlibncurses5
+
+CONFIGURE_ARGS = $(DIRPATHS) CPPFLAGS="-I/opt/csw/include -I/opt/csw/include/ncurses"
+TEST_SCRIPTS =
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/hexedit/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/hexedit/trunk/checksums
===================================================================
--- csw/mgar/pkg/hexedit/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/hexedit/trunk/checksums	2014-01-24 12:03:57 UTC (rev 22876)
@@ -0,0 +1 @@
+a5af1378d028512a9cad27a5ba3e15f9  hexedit-1.2.13.src.tgz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Fri Jan 24 23:43:04 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 24 Jan 2014 22:43:04 +0000
Subject: SF.net SVN: gar:[22877] csw/mgar/pkg/openssl1/trunk/files
Message-ID: <3f9wP40vHjz192@mail.opencsw.org>

Revision: 22877
          http://sourceforge.net/p/gar/code/22877
Author:   chninkel
Date:     2014-01-24 22:43:03 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
openssl1: update pkcs11 patch file and patch update script so that the pkcs11 engine search location is properly set for Opencsw

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
    csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-24 12:03:57 UTC (rev 22876)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-24 22:43:03 UTC (rev 22877)
@@ -166,9 +166,9 @@
 +	if (strcmp(filename, "pkcs11") == 0)
 +		{
 +#ifdef	_LP64
-+		char *fullpath = "/lib/openssl/engines/64/libpk11.so";
++		char *fullpath = "/opt/csw/lib/openssl/engines/64/libpk11.so";
 +#else
-+		char *fullpath = "/lib/openssl/engines/libpk11.so";
++		char *fullpath = "/opt/csw/lib/openssl/engines/libpk11.so";
 +#endif
 +		result = OPENSSL_malloc(strlen(fullpath) + 1);
 +		if(result == NULL)
@@ -196,7 +196,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
 --- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,3710 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3912,7 +3912,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
 --- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4175,7 +4175,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.c openssl-1.0.1f/engines/e_pk11_err.c
 --- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,306 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4487,7 +4487,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.h openssl-1.0.1f/engines/e_pk11_err.h
 --- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4735,7 +4735,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c openssl-1.0.1f/engines/e_pk11_pub.c
 --- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,3273 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8014,7 +8014,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c openssl-1.0.1f/engines/e_pk11_uri.c
 --- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,869 @@
 +/*
 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8889,7 +8889,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h openssl-1.0.1f/engines/e_pk11_uri.h
 --- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-19 00:24:23.%N +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 00:09:21.952650657 +0100
 @@ -0,0 +1,114 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.

Modified: csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh	2014-01-24 12:03:57 UTC (rev 22876)
+++ csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh	2014-01-24 22:43:03 UTC (rev 22877)
@@ -23,7 +23,8 @@
 	# ar in in /usr/ccs/bin under Solaris 9 and 10 so we change the path
 	wget $WGET_OPTIONS --output-document=- ${SOURCE_URL}/patches/15-pkcs11_engine-0.9.8a.patch | \
 
-		sed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g'
+		gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' | \
+		gsed -e 's,"/lib/openssl/engines\(/64\)*/libpk11.so","/opt/csw/lib/openssl-1.0.0/engines\1/libpk11.so",'
 
 	# in the repository, the new files are not part of the patch, but we merge them
 	# in a single patch

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 Jan 24 23:43:27 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 24 Jan 2014 22:43:27 +0000
Subject: SF.net SVN: gar:[22878] csw/mgar/pkg/openssl1/trunk/Makefile
Message-ID: <3f9wPQ574Sz1Ds@mail.opencsw.org>

Revision: 22878
          http://sourceforge.net/p/gar/code/22878
Author:   chninkel
Date:     2014-01-24 22:43:26 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
openssl1: fix prototype so that engines are properly included

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-24 22:43:03 UTC (rev 22877)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-24 22:43:26 UTC (rev 22878)
@@ -31,6 +31,7 @@
 
 SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
 PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT)
+PKGFILES_CSWlibssl1-0-0 += $(libdir)(/amd64)?/openssl-1.0.0/engines/.*
 PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs 
 PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Sat Jan 25 11:24:11 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 10:24:11 +0000
Subject: SF.net SVN: gar:[22879] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fBCy51Dxtz4M@mail.opencsw.org>

Revision: 22879
          http://sourceforge.net/p/gar/code/22879
Author:   dmichelsen
Date:     2014-01-25 10:24:09 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Add some more adustments

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-24 22:43:26 UTC (rev 22878)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-25 10:24:09 UTC (rev 22879)
@@ -5,13 +5,19 @@
 VERSION = 2.17.0
 GARTYPE = v2
 
-DESCRIPTION = Brief description
+DESCRIPTION = Content distribution tool
 
 MASTER_SITES = http://mirrorbrain.org/files/releases/
 DISTFILES  = $(DISTNAME).tar.gz
 
+# Use patch until this is fixed:
+#   http://mirrorbrain.org/issues/issue130
 PATCHFILES += 0001-Make-geoip-database-position-adjustable.patch
 
+# Use patch until this is fixed:
+#   http://mirrorbrain.org/issues/issue135
+PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
+
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths
@@ -52,12 +58,15 @@
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-psycopg2
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWlibgeoip1
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWperl
+# This is needed for /opt/csw/bin/scanner
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-dbi
 # I know these are needed
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-cmdln
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-mb
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-sqlobject
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-psycopg2
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-dbi
 
 # The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
 
@@ -76,6 +85,12 @@
 REINPLACE_WITH_mbconf = $(sysconfdir)/mirrorbrain.conf
 REINPLACE_FILES_mbconf += tools/scanner.pl
 
+# The language must be in lower case
+REINPLACEMENTS += sql
+REINPLACE_MATCH_sql = 'SQL'
+REINPLACE_WITH_sql = 'sql'
+REINPLACE_FILES_sql += sql/schema-postgresql.sql
+
 GEOIPCITYFILE = $(sharedstatedir)/GeoIP/GeoIPCity.dat
 GEOIPFILE = $(sharedstatedir)/GeoIP/GeoIP.dat
 
@@ -110,6 +125,7 @@
 	ginstall -m 0755 $(WORKSRC)/tools/scanner.pl $(DESTDIR)$(bindir)/scanner
 	ginstall -d $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql
 	ginstall -m 0644 $(WORKSRC)/sql/initialdata-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/initialdata-postgresql.sql
+	@# LANG SQL must in fact be LANG sql (lowercase!) or the creation faills
 	ginstall -m 0644 $(WORKSRC)/sql/schema-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/schema-postgresql.sql
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-01-25 10:24:09 UTC (rev 22879)
@@ -0,0 +1,25 @@
+From 3f59a009b2997cfe2f79ad020613a4a1dbf1ae14 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Sat, 25 Jan 2014 11:17:09 +0100
+Subject: [PATCH] Change default for getaddrinfo
+
+---
+ mb/mb/asn.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mb/mb/asn.py b/mb/mb/asn.py
+index 0b6d602..3a5c2c4 100644
+--- a/mb/mb/asn.py
++++ b/mb/mb/asn.py
+@@ -17,7 +17,7 @@ def iplookup(conn, s):
+         ips = []
+         ip6s = []
+         try:
+-            for res in socket.getaddrinfo(s, 0):
++            for res in socket.getaddrinfo(s, None):
+                 af, socktype, proto, canonname, sa = res
+                 if ':' in sa[0]:
+                     if sa[0] not in ip6s:
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Sat Jan 25 11:35:51 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 10:35:51 +0000
Subject: SF.net SVN: gar:[22880] csw/mgar/pkg/lang-python/mb/trunk/Makefile
Message-ID: <3fBDCM0R0rz80@mail.opencsw.org>

Revision: 22880
          http://sourceforge.net/p/gar/code/22880
Author:   dmichelsen
Date:     2014-01-25 10:35:49 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
lang-python/mb/trunk: Adjust location of scanner

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mb/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 10:24:09 UTC (rev 22879)
+++ csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 10:35:49 UTC (rev 22880)
@@ -27,6 +27,11 @@
 REINPLACE_FILES_conf += mb.py
 REINPLACE_FILES_conf += mb/conf.py
 
+REINPLACEMENTS += scanner
+REINPLACE_MATCH_scanner = /usr/bin/scanner
+REINPLACE_WITH_scanner = $(bindir)/scanner
+REINPLACE_FILES_scanner += mb/mb.py
+
 PACKAGES += CSWpy-mb
 SPKG_DESC_CSWpy-mb = Python module used by the MirrorBrain commandline tools
 # PKGFILES is catchall

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 Jan 25 11:38:42 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 10:38:42 +0000
Subject: SF.net SVN: gar:[22881] csw/mgar/pkg/lang-python/mb/trunk
Message-ID: <3fBDGm3wPWzCk@mail.opencsw.org>

Revision: 22881
          http://sourceforge.net/p/gar/code/22881
Author:   dmichelsen
Date:     2014-01-25 10:38:40 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
lang-python/mb/trunk: Work around API usage as reported in #135

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mb/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch

Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 10:35:49 UTC (rev 22880)
+++ csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 10:38:40 UTC (rev 22881)
@@ -14,6 +14,10 @@
 
 PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch
 
+# Use patch until this is fixed:
+#   http://mirrorbrain.org/issues/issue135
+PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
+
 # We really do only care for MirrorBrain on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Copied: csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch (from rev 22879, csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch)
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-01-25 10:38:40 UTC (rev 22881)
@@ -0,0 +1,25 @@
+From 3f59a009b2997cfe2f79ad020613a4a1dbf1ae14 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Sat, 25 Jan 2014 11:17:09 +0100
+Subject: [PATCH] Change default for getaddrinfo
+
+---
+ mb/mb/asn.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mb/mb/asn.py b/mb/mb/asn.py
+index 0b6d602..3a5c2c4 100644
+--- a/mb/mb/asn.py
++++ b/mb/mb/asn.py
+@@ -17,7 +17,7 @@ def iplookup(conn, s):
+         ips = []
+         ip6s = []
+         try:
+-            for res in socket.getaddrinfo(s, 0):
++            for res in socket.getaddrinfo(s, None):
+                 af, socktype, proto, canonname, sa = res
+                 if ':' in sa[0]:
+                     if sa[0] not in ip6s:
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Sat Jan 25 12:03:13 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 25 Jan 2014 11:03:13 +0000
Subject: SF.net SVN: gar:[22882] csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.
	1f-pkcs11-engine.patch
Message-ID: <3fBDq10tRlzHS@mail.opencsw.org>

Revision: 22882
          http://sourceforge.net/p/gar/code/22882
Author:   chninkel
Date:     2014-01-25 11:03:10 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
openssl1/trunk: really fix the pkcs11 engine location

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-25 10:38:40 UTC (rev 22881)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-25 11:03:10 UTC (rev 22882)
@@ -166,9 +166,9 @@
 +	if (strcmp(filename, "pkcs11") == 0)
 +		{
 +#ifdef	_LP64
-+		char *fullpath = "/opt/csw/lib/openssl/engines/64/libpk11.so";
++		char *fullpath = "/opt/csw/lib/openssl-1.0.0/engines/64/libpk11.so";
 +#else
-+		char *fullpath = "/opt/csw/lib/openssl/engines/libpk11.so";
++		char *fullpath = "/opt/csw/lib/openssl-1.0.0/engines/libpk11.so";
 +#endif
 +		result = OPENSSL_malloc(strlen(fullpath) + 1);
 +		if(result == NULL)
@@ -196,7 +196,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
 --- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,3710 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3912,7 +3912,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
 --- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4175,7 +4175,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.c openssl-1.0.1f/engines/e_pk11_err.c
 --- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,306 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4487,7 +4487,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.h openssl-1.0.1f/engines/e_pk11_err.h
 --- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4735,7 +4735,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c openssl-1.0.1f/engines/e_pk11_pub.c
 --- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,3273 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8014,7 +8014,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c openssl-1.0.1f/engines/e_pk11_uri.c
 --- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,869 @@
 +/*
 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8889,7 +8889,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h openssl-1.0.1f/engines/e_pk11_uri.h
 --- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:02:14.090671745 +0100
 @@ -0,0 +1,114 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.

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 Jan 25 13:10:30 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 25 Jan 2014 12:10:30 +0000
Subject: SF.net SVN: gar:[22883] csw/mgar/pkg/openssl1/trunk
Message-ID: <3fBGJr0DRPzNV@mail.opencsw.org>

Revision: 22883
          http://sourceforge.net/p/gar/code/22883
Author:   chninkel
Date:     2014-01-25 12:10:29 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
openssl1/trunk: really fix the pkcs11 engine location

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
    csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-25 11:03:10 UTC (rev 22882)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-01-25 12:10:29 UTC (rev 22883)
@@ -31,7 +31,7 @@
 
 SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
 PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT)
-PKGFILES_CSWlibssl1-0-0 += $(libdir)(/amd64)?/openssl-1.0.0/engines/.*
+PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.*
 PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs 
 PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* 
 

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-25 11:03:10 UTC (rev 22882)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-01-25 12:10:29 UTC (rev 22883)
@@ -166,7 +166,7 @@
 +	if (strcmp(filename, "pkcs11") == 0)
 +		{
 +#ifdef	_LP64
-+		char *fullpath = "/opt/csw/lib/openssl-1.0.0/engines/64/libpk11.so";
++		char *fullpath = "/opt/csw/lib/64/openssl-1.0.0/engines/libpk11.so";
 +#else
 +		char *fullpath = "/opt/csw/lib/openssl-1.0.0/engines/libpk11.so";
 +#endif
@@ -196,7 +196,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
 --- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,3710 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -3912,7 +3912,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
 --- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4175,7 +4175,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.c openssl-1.0.1f/engines/e_pk11_err.c
 --- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,306 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4487,7 +4487,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.h openssl-1.0.1f/engines/e_pk11_err.h
 --- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4735,7 +4735,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c openssl-1.0.1f/engines/e_pk11_pub.c
 --- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,3273 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8014,7 +8014,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c openssl-1.0.1f/engines/e_pk11_uri.c
 --- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,869 @@
 +/*
 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8889,7 +8889,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h openssl-1.0.1f/engines/e_pk11_uri.h
 --- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:25:24.018899108 +0100
 @@ -0,0 +1,114 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.

Modified: csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh	2014-01-25 11:03:10 UTC (rev 22882)
+++ csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh	2014-01-25 12:10:29 UTC (rev 22883)
@@ -24,7 +24,7 @@
 	wget $WGET_OPTIONS --output-document=- ${SOURCE_URL}/patches/15-pkcs11_engine-0.9.8a.patch | \
 
 		gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' | \
-		gsed -e 's,"/lib/openssl/engines\(/64\)*/libpk11.so","/opt/csw/lib/openssl-1.0.0/engines\1/libpk11.so",'
+		gsed -e 's,"/lib/openssl/engines\(/64\)*/libpk11.so","/opt/csw/lib\1/openssl-1.0.0/engines/libpk11.so",'
 
 	# in the repository, the new files are not part of the patch, but we merge them
 	# in a single patch

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 Jan 25 16:20:26 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 25 Jan 2014 15:20:26 +0000
Subject: SF.net SVN: gar:[22884] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fBLWm4vMNzXQ@mail.opencsw.org>

Revision: 22884
          http://sourceforge.net/p/gar/code/22884
Author:   chninkel
Date:     2014-01-25 15:20:26 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
libserf/trunk: add some build dependencies

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 12:10:29 UTC (rev 22883)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 15:20:26 UTC (rev 22884)
@@ -38,6 +38,9 @@
 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibz1
+BUILD_DEP_PKGS += CSWscons
+BUILD_DEP_PKGS += CSWlibapr-dev
+BUILD_DEP_PKGS += CSWlibaprutil-dev
 
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev

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 Jan 25 16:20:34 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 25 Jan 2014 15:20:34 +0000
Subject: SF.net SVN: gar:[22885] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fBLWw3FjrzYx@mail.opencsw.org>

Revision: 22885
          http://sourceforge.net/p/gar/code/22885
Author:   chninkel
Date:     2014-01-25 15:20:34 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
libserf/trunk: make sure default gar build environment is set up, remove now useless overrides

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 15:20:26 UTC (rev 22884)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 15:20:34 UTC (rev 22885)
@@ -54,30 +54,12 @@
 SCONS_FLAGS += APU=$(bindir)/apu-1-config
 
 CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libapr-1.so.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libaprutil-1.so.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libcrypto.so.1.0.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libdb-4.8.so
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libexpat.so.1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|liblber-2.4.so.2
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libldap-2.4.so.2
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libsendfile.so.1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libssl.so.1.0.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libuuid.so.1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += no-direct-binding|/opt/csw/lib/libserf-1.so.1.3.0|is|not|directly|bound|to|soname|libz.so.1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|liblber-2.4.so.2|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libapr-1.so.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libldap-2.4.so.2|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libssl.so.1.0.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libaprutil-1.so.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libcrypto.so.1.0.0|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += soname-not-found|libexpat.so.1|is|needed|by|opt/csw/lib/libserf-1.so.1.3.0
 
 include gar/category.mk
 
 build-serf:
 	(cd $(WORKSRC); \
+		/usr/bin/env -i $(BUILD_ENV) \
 		scons \
 		$(SCONS_FLAGS) PREFIX=$(prefix) )
 	@$(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  Sat Jan 25 17:05:26 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 16:05:26 +0000
Subject: SF.net SVN: gar:[22886] csw/mgar/pkg
Message-ID: <3fBMWk1bztzh9@mail.opencsw.org>

Revision: 22886
          http://sourceforge.net/p/gar/code/22886
Author:   dmichelsen
Date:     2014-01-25 16:05:24 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
phpPgAdmin: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/phpPgAdmin/trunk/Makefile
    csw/mgar/pkg/phpPgAdmin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/phpPgAdmin/

Modified: csw/mgar/pkg/phpPgAdmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpMyAdmin/trunk/Makefile	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:05:24 UTC (rev 22886)
@@ -1,66 +1,40 @@
-NAME = phpMyAdmin
-VERSION = 3.5.1
+NAME = phpPgAdmin
+VERSION = 5.1
 GARTYPE = v2
 
-DESCRIPTION = Effective MySQL Management
-define BLURB
-  phpMyAdmin is a free software tool written in PHP intended to handle the 
-  administration of MySQL over the World Wide Web. phpMyAdmin supports a wide
-  range of operations with MySQL. The most frequently used operations are
-  supported by the user interface (managing databases, tables, fields,
-  relations, indexes, users, permissions, etc), while you still have the
-  ability to directly execute any SQL statement.
-endef
+DESCRIPTION = Effective PostgreSQL Management
 
-MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/phpmyadmin/
-DISTFILES    = $(NAME)-$(VERSION)-all-languages.tar.bz2
+SF_PROJECT = phppgadmin
+MASTER_SITES += $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tar.bz2
 
-PACKAGES    = CSWphpmyadmin
-CATALOGNAME = phpmyadmin
+# We copy stuff verbatim to the package, a .git would not be useful
+NOGITPATCH = 1
 
-RUNTIME_DEP_PKGS  = CSWap2modphp5
-RUNTIME_DEP_PKGS += CSWapache2
-RUNTIME_DEP_PKGS += CSWmysql5
-RUNTIME_DEP_PKGS += CSWphp5
-RUNTIME_DEP_PKGS += CSWphp5-ctype
-RUNTIME_DEP_PKGS += CSWphp5-gd
-RUNTIME_DEP_PKGS += CSWphp5-mbstring
-RUNTIME_DEP_PKGS += CSWphp5-mcrypt
-RUNTIME_DEP_PKGS += CSWphp5-mysqli
-RUNTIME_DEP_PKGS += CSWphp5-session
-RUNTIME_DEP_PKGS += CSWphp5-zip
+PACKAGES += CSWphppgadmin
+SPKG_DESC_CSWphppgadmin = Effecgtive PostgreSQL Management
+ARCHALL_CSWphppgadmin = 1
+RUNTIME_DEP_PKGS_CSWphppgadmin += CSWap2-modphp5
+RUNTIME_DEP_PKGS_CSWphppgadmin += CSWapache2
+RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5
 
+# I know these are needed
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWap2-modphp5
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWapache2
+
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS     =
-TEST_SCRIPTS      =
-INSTALL_SCRIPTS   = custom
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
 
-ARCHALL = 1
-SPKG_SOURCEURL = http://www.phpmyadmin.net
+VENDOR_URL = http://phppgadmin.sourceforge.net/
 
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-session
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-zip
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-gd
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-mbstring
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-mcrypt
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWap2modphp5
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWmysql5
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-ctype
-CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-mysqli
-# Only a comment
-CHECKPKG_OVERRIDES_CSWphpmyadmin += file-with-bad-content|/usr/share|root/opt/csw/share/www/phpmyadmin/libraries/vendor_config.php
-# Only a comment
-CHECKPKG_OVERRIDES_CSWphpmyadmin += file-with-bad-content|/usr/local|root/opt/csw/share/www/phpmyadmin/libraries/transformations/text_plain__external.inc.php
-
 include gar/category.mk
 
 install-custom:
 	@echo " ==> Installing $(NAME) (custom)"
-	@rm -rf $(DESTDIR)$(prefix)/share/www/phpmyadmin
+	@rm -rf $(DESTDIR)$(prefix)/share/www/phppgadmin
 	@ginstall -d $(DESTDIR)$(prefix)/share/www
-	@cp -R $(WORKSRC)-all-languages $(DESTDIR)$(prefix)/share/www/phpmyadmin
-	@ginstall -d $(DESTDIR)$(docdir)/phpmyadmin
-	@cp $(WORKSRC)-all-languages/LICENSE $(DESTDIR)$(docdir)/phpmyadmin/license
+	@cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phppgadmin
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/phpPgAdmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpMyAdmin/trunk/checksums	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/phpPgAdmin/trunk/checksums	2014-01-25 16:05:24 UTC (rev 22886)
@@ -1 +1 @@
-06bb0b8a945e114e767dfaec67dc5ae0  phpMyAdmin-3.5.1-all-languages.tar.bz2
+ad8f05cef0c443d9ce2940bf36319c24  phpPgAdmin-5.1.tar.bz2

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 Jan 25 17:16:16 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 25 Jan 2014 16:16:16 +0000
Subject: SF.net SVN: gar:[22887] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fBMmD4Wdzzm9@mail.opencsw.org>

Revision: 22887
          http://sourceforge.net/p/gar/code/22887
Author:   chninkel
Date:     2014-01-25 16:16:14 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
libserf/trunk: rather pass GAR build options as scons arguments because environments variable are not taken into account

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 16:05:24 UTC (rev 22886)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 16:16:14 UTC (rev 22887)
@@ -59,9 +59,8 @@
 
 build-serf:
 	(cd $(WORKSRC); \
-		/usr/bin/env -i $(BUILD_ENV) \
 		scons \
-		$(SCONS_FLAGS) PREFIX=$(prefix) )
+		$(SCONS_FLAGS) LINKFLAGS="$(LD_OPTIONS)" CFLAGS="$(CFLAGS)" PREFIX=$(prefix) )
 	@$(MAKECOOKIE)
 
 install-serf:

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 Jan 25 17:24:37 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 16:24:37 +0000
Subject: SF.net SVN: gar:[22888] csw/mgar/pkg/phpPgAdmin/trunk/Makefile
Message-ID: <3fBMxt0pjgzr0@mail.opencsw.org>

Revision: 22888
          http://sourceforge.net/p/gar/code/22888
Author:   dmichelsen
Date:     2014-01-25 16:24:36 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
phpPgAdmin/trunk: Preserve config file

Modified Paths:
--------------
    csw/mgar/pkg/phpPgAdmin/trunk/Makefile

Modified: csw/mgar/pkg/phpPgAdmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:16:14 UTC (rev 22887)
+++ csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:24:36 UTC (rev 22888)
@@ -8,6 +8,8 @@
 MASTER_SITES += $(SF_MIRROR)
 DISTFILES += $(DISTNAME).tar.bz2
 
+VENDOR_URL = http://phppgadmin.sourceforge.net/
+
 # We copy stuff verbatim to the package, a .git would not be useful
 NOGITPATCH = 1
 
@@ -28,13 +30,13 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-VENDOR_URL = http://phppgadmin.sourceforge.net/
+PRESERVECONF = $(sharedstatedir)/www/phppgadmin/conf/config.inc.php
 
 include gar/category.mk
 
 install-custom:
-	@echo " ==> Installing $(NAME) (custom)"
-	@rm -rf $(DESTDIR)$(prefix)/share/www/phppgadmin
-	@ginstall -d $(DESTDIR)$(prefix)/share/www
-	@cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phppgadmin
+	@echo " ==> Installing $(NAME)"
+	@rm -rf $(DESTDIR)$(sharedstatedir)/www/phppgadmin
+	@ginstall -d $(DESTDIR)$(sharedstatedir)/www
+	@cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phppgadmin
 	@$(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  Sat Jan 25 17:34:23 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 16:34:23 +0000
Subject: SF.net SVN: gar:[22889] csw/mgar/pkg/phpPgAdmin/trunk/Makefile
Message-ID: <3fBN966H07zvW@mail.opencsw.org>

Revision: 22889
          http://sourceforge.net/p/gar/code/22889
Author:   dmichelsen
Date:     2014-01-25 16:34:21 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
phpPgAdmin/trunk: Add dependency

Modified Paths:
--------------
    csw/mgar/pkg/phpPgAdmin/trunk/Makefile

Modified: csw/mgar/pkg/phpPgAdmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:24:36 UTC (rev 22888)
+++ csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:34:21 UTC (rev 22889)
@@ -19,11 +19,13 @@
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWap2-modphp5
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWapache2
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5
+RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5-session
 
 # I know these are needed
-CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWap2-modphp5
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5-session
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Sat Jan 25 17:37:30 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 16:37:30 +0000
Subject: SF.net SVN: gar:[22890] csw/mgar/pkg/phpPgAdmin/trunk/Makefile
Message-ID: <3fBNDk1Nb8zys@mail.opencsw.org>

Revision: 22890
          http://sourceforge.net/p/gar/code/22890
Author:   dmichelsen
Date:     2014-01-25 16:37:28 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
phpPgAdmin/trunk: Of course we need the php postgres module

Modified Paths:
--------------
    csw/mgar/pkg/phpPgAdmin/trunk/Makefile

Modified: csw/mgar/pkg/phpPgAdmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:34:21 UTC (rev 22889)
+++ csw/mgar/pkg/phpPgAdmin/trunk/Makefile	2014-01-25 16:37:28 UTC (rev 22890)
@@ -20,12 +20,14 @@
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWapache2
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5
 RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5-session
+RUNTIME_DEP_PKGS_CSWphppgadmin += CSWphp5-pgsql
 
 # I know these are needed
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWap2-modphp5
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5-session
+CHECKPKG_OVERRIDES_CSWphppgadmin += surplus-dependency|CSWphp5-pgsql
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Sat Jan 25 19:15:13 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 18:15:13 +0000
Subject: SF.net SVN: gar:[22891] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fBQPT6p7Lz17x@mail.opencsw.org>

Revision: 22891
          http://sourceforge.net/p/gar/code/22891
Author:   dmichelsen
Date:     2014-01-25 18:15:07 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Add more dependencies for scanner

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-25 16:37:28 UTC (rev 22890)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-25 18:15:07 UTC (rev 22891)
@@ -60,6 +60,10 @@
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWperl
 # This is needed for /opt/csw/bin/scanner
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-dbi
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-dbd-pg
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-timedate
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-libwww-perl
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-config-inifiles
 # I know these are needed
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-cmdln
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-mb
@@ -67,6 +71,10 @@
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-psycopg2
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-dbi
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-dbd-pg
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-timedate
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-libwww-perl
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-config-inifiles
 
 # The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
 

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 Jan 25 19:21:11 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 25 Jan 2014 18:21:11 +0000
Subject: SF.net SVN: gar:[22892] csw/mgar/pkg/lang-python/mb/trunk/Makefile
Message-ID: <3fBQXM29fQz1Dk@mail.opencsw.org>

Revision: 22892
          http://sourceforge.net/p/gar/code/22892
Author:   dmichelsen
Date:     2014-01-25 18:20:58 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
lang-python/mb/trunk: Adjust location of mb.py

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mb/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 18:15:07 UTC (rev 22891)
+++ csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-01-25 18:20:58 UTC (rev 22892)
@@ -34,7 +34,7 @@
 REINPLACEMENTS += scanner
 REINPLACE_MATCH_scanner = /usr/bin/scanner
 REINPLACE_WITH_scanner = $(bindir)/scanner
-REINPLACE_FILES_scanner += mb/mb.py
+REINPLACE_FILES_scanner += mb.py
 
 PACKAGES += CSWpy-mb
 SPKG_DESC_CSWpy-mb = Python module used by the MirrorBrain commandline tools

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 Jan 25 19:53:37 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 25 Jan 2014 18:53:37 +0000
Subject: SF.net SVN: gar:[22893] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fBRFl5CVWz1KR@mail.opencsw.org>

Revision: 22893
          http://sourceforge.net/p/gar/code/22893
Author:   rthurner
Date:     2014-01-25 18:53:34 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
libserf/trunk: adjust runtime pkg dependencies

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 18:20:58 UTC (rev 22892)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 18:53:34 UTC (rev 22893)
@@ -29,19 +29,18 @@
 PACKAGES += CSWlibserf1-3
 CATALOGNAME_CSWlibserf1-3 = libserf1_3
 SPKG_DESC_CSWlibserf1-3 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWbdb48
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibserf1-2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
+CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/bdb48/lib/|opt/csw/lib/libserf-1.so.1.3.0
+CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libserf-1.so.1.3.0
+
 BUILD_DEP_PKGS += CSWscons
 BUILD_DEP_PKGS += CSWlibapr-dev
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 
+
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev
 SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Sun Jan 26 01:29:47 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 26 Jan 2014 00:29:47 +0000
Subject: SF.net SVN: gar:[22894] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fBZjc6RfVz6x@mail.opencsw.org>

Revision: 22894
          http://sourceforge.net/p/gar/code/22894
Author:   chninkel
Date:     2014-01-26 00:29:44 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
libserf/trunk: fix the bad-rpath-entry issue

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 18:53:34 UTC (rev 22893)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-26 00:29:44 UTC (rev 22894)
@@ -33,8 +33,6 @@
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/bdb48/lib/|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libserf-1.so.1.3.0
 
 BUILD_DEP_PKGS += CSWscons
 BUILD_DEP_PKGS += CSWlibapr-dev
@@ -52,14 +50,23 @@
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
 SCONS_FLAGS += APU=$(bindir)/apu-1-config
 
+# scons doesn't honor CFLAGS, LDFLAGS... environment variables
+# so we must explicitely pass them as arguments
+SCONS_FLAGS += CFLAGS="$(CFLAGS)" 
+
+# scons expands the $ISADIR variable, so we must do some more
+# escape magics to make sure it is passed as is to the linker
+SCONS_FLAGS += LINKFLAGS="$(subst $$,\\$$\\,$(LD_OPTIONS))"
+
 CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
 
 include gar/category.mk
 
+
 build-serf:
 	(cd $(WORKSRC); \
 		scons \
-		$(SCONS_FLAGS) LINKFLAGS="$(LD_OPTIONS)" CFLAGS="$(CFLAGS)" PREFIX=$(prefix) )
+		$(SCONS_FLAGS) PREFIX="$(prefix)")
 	@$(MAKECOOKIE)
 
 install-serf:

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 Jan 26 15:27:28 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 26 Jan 2014 14:27:28 +0000
Subject: SF.net SVN: gar:[22895]
	csw/mgar/gar/v2/lib/python/dependency_checks.py
Message-ID: <3fBxJF6YVMztS@mail.opencsw.org>

Revision: 22895
          http://sourceforge.net/p/gar/code/22895
Author:   chninkel
Date:     2014-01-26 14:27:20 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
gar/v2: fix forbidden-version-interface tests so it correctly handles amd64 binaries included in Solaris 9 packages

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2014-01-26 00:29:44 UTC (rev 22894)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2014-01-26 14:27:20 UTC (rev 22895)
@@ -294,8 +294,7 @@
 
     osrel = pkg_data['basic_stats']['parsed_basename']['osrel']
 
-    if (osrel == u'SunOS5.9' and
-        binary_info['path'].endswith('/amd64/' + binary_info['base_name'])):
+    if osrel == u'SunOS5.9' and '/amd64/' in binary_info['path']:
       # amd64 binaries in Solaris 5.9 packages were in fact compiled under
       # Solaris 5.10 so we have a special case here
       osrel = u'SunOS5.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 Jan 26 21:29:42 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 26 Jan 2014 20:29:42 +0000
Subject: SF.net SVN: gar:[22896] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fC5LC4RdBzGY@mail.opencsw.org>

Revision: 22896
          http://sourceforge.net/p/gar/code/22896
Author:   dmichelsen
Date:     2014-01-26 20:29:38 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Add patch when geoip file location was wrong

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-26 14:27:20 UTC (rev 22895)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-26 20:29:38 UTC (rev 22896)
@@ -18,6 +18,9 @@
 #   http://mirrorbrain.org/issues/issue135
 PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
 
+# Use patch until this is fixed:
+PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
+
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths

Added: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch	2014-01-26 20:29:38 UTC (rev 22896)
@@ -0,0 +1,43 @@
+From b9bad73a01288801847ba7f01c1980453885cab7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Sun, 26 Jan 2014 21:28:31 +0100
+Subject: [PATCH] Exit if geoip file cannot be opened
+
+---
+ tools/geoiplookup_city.c      | 4 ++++
+ tools/geoiplookup_continent.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/tools/geoiplookup_city.c b/tools/geoiplookup_city.c
+index 2b33c1d..6faed7e 100644
+--- a/tools/geoiplookup_city.c
++++ b/tools/geoiplookup_city.c
+@@ -58,6 +58,10 @@ int main(int argc, char **argv) {
+         }
+ 
+ 	gip = GeoIP_open(geoipfilename, GEOIP_STANDARD);
++	if( gip == NULL ) {
++		printf("An error occured during GeoIP_open\n");
++		return 1;
++	}
+ 	edition = GeoIP_database_edition(gip);
+ 
+ 	if (edition == GEOIP_COUNTRY_EDITION) {
+diff --git a/tools/geoiplookup_continent.c b/tools/geoiplookup_continent.c
+index 983afe2..871b247 100644
+--- a/tools/geoiplookup_continent.c
++++ b/tools/geoiplookup_continent.c
+@@ -56,6 +56,10 @@ int main(int argc, char **argv) {
+         }
+ 
+ 	gip = GeoIP_open(geoipfilename, GEOIP_STANDARD);
++	if( gip == NULL ) {
++		printf("An error occured during GeoIP_open\n");
++		return 1;
++	}
+ 	edition = GeoIP_database_edition(gip);
+ 
+ 	if (edition == GEOIP_COUNTRY_EDITION) {
+-- 
+1.8.4.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 Jan 26 22:51:59 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 26 Jan 2014 21:51:59 +0000
Subject: SF.net SVN: gar:[22897] csw/mgar/pkg
Message-ID: <3fC7964ntwzV7@mail.opencsw.org>

Revision: 22897
          http://sourceforge.net/p/gar/code/22897
Author:   dmichelsen
Date:     2014-01-26 21:51:59 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
mirmon/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/mirmon/
    csw/mgar/pkg/mirmon/Makefile
    csw/mgar/pkg/mirmon/branches/
    csw/mgar/pkg/mirmon/tags/
    csw/mgar/pkg/mirmon/trunk/
    csw/mgar/pkg/mirmon/trunk/Makefile
    csw/mgar/pkg/mirmon/trunk/checksums
    csw/mgar/pkg/mirmon/trunk/files/

Added: csw/mgar/pkg/mirmon/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mirmon/Makefile	2014-01-26 21:51:59 UTC (rev 22897)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/mirmon/trunk
===================================================================
--- csw/mgar/pkg/mirmon/trunk	2014-01-26 20:29:38 UTC (rev 22896)
+++ csw/mgar/pkg/mirmon/trunk	2014-01-26 21:51:59 UTC (rev 22897)

Property changes on: csw/mgar/pkg/mirmon/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-26 21:51:59 UTC (rev 22897)
@@ -0,0 +1,47 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = mirmon
+VERSION = 2.9
+GARTYPE = v2
+
+DESCRIPTION = Monitor the status of mirrors
+
+MASTER_SITES = http://www.staff.science.uu.nl/~penni101/mirmon/
+DISTFILES  = $(DISTNAME).tar.gz
+
+VENDOR_URL = http://www.staff.science.uu.nl/~penni101/mirmon/
+LICENSE = LICENSE
+
+PACKAGES += CSWmirmon
+SPKG_DESC_CSWmirmon = Monitor the status of mirrors
+# PKGFILES is catchall
+ARCHALL_CSWmirmon = 1
+RUNTIME_DEP_PKGS_CSWmirmon += CSWperl
+
+# These are just examples
+CHECKPKG_OVERRIDES_CSWmirmon += file-with-bad-content|/usr/local|root/opt/csw/bin/mirmon
+CHECKPKG_OVERRIDES_CSWmirmon += file-with-bad-content|/usr/local|root/opt/csw/bin/mirmon.pl
+
+REINPLACEMENTS += perl
+REINPLACE_MATCH_perl = /usr/bin/perl
+REINPLACE_WITH_perl = $(bindir)/perl
+REINPLACE_FILES_perl = *
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d $(PKGROOT)$(docdir)/mirmon
+	cd $(WORKSRC) && ginstall -m 0644 RELEASE-NOTES $(PKGROOT)$(docdir)/mirmon
+	ginstall -d $(PKGROOT)$(bindir)
+	cd $(WORKSRC) && ginstall -m 0755 mirmon mirmon.pl probe $(PKGROOT)$(bindir)
+	ginstall -d $(PKGROOT)$(mandir)/man1
+	cd $(WORKSRC) && ginstall -m 0644 mirmon.1 mirmon.pm.1 $(PKGROOT)$(mandir)/man1
+	ginstall -d $(PKGROOT)$(sharedstatedir)/mirmon
+	cd $(WORKSRC) && cp -r countries.list icons $(PKGROOT)$(sharedstatedir)/mirmon
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/mirmon/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/mirmon/trunk/checksums
===================================================================
--- csw/mgar/pkg/mirmon/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/mirmon/trunk/checksums	2014-01-26 21:51:59 UTC (rev 22897)
@@ -0,0 +1 @@
+ecdc21d3684d059fc85d72f479f1fe22  mirmon-2.9.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 Jan 27 10:05:23 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 27 Jan 2014 09:05:23 +0000
Subject: SF.net SVN: gar:[22898] csw/mgar/pkg/libcurl4/trunk
Message-ID: <3fCQ690NvXz17c@mail.opencsw.org>

Revision: 22898
          http://sourceforge.net/p/gar/code/22898
Author:   wahwah
Date:     2014-01-27 09:05:19 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
libcurl4/trunk: Backporting one bug from yet unreleased code.

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-26 21:51:59 UTC (rev 22897)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-27 09:05:19 UTC (rev 22898)
@@ -18,6 +18,8 @@
 
 VENDOR_URL = http://curl.haxx.se
 
+PATCHFILES += 0000-trynextip-logic-inversion-bug.patch
+
 # Because of OpenSSL 1.0 update
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Added: csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	                        (rev 0)
+++ csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	2014-01-27 09:05:19 UTC (rev 22898)
@@ -0,0 +1,47 @@
+From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= 
+Date: Sat, 28 Dec 2013 13:42:57 +0100
+Subject: [PATCH] connect: Try all addresses in first connection attempt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes a bug when all addresses in the first family fail immediately, due
+to "Network unreachable" for example, curl would hang and never try the
+next address family.
+
+Iterate through all address families when to trying establish the first
+connection attempt.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1315
+Reported-by: Michal G?rny and Anthony G. Basile
+---
+ lib/connect.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 4b6ee00..588ac28 100644
+--- a/lib/connect.c
++++ b/lib/connect.c
+@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
+     conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2;
+ 
+   /* start connecting to first IP */
+-  res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
+-  while(res != CURLE_OK &&
+-        conn->tempaddr[0] &&
+-        conn->tempaddr[0]->ai_next &&
+-        conn->tempsock[0] == CURL_SOCKET_BAD)
+-    res = trynextip(conn, FIRSTSOCKET, 0);
++  while(conn->tempaddr[0]) {
++    res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
++    if(res == CURLE_OK)
++        break;
++    conn->tempaddr[0] = conn->tempaddr[0]->ai_next;
++  }
+ 
+   if(conn->tempsock[0] == CURL_SOCKET_BAD)
+     return res;
+-- 
+1.8.5.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  Mon Jan 27 14:06:32 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 13:06:32 +0000
Subject: SF.net SVN: gar:[22899] csw/mgar/pkg/mod_wsgi/trunk
Message-ID: <3fCWSQ1t06z6m@mail.opencsw.org>

Revision: 22899
          http://sourceforge.net/p/gar/code/22899
Author:   dmichelsen
Date:     2014-01-27 13:06:30 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mod_wsgi/trunk: Add support for Python 2.7

Modified Paths:
--------------
    csw/mgar/pkg/mod_wsgi/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/mod_wsgi/trunk/files/space

Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 13:06:30 UTC (rev 22899)
@@ -4,7 +4,6 @@
 VERSION = 3.4
 GARTYPE = v2
 
-
 DESCRIPTION = Apache/Python WSGI adapter module.
 define BLURB
   Mod_wsgi is a python WSGI adapter module for Apache.
@@ -12,31 +11,39 @@
 
 GOOGLE_PROJECT = modwsgi
 MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += postinstall preremove space
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += postinstall preremove
+
+VENDOR_URL = https://code.google.com/p/modwsgi/
 LICENSE = LICENCE
 
 PACKAGES = CSWap2modwsgi
-
-RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWpython
 CATALOGNAME_CSWap2modwsgi   = ap2_modwsgi
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWpython
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
 
+CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
+CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
+
+EXTRA_MODULATORS += PYTHON
+MODULATIONS_PYTHON = 2.6 2.7
+
+EXTRA_PAX_ARGS += -s ",^(.*)/mod_wsgi\.so,\1/mod_wsgi-$(PYTHON).so,"
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
-CONFIGURE_ARGS += --with-python=$(bindir)/python
+CONFIGURE_ARGS += --with-python=$(bindir)/python$(PYTHON)
 CONFIGURE_ARGS += --with-python-src=../python
 
-## There are no tests for this
+# There are no tests for this
 TEST_SCRIPTS =
 
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
+MERGE_SCRIPTS_isa-default-python-2.6 = copy-all
+MERGE_SCRIPTS_isa-default-python-2.7 = copy-all
 
-# If the pkgname is CSWap2modwsgi, catalogname should be ap2modwsgi
-# If the catalogname is ap2_modwsgi, the pkgname should be CSWap2-modwsgi
-CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
+include gar/category.mk
 
-# checkpkg doesn't know why CSWpython is needed
-CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
-
-include gar/category.mk
+post-merge-all:
+	gln -s mod_wsgi-2.6.so $(PKGROOT)opt/csw/apache2/libexec/mod_wsgi.so
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/mod_wsgi/trunk/files/space
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/files/space	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/mod_wsgi/trunk/files/space	2014-01-27 13:06:30 UTC (rev 22899)
@@ -1 +0,0 @@
-$BASEDIR 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  Mon Jan 27 14:15:10 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 13:15:10 +0000
Subject: SF.net SVN: gar:[22900] csw/mgar/pkg/mod_wsgi/trunk/Makefile
Message-ID: <3fCWfQ5pJhzBX@mail.opencsw.org>

Revision: 22900
          http://sourceforge.net/p/gar/code/22900
Author:   dmichelsen
Date:     2014-01-27 13:15:09 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mod_wsgi/trunk: Fix typos and missing deps

Modified Paths:
--------------
    csw/mgar/pkg/mod_wsgi/trunk/Makefile

Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 13:06:30 UTC (rev 22899)
+++ csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 13:15:09 UTC (rev 22900)
@@ -21,11 +21,15 @@
 CATALOGNAME_CSWap2modwsgi   = ap2_modwsgi
 RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWpython
 RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-7-1-0
 RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
 
 CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
 CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
 
+CHECKPKG_OVERRIDES_CSWap2modwsgi += soname-not-part-of-filename|soname=mod_wsgi.so|filename=mod_wsgi-2.6.so
+CHECKPKG_OVERRIDES_CSWap2modwsgi += soname-not-part-of-filename|soname=mod_wsgi.so|filename=mod_wsgi-2.7.so
+
 EXTRA_MODULATORS += PYTHON
 MODULATIONS_PYTHON = 2.6 2.7
 
@@ -45,5 +49,5 @@
 include gar/category.mk
 
 post-merge-all:
-	gln -s mod_wsgi-2.6.so $(PKGROOT)opt/csw/apache2/libexec/mod_wsgi.so
+	gln -s mod_wsgi-2.6.so $(PKGROOT)/opt/csw/apache2/libexec/mod_wsgi.so
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From cgrzemba at users.sourceforge.net  Mon Jan 27 15:46:26 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 27 Jan 2014 14:46:26 +0000
Subject: SF.net SVN: gar:[22901] csw/mgar/gar/v2/lib/python/compare_catalog.py
Message-ID: <3fCYgk4BFgzbG@mail.opencsw.org>

Revision: 22901
          http://sourceforge.net/p/gar/code/22901
Author:   cgrzemba
Date:     2014-01-27 14:46:24 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
add compare_catalog.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/compare_catalog.py

Added: csw/mgar/gar/v2/lib/python/compare_catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_catalog.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-01-27 14:46:24 UTC (rev 22901)
@@ -0,0 +1,58 @@
+#!/opt/csw/bin/python
+
+import cjson
+import logging
+import optparse
+import urllib2
+import sys
+
+logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s')
+logger = logging.getLogger(__name__)
+
+def main():
+    parser = optparse.OptionParser()
+    parser.add_option("-v","--verbose", dest="verbose", action="store_true",default=False)
+    parser.add_option("-a","--existing-catalog", dest="oldcatalog", 
+                    help='set URI of existing catalog', metavar = 'catalog')
+    parser.add_option("-b","--new-catalog", dest="newcatalog", 
+                    help='set URI of catalog to generate', metavar = 'catalog')
+    options, args = parser.parse_args()
+    opterror = False
+    if options.verbose:
+        logger.setLevel(logging.INFO)
+    if options.debug:
+        logger.setLevel(logging.DEBUG)
+    if options.newcatalog is None or options.oldcatalog is None:
+        logger.error("mandatory option missing")
+        sys.exit(2)
+    oldcat = options.oldcatalog
+    newcat = options.newcatalog
+    logger.info(" compare %s with %s", oldcat, newcat)
+
+    data = urllib2.urlopen(oldcat).read()
+    a_catlst = cjson.decode(data)
+    for e in a_catlst:
+        del e[9]
+    b_catlst = []
+    with open(newcat) as nc:
+        for i in range(4): # skip 4 lines header
+            nc.readline()
+        for cl in nc.readlines():
+            if "-----BEGIN" == cl.split(' ')[0]:
+                break
+            b_catlst.append(cl.rstrip().split(' '))
+    if len(a_catlst) != len(b_catlst):
+        logger.warning("a has %d, b has %d packges",len(a_catlst),len(b_catlst))
+        sys.exit(1)
+    for i in range(len(b_catlst)):
+        if b_catlst[i] != a_catlst[i] :
+            logger.warning("a is {0}, b is {1}".format(a_catlst[i],b_catlst[i]))
+            sys.exit(1)
+            
+    # import pdb; pdb.set_trace()
+    logger.debug("catalogs are same")
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()


Property changes on: csw/mgar/gar/v2/lib/python/compare_catalog.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
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 Jan 27 20:59:52 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 19:59:52 +0000
Subject: SF.net SVN: gar:[22902] csw/mgar/pkg/mirmon/trunk/Makefile
Message-ID: <3fChdH0ZB2z1DJ@mail.opencsw.org>

Revision: 22902
          http://sourceforge.net/p/gar/code/22902
Author:   dmichelsen
Date:     2014-01-27 19:59:51 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mirmon/trunk: Path adjustments, split off Perl module

Modified Paths:
--------------
    csw/mgar/pkg/mirmon/trunk/Makefile

Modified: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 14:46:24 UTC (rev 22901)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 19:59:51 UTC (rev 22902)
@@ -18,16 +18,42 @@
 # PKGFILES is catchall
 ARCHALL_CSWmirmon = 1
 RUNTIME_DEP_PKGS_CSWmirmon += CSWperl
+RUNTIME_DEP_PKGS_CSWmirmon += CSWrsync
+RUNTIME_DEP_PKGS_CSWmirmon += CSWwget
+CHECKPKG_OVERRIDES_CSWmirmon += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWmirmon += surplus-dependency|CSWrsync
+CHECKPKG_OVERRIDES_CSWmirmon += surplus-dependency|CSWwget
 
+PACKAGES += CSWpm-mirmon
+SPKG_DESC_CSWpm-mirmon = OO interface for mirmon objects
+PKGFILES_CSWpm-mirmon += $(bindir)/mirmon.pl
+PKGFILES_CSWpm-mirmon += $(sharedstatedir)/perl/.*
+RUNTIME_DEP_PKGS_CSWpm-mirmon += CSWperl
+
 # These are just examples
 CHECKPKG_OVERRIDES_CSWmirmon += file-with-bad-content|/usr/local|root/opt/csw/bin/mirmon
-CHECKPKG_OVERRIDES_CSWmirmon += file-with-bad-content|/usr/local|root/opt/csw/bin/mirmon.pl
+CHECKPKG_OVERRIDES_CSWpm-mirmon += file-with-bad-content|/usr/local|root/opt/csw/bin/mirmon.pl
 
 REINPLACEMENTS += perl
 REINPLACE_MATCH_perl = /usr/bin/perl
 REINPLACE_WITH_perl = $(bindir)/perl
 REINPLACE_FILES_perl = *
 
+REINPLACEMENTS += wget
+REINPLACE_MATCH_wget = /usr/bin/wget
+REINPLACE_WITH_wget = $(bindir)/wget
+REINPLACE_FILES_wget += probe
+
+REINPLACEMENTS += rsync
+REINPLACE_MATCH_rsync = /usr/bin/rsync
+REINPLACE_WITH_rsync = $(bindir)/rsync
+REINPLACE_FILES_rsync += probe
+
+REINPLACEMENTS += mirmonpm
+REINPLACE_MATCH_mirmonpm = \\'\\.\\'
+REINPLACE_WITH_mirmonpm = \\'$(sharedstatedir)/perl/csw\\'
+REINPLACE_FILES_mirmonpm += mirmon.pl
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
@@ -44,4 +70,6 @@
 	cd $(WORKSRC) && ginstall -m 0644 mirmon.1 mirmon.pm.1 $(PKGROOT)$(mandir)/man1
 	ginstall -d $(PKGROOT)$(sharedstatedir)/mirmon
 	cd $(WORKSRC) && cp -r countries.list icons $(PKGROOT)$(sharedstatedir)/mirmon
+	ginstall -d $(PKGROOT)$(sharedstatedir)/perl/csw
+	cd $(WORKSRC) && cp -r Mirmon.pm $(PKGROOT)$(sharedstatedir)/perl/csw
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Mon Jan 27 21:01:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 20:01:05 +0000
Subject: SF.net SVN: gar:[22903] csw/mgar/pkg/mirmon/trunk/Makefile
Message-ID: <3fChff0BQTz1Hj@mail.opencsw.org>

Revision: 22903
          http://sourceforge.net/p/gar/code/22903
Author:   dmichelsen
Date:     2014-01-27 20:01:03 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mirmon/trunk: Perl module is archall

Modified Paths:
--------------
    csw/mgar/pkg/mirmon/trunk/Makefile

Modified: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 19:59:51 UTC (rev 22902)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:01:03 UTC (rev 22903)
@@ -26,6 +26,7 @@
 
 PACKAGES += CSWpm-mirmon
 SPKG_DESC_CSWpm-mirmon = OO interface for mirmon objects
+ARCHALL_CSWpm-mirmon = 1
 PKGFILES_CSWpm-mirmon += $(bindir)/mirmon.pl
 PKGFILES_CSWpm-mirmon += $(sharedstatedir)/perl/.*
 RUNTIME_DEP_PKGS_CSWpm-mirmon += 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  Mon Jan 27 21:30:49 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 20:30:49 +0000
Subject: SF.net SVN: gar:[22904] csw/mgar/pkg/mirmon/trunk
Message-ID: <3fCjJz5vXtz1QH@mail.opencsw.org>

Revision: 22904
          http://sourceforge.net/p/gar/code/22904
Author:   dmichelsen
Date:     2014-01-27 20:30:47 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mirmon/trunk: Add example comfiguration file

Modified Paths:
--------------
    csw/mgar/pkg/mirmon/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW

Modified: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:01:03 UTC (rev 22903)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:30:47 UTC (rev 22904)
@@ -8,7 +8,8 @@
 DESCRIPTION = Monitor the status of mirrors
 
 MASTER_SITES = http://www.staff.science.uu.nl/~penni101/mirmon/
-DISTFILES  = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += mirmon.conf.CSW
 
 VENDOR_URL = http://www.staff.science.uu.nl/~penni101/mirmon/
 LICENSE = LICENSE
@@ -55,11 +56,18 @@
 REINPLACE_WITH_mirmonpm = \\'$(sharedstatedir)/perl/csw\\'
 REINPLACE_FILES_mirmonpm += mirmon.pl
 
+REINPLACEMENTS += conf
+REINPLACE_MATCH_conf = /etc/mirmon.conf
+REINPLACE_WITH_conf = $(sysconfdir)/mirmon.conf
+REINPLACE_FILES_conf += *
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF += $(sysconfdir)/mirmon.conf
+
 include gar/category.mk
 
 install-custom:
@@ -73,4 +81,6 @@
 	cd $(WORKSRC) && cp -r countries.list icons $(PKGROOT)$(sharedstatedir)/mirmon
 	ginstall -d $(PKGROOT)$(sharedstatedir)/perl/csw
 	cd $(WORKSRC) && cp -r Mirmon.pm $(PKGROOT)$(sharedstatedir)/perl/csw
+	ginstall -d $(PKGROOT)$(sysconfdir)
+	cd $(WORKDIR) && ginstall -m 0644 mirmon.conf.CSW $(PKGROOT)$(sysconfdir)
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW
===================================================================
--- csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW	2014-01-27 20:30:47 UTC (rev 22904)
@@ -0,0 +1,86 @@
+####################################################################
+## lines that start with '#' are comment
+## blank lines are ignored too
+## tabs are replaced by a space
+#
+## the config entries are 'key' and 'value' pairs
+## a 'key' begins in column 1
+## the 'value' is the rest of the line
+#somekey  A_val B_val ...
+#otherkey X_val Y_val ...
+#
+## indented lines are glued
+## the next three lines mean 'somekey part1 part2 part3'
+#somekey part1
+#  part2
+#  part3
+#
+## lines starting with a '+' are concatenated
+## the next three lines mean 'somekey part1part2part3'
+#somekey part1
+#+ part2
+#+ part3
+#
+## lines starting with a '.' are glued too
+## don't use a '.' on a line by itself
+## 'somekey' gets the value "part1\n part2\n part3"
+#somekey part1
+#. part2
+#. part3
+#
+####################################################################
+
+project_name OpenCSW
+
+project_url http://www.opencsw.org/
+
+mirror_list /var/tmp/mirror-list.mirmon
+
+web_page /var/opt/csw/mirmon/html/mirmon.html
+
+# This absolute path can only work for local tests without a web server
+# (see the generated web page).
+icons /opt/csw/share/mirmon/icons
+
+probe ftp -V -o - -q %TIMEOUT% %URL%/mirrors/timestamp.txt
+
+state /var/opt/csw/mirmon/state.mirmon
+
+countries /opt/csw/share/mirmon/countries.list
+
+#max_probes 25
+
+#timeout 300
+
+#project_logo http://www.opencsw.org/wp-content/themes/opencsw/img/logo.png
+
+#htm_foot
+# 
+# 
+# 
+
+#htm_top Some words
+
+#put_histo top
+
+#min_poll 4h
+
+#max_poll 12h
+
+#min_sync 1d
+
+#max_sync 2d
+
+#no_randomize
+
+#list_style plain
+
+#site_url  
+
+#env  
+
+#include 
+
+#show
+
+#exit

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 Jan 27 21:39:58 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 20:39:58 +0000
Subject: SF.net SVN: gar:[22905] csw/mgar/pkg/mirmon/trunk
Message-ID: <3fCjWV6Qcfz1Wk@mail.opencsw.org>

Revision: 22905
          http://sourceforge.net/p/gar/code/22905
Author:   dmichelsen
Date:     2014-01-27 20:39:57 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mirmon/trunk: Correct path, add dummy for state

Modified Paths:
--------------
    csw/mgar/pkg/mirmon/trunk/Makefile
    csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW

Modified: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:30:47 UTC (rev 22904)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:39:57 UTC (rev 22905)
@@ -83,4 +83,6 @@
 	cd $(WORKSRC) && cp -r Mirmon.pm $(PKGROOT)$(sharedstatedir)/perl/csw
 	ginstall -d $(PKGROOT)$(sysconfdir)
 	cd $(WORKDIR) && ginstall -m 0644 mirmon.conf.CSW $(PKGROOT)$(sysconfdir)
+	ginstall -d $(PKGROOT)/var/opt/csw/mirmon/
+	touch $(PKGROOT)/var/opt/csw/mirmon/state.mirmon
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW
===================================================================
--- csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW	2014-01-27 20:30:47 UTC (rev 22904)
+++ csw/mgar/pkg/mirmon/trunk/files/mirmon.conf.CSW	2014-01-27 20:39:57 UTC (rev 22905)
@@ -34,7 +34,7 @@
 
 project_url http://www.opencsw.org/
 
-mirror_list /var/tmp/mirror-list.mirmon
+mirror_list /var/opt/csw/mirmon/mirror-list.mirmon
 
 web_page /var/opt/csw/mirmon/html/mirmon.html
 

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 Jan 27 21:42:04 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Jan 2014 20:42:04 +0000
Subject: SF.net SVN: gar:[22906] csw/mgar/pkg/mirmon/trunk/Makefile
Message-ID: <3fCjYy56rlz2x@mail.opencsw.org>

Revision: 22906
          http://sourceforge.net/p/gar/code/22906
Author:   dmichelsen
Date:     2014-01-27 20:42:03 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mirmon/trunk: Add empty html dir

Modified Paths:
--------------
    csw/mgar/pkg/mirmon/trunk/Makefile

Modified: csw/mgar/pkg/mirmon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:39:57 UTC (rev 22905)
+++ csw/mgar/pkg/mirmon/trunk/Makefile	2014-01-27 20:42:03 UTC (rev 22906)
@@ -85,4 +85,5 @@
 	cd $(WORKDIR) && ginstall -m 0644 mirmon.conf.CSW $(PKGROOT)$(sysconfdir)
 	ginstall -d $(PKGROOT)/var/opt/csw/mirmon/
 	touch $(PKGROOT)/var/opt/csw/mirmon/state.mirmon
+	ginstall -d $(PKGROOT)/var/opt/csw/mirmon/html
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Tue Jan 28 11:33:27 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 28 Jan 2014 10:33:27 +0000
Subject: SF.net SVN: gar:[22907] csw/mgar/pkg/libsunperf/trunk/Makefile
Message-ID: <3fD41F4sF5zsP@mail.opencsw.org>

Revision: 22907
          http://sourceforge.net/p/gar/code/22907
Author:   opk
Date:     2014-01-28 10:33:25 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
rearrange sparc32 libsunperf.so to use the same structure as for a Solaris
Studio installation so the RUNPATH, which uses $ORIGIN, will work.

Modified Paths:
--------------
    csw/mgar/pkg/libsunperf/trunk/Makefile

Modified: csw/mgar/pkg/libsunperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsunperf/trunk/Makefile	2014-01-27 20:42:03 UTC (rev 22906)
+++ csw/mgar/pkg/libsunperf/trunk/Makefile	2014-01-28 10:33:25 UTC (rev 22907)
@@ -51,13 +51,20 @@
 
 include gar/category.mk
 
-
 SRCDIR-sparcv9 = v9
 SRCDIR-amd64   = amd64
 
-install-custom:
+install-custom-i386:
 	ginstall -d $(DESTDIR)$(libdir)
-	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L; fi;)
+	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)$(ISA_SS32-$(GARCH))/$L; fi;)
+
+install-custom-sparc:
+	ginstall -d $(DESTDIR)$(libdir)
+	ginstall -d $(DESTDIR)$(libdir)/v8
+	ln -s v8/$(FLIBS-sparc) $(DESTDIR)$(libdir)/$(FLIBS-sparc)
+	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)$(ISA_SS32-$(GARCH))/v8/$L; fi;)
+
+install-custom: install-custom-$(GARCH)
 	ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)
 	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)/$L; fi;)
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Tue Jan 28 12:00:11 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 28 Jan 2014 11:00:11 +0000
Subject: SF.net SVN: gar:[22908] csw/mgar/pkg/libsunperf/trunk/Makefile
Message-ID: <3fD4c54VL5zyJ@mail.opencsw.org>

Revision: 22908
          http://sourceforge.net/p/gar/code/22908
Author:   opk
Date:     2014-01-28 11:00:10 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
libsunperf: seems I need to make cookies for custom make rules

Modified Paths:
--------------
    csw/mgar/pkg/libsunperf/trunk/Makefile

Modified: csw/mgar/pkg/libsunperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsunperf/trunk/Makefile	2014-01-28 10:33:25 UTC (rev 22907)
+++ csw/mgar/pkg/libsunperf/trunk/Makefile	2014-01-28 11:00:10 UTC (rev 22908)
@@ -57,12 +57,14 @@
 install-custom-i386:
 	ginstall -d $(DESTDIR)$(libdir)
 	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)$(ISA_SS32-$(GARCH))/$L; fi;)
+	@$(MAKECOOKIE)
 
 install-custom-sparc:
 	ginstall -d $(DESTDIR)$(libdir)
 	ginstall -d $(DESTDIR)$(libdir)/v8
 	ln -s v8/$(FLIBS-sparc) $(DESTDIR)$(libdir)/$(FLIBS-sparc)
 	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)$(ISA_SS32-$(GARCH))/v8/$L; fi;)
+	@$(MAKECOOKIE)
 
 install-custom: install-custom-$(GARCH)
 	ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Tue Jan 28 13:36:44 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 28 Jan 2014 12:36:44 +0000
Subject: SF.net SVN: gar:[22909] csw/mgar/pkg
Message-ID: <3fD6lb6zgqz18X@mail.opencsw.org>

Revision: 22909
          http://sourceforge.net/p/gar/code/22909
Author:   opk
Date:     2014-01-28 12:36:44 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
lang-python/matplotlib: had problems with Python 2.6, seems to work with 2.7

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
    csw/mgar/pkg/lang-python/matplotlib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-python/matplotlib/
    csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch

Removed Paths:
-------------
    csw/mgar/pkg/matplotlib/

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/matplotlib/trunk/Makefile	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-28 12:36:44 UTC (rev 22909)
@@ -9,14 +9,45 @@
 # upstream bug: http://bugs.python.org/issue1250
 
 NAME = matplotlib
-VERSION = 1.1.0
+VERSION = 1.3.1
 CATEGORIES = python
-DESCRIPTION = A pure python plotting library
+CATALOGNAME = py_matplotlib
+
+DESCRIPTION = Python 2D plotting library
 define BLURB
+  Matplotlib is a python 2D plotting library which produces publication
+  quality figures in a variety of hardcopy formats and interactive
+  environments across platforms. matplotlib can be used in python scripts,
+  the python and ipython shell, web application servers, and six
+  graphical user interface toolkits.
 endef
+
 SPKG_SOURCEURL = http://matplotlib.sourceforge.net/
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
-LICENSE = LICENSE.txt
+LICENSE = LICENSE/LICENSE
+
+BUILD_DEP_PKGS = CSWpython27-dev
+
+RUNTIME_DEP_PKGS = CSWlibatk
+RUNTIME_DEP_PKGS += CSWggettextrt
+RUNTIME_DEP_PKGS += CSWpng
+RUNTIME_DEP_PKGS += CSWfconfig
+RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS += CSWglib2
+RUNTIME_DEP_PKGS += CSWftype2
+RUNTIME_DEP_PKGS += CSWpango
+RUNTIME_DEP_PKGS += CSWlibcairo
+RUNTIME_DEP_PKGS += CSWgtk2
+RUNTIME_DEP_PKGS += CSWzlib
+
+PATCHFILES += 0001-avoid-reserved-variable-names.patch
+MODULATIONS_PYTHON_VERSION = 2_7
 CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_MERGE_EXCLUDE_FILES += .*\.egg-info.* .*\.pyo .*\.pyc
+
+pre-configure:
+	@rm -f work/build-isa-sparcv8/$(GARNAME)-$(GARVERSION)/lib/$(GARNAME)/tests/baseline_images/test_axes/shaped\ data.svg
+	@$(MAKECOOKIE)
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/matplotlib/trunk/checksums	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/checksums	2014-01-28 12:36:44 UTC (rev 22909)
@@ -1 +1 @@
-57a627f30b3b27821f808659889514c2  matplotlib-1.1.0.tar.gz
+444624ad58de05f9029b0b5811e11c17  matplotlib-1.3.1.tar.gz

Added: csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch
===================================================================
--- csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch	2014-01-28 12:36:44 UTC (rev 22909)
@@ -0,0 +1,48 @@
+From bf6bfdd8c9591de27eceeb1ad18a0b18842796a4 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle 
+Date: Tue, 28 Jan 2014 12:26:44 +0000
+Subject: [PATCH] avoid reserved variable names
+
+---
+ lib/matplotlib/tri/_tri.cpp | 6 +++---
+ lib/matplotlib/tri/_tri.h   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
+index 9dd538a..ce5260b 100644
+--- a/lib/matplotlib/tri/_tri.cpp
++++ b/lib/matplotlib/tri/_tri.cpp
+@@ -2177,14 +2177,14 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_)
+ 
+ 
+ RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)
+-    : _M(21870), _A(1291), _C(4621), _seed(seed % _M)
++    : M_(21870), A_(1291), C_(4621), _seed(seed % M_)
+ {}
+ 
+ unsigned long
+ RandomNumberGenerator::operator()(unsigned long max_value)
+ {
+-    _seed = (_seed*_A + _C) % _M;
+-    return (_seed*max_value) / _M;
++    _seed = (_seed*A_ + C_) % M_;
++    return (_seed*max_value) / M_;
+ }
+ 
+ 
+diff --git a/lib/matplotlib/tri/_tri.h b/lib/matplotlib/tri/_tri.h
+index 3662678..0d5acef 100644
+--- a/lib/matplotlib/tri/_tri.h
++++ b/lib/matplotlib/tri/_tri.h
+@@ -818,7 +818,7 @@ public:
+     unsigned long operator()(unsigned long max_value);
+ 
+ private:
+-    const unsigned long _M, _A, _C;
++    const unsigned long M_, A_, C_;
+     unsigned long _seed;
+ };
+ 
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From cgrzemba at users.sourceforge.net  Tue Jan 28 17:20:57 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 28 Jan 2014 16:20:57 +0000
Subject: SF.net SVN: gar:[22910] csw/mgar/gar/v2/lib/python/compare_catalog.py
Message-ID: <3fDCkQ4HZ9z6v@mail.opencsw.org>

Revision: 22910
          http://sourceforge.net/p/gar/code/22910
Author:   cgrzemba
Date:     2014-01-28 16:20:56 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
use argparse, add out of order pkg compare

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/compare_catalog.py

Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-01-28 12:36:44 UTC (rev 22909)
+++ csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-01-28 16:20:56 UTC (rev 22910)
@@ -2,55 +2,108 @@
 
 import cjson
 import logging
-import optparse
+import argparse
 import urllib2
 import sys
+import re
 
 logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s')
 logger = logging.getLogger(__name__)
 
+remote_scheme = ['http','https']
+local_scheme = ['file']
+
+def prepareCatListFromURI(uri):
+    catlst = []
+    if '://' in uri:
+        scheme = uri.split(':')[0]
+        if scheme in remote_scheme:
+            logger.info("fetch remote %s", uri)
+            data = urllib2.urlopen(uri).read()
+            catlst = cjson.decode(data)
+            for e in catlst:
+                del e[9]
+            return catlst
+        elif scheme in local_scheme:
+            uri = re.sub('.*://','',uri)
+        else:
+            logger.error('unsupported URI format')
+            sys.exit(4)
+    with open(uri) as lcat:
+        logger.info("fetch local %s", uri)
+        for line in lcat: # skip 4 lines header '# CREATIONDATE'
+            if line.startswith("# CREATIONDATE"): 
+                break
+        for line in lcat:
+            if line.startswith("-----BEGIN PGP SIGNATURE"): 
+                break
+            catlst.append(line.rstrip().split(' '))
+    return catlst
+            
+def compareOutOfOrder(a_catlst, b_catlst, idx):
+    a_pkgName2Idx = {}
+    i = idx 
+    for j in range(idx,len(a_catlst)):
+        a_pkgName2Idx[a_catlst[j][0]] = j
+    # import pdb; pdb.set_trace()
+    while i < len(b_catlst):
+        if b_catlst[i][0] in a_pkgName2Idx:
+            if b_catlst[i] != a_catlst[a_pkgName2Idx[b_catlst[i][0]]]:
+                logger.warning("pkgs different at {0},{1}: {2} {3}".format(i,a_pkgName2Idx[b_catlst[i][0]],a_catlst[a_pkgName2Idx[b_catlst[i][0]]],b_catlst[i]))
+                sys.exit(1)
+        else:
+            logger.warning("not in acat: %s", b_catlst[i])
+            sys.exit(1)
+        i += 1 
+    b_pkgName2Idx = {}
+    for j in range(idx,len(b_catlst)):
+        b_pkgName2Idx[b_catlst[j][0]] = j
+    # import pdb; pdb.set_trace()
+    i = idx
+    while i < len(a_catlst):
+        if a_catlst[i][0] not in b_pkgName2Idx:
+            logger.warning("not in bcat: %s", a_catlst[i])
+            sys.exit(1)
+        i += 1 
+        
 def main():
-    parser = optparse.OptionParser()
-    parser.add_option("-v","--verbose", dest="verbose", action="store_true",default=False)
-    parser.add_option("-a","--existing-catalog", dest="oldcatalog", 
-                    help='set URI of existing catalog', metavar = 'catalog')
-    parser.add_option("-b","--new-catalog", dest="newcatalog", 
-                    help='set URI of catalog to generate', metavar = 'catalog')
-    options, args = parser.parse_args()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-v","--verbose", dest="verbose", action="store_true",default=False)
+    parser.add_argument("acat",help="catalog URI")
+    parser.add_argument("bcat",help="catalog URI")
+    args = parser.parse_args()
     opterror = False
-    if options.verbose:
+    if args.verbose:
         logger.setLevel(logging.INFO)
-    if options.debug:
-        logger.setLevel(logging.DEBUG)
-    if options.newcatalog is None or options.oldcatalog is None:
-        logger.error("mandatory option missing")
+    if args.acat is None or args.bcat is None:
+        logger.error("mandatory args 'acat' 'bcat' missing")
         sys.exit(2)
-    oldcat = options.oldcatalog
-    newcat = options.newcatalog
-    logger.info(" compare %s with %s", oldcat, newcat)
 
-    data = urllib2.urlopen(oldcat).read()
-    a_catlst = cjson.decode(data)
-    for e in a_catlst:
-        del e[9]
-    b_catlst = []
-    with open(newcat) as nc:
-        for i in range(4): # skip 4 lines header
-            nc.readline()
-        for cl in nc.readlines():
-            if "-----BEGIN" == cl.split(' ')[0]:
-                break
-            b_catlst.append(cl.rstrip().split(' '))
+    logger.info("fetch cat_a %s", args.acat)
+    a_catlst = prepareCatListFromURI(args.acat)
+    
+    logger.info("fetch cat_b %s", args.bcat)
+    b_catlst = prepareCatListFromURI(args.bcat)
+
+    logger.info("compare ...")
     if len(a_catlst) != len(b_catlst):
-        logger.warning("a has %d, b has %d packges",len(a_catlst),len(b_catlst))
-        sys.exit(1)
+        logger.warning("a has %d, b has %d packages",len(a_catlst),len(b_catlst))
+        # sys.exit(1)
     for i in range(len(b_catlst)):
-        if b_catlst[i] != a_catlst[i] :
-            logger.warning("a is {0}, b is {1}".format(a_catlst[i],b_catlst[i]))
-            sys.exit(1)
+        try:
+            if b_catlst[i] != a_catlst[i] :
+                if b_catlst[i][0] != a_catlst[i][0]: 
+                    logger.warning("packages out of order: A: %s; B: %s",a_catlst[i][0], b_catlst[i][0])
+                    compareOutOfOrder(a_catlst, b_catlst, i)
+                    break
+                else:
+                    logger.warning("pkgs different: {0} {1}".format(a_catlst[i],b_catlst[i]))
+                    sys.exit(1)
+        except IndexError as e:
+            logger.info("package %s not in acat", b_catlst[i])
             
     # import pdb; pdb.set_trace()
-    logger.debug("catalogs are same")
+    logger.info("catalogs are same")
     sys.exit(0)
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From maciej at opencsw.org  Tue Jan 28 17:36:26 2014
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Tue, 28 Jan 2014 16:36:26 +0000
Subject: SF.net SVN: gar:[22910]
	csw/mgar/gar/v2/lib/python/compare_catalog.py
In-Reply-To: <3fDCkQ4HZ9z6v@mail.opencsw.org>
References: <3fDCkQ4HZ9z6v@mail.opencsw.org>
Message-ID: 

Hi Carsten,

More comments! I hope you'll be able to reduce the size of this script.

2014-01-28 

> Revision: 22910
>           http://sourceforge.net/p/gar/code/22910
> Author:   cgrzemba
> Date:     2014-01-28 16:20:56 +0000 (Tue, 28 Jan 2014)
> Log Message:
> -----------
> use argparse, add out of order pkg compare
>
> Modified Paths:
> --------------
>     csw/mgar/gar/v2/lib/python/compare_catalog.py
>
> Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
> ===================================================================
> --- csw/mgar/gar/v2/lib/python/compare_catalog.py       2014-01-28
> 12:36:44 UTC (rev 22909)
> +++ csw/mgar/gar/v2/lib/python/compare_catalog.py       2014-01-28
> 16:20:56 UTC (rev 22910)
> @@ -2,55 +2,108 @@
>
>  import cjson
>  import logging
> -import optparse
> +import argparse
>  import urllib2
>  import sys
> +import re
>
>  logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s')
>  logger = logging.getLogger(__name__)
>
> +remote_scheme = ['http','https']
> +local_scheme = ['file']
> +
> +def prepareCatListFromURI(uri):
> +    catlst = []
> +    if '://' in uri:
>

We can say that you have to have a valid URI that either starts with
http://or https://or file://


> +        scheme = uri.split(':')[0]
> +        if scheme in remote_scheme:
> +            logger.info("fetch remote %s", uri)
> +            data = urllib2.urlopen(uri).read()
>

Let's use the requests module. We have a package.

http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/rest.py#L250


> +            catlst = cjson.decode(data)
> +            for e in catlst:
> +                del e[9]
> +            return catlst
> +        elif scheme in local_scheme:
> +            uri = re.sub('.*://','',uri)
> +        else:
> +            logger.error('unsupported URI format')
> +            sys.exit(4)
> +    with open(uri) as lcat:
> +        logger.info("fetch local %s", uri)
> +        for line in lcat: # skip 4 lines header '# CREATIONDATE'
>

We already have a parser, please use it.
http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/catalog.py#L66


> +            if line.startswith("# CREATIONDATE"):
> +                break
> +        for line in lcat:
> +            if line.startswith("-----BEGIN PGP SIGNATURE"):
> +                break
> +            catlst.append(line.rstrip().split(' '))
> +    return catlst
> +
> +def compareOutOfOrder(a_catlst, b_catlst, idx):
> +    a_pkgName2Idx = {}
> +    i = idx
> +    for j in range(idx,len(a_catlst)):
> +        a_pkgName2Idx[a_catlst[j][0]] = j
> +    # import pdb; pdb.set_trace()
> +    while i < len(b_catlst):
> +        if b_catlst[i][0] in a_pkgName2Idx:
> +            if b_catlst[i] != a_catlst[a_pkgName2Idx[b_catlst[i][0]]]:
> +                logger.warning("pkgs different at {0},{1}: {2}
> {3}".format(i,a_pkgName2Idx[b_catlst[i][0]],a_catlst[a_pkgName2Idx[b_catlst[i][0]]],b_catlst[i]))
> +                sys.exit(1)
> +        else:
> +            logger.warning("not in acat: %s", b_catlst[i])
> +            sys.exit(1)
> +        i += 1
> +    b_pkgName2Idx = {}
> +    for j in range(idx,len(b_catlst)):
> +        b_pkgName2Idx[b_catlst[j][0]] = j
> +    # import pdb; pdb.set_trace()
> +    i = idx
> +    while i < len(a_catlst):
> +        if a_catlst[i][0] not in b_pkgName2Idx:
> +            logger.warning("not in bcat: %s", a_catlst[i])
> +            sys.exit(1)
> +        i += 1
>

Why not convert both to a data structure consisting of basic types: nested
lists and dicts? Then you can just compare them using the == operator. If
you wanted some diagnostic output to display the difference, you can always
serialize them and display the textual diff - it will save you lots of
lines of code.


>  def main():
> -    parser = optparse.OptionParser()
> -    parser.add_option("-v","--verbose", dest="verbose",
> action="store_true",default=False)
> -    parser.add_option("-a","--existing-catalog", dest="oldcatalog",
> -                    help='set URI of existing catalog', metavar =
> 'catalog')
> -    parser.add_option("-b","--new-catalog", dest="newcatalog",
> -                    help='set URI of catalog to generate', metavar =
> 'catalog')
> -    options, args = parser.parse_args()
> +    parser = argparse.ArgumentParser()
> +    parser.add_argument("-v","--verbose", dest="verbose",
> action="store_true",default=False)
> +    parser.add_argument("acat",help="catalog URI")
> +    parser.add_argument("bcat",help="catalog URI")
> +    args = parser.parse_args()
>      opterror = False
> -    if options.verbose:
> +    if args.verbose:
>          logger.setLevel(logging.INFO)
> -    if options.debug:
> -        logger.setLevel(logging.DEBUG)
> -    if options.newcatalog is None or options.oldcatalog is None:
> -        logger.error("mandatory option missing")
> +    if args.acat is None or args.bcat is None:
> +        logger.error("mandatory args 'acat' 'bcat' missing")
>          sys.exit(2)
> -    oldcat = options.oldcatalog
> -    newcat = options.newcatalog
> -    logger.info(" compare %s with %s", oldcat, newcat)
>
> -    data = urllib2.urlopen(oldcat).read()
> -    a_catlst = cjson.decode(data)
> -    for e in a_catlst:
> -        del e[9]
> -    b_catlst = []
> -    with open(newcat) as nc:
> -        for i in range(4): # skip 4 lines header
> -            nc.readline()
> -        for cl in nc.readlines():
> -            if "-----BEGIN" == cl.split(' ')[0]:
> -                break
> -            b_catlst.append(cl.rstrip().split(' '))
> +    logger.info("fetch cat_a %s", args.acat)
> +    a_catlst = prepareCatListFromURI(args.acat)
> +
> +    logger.info("fetch cat_b %s", args.bcat)
> +    b_catlst = prepareCatListFromURI(args.bcat)
> +
> +    logger.info("compare ...")
>      if len(a_catlst) != len(b_catlst):
> -        logger.warning("a has %d, b has %d
> packges",len(a_catlst),len(b_catlst))
> -        sys.exit(1)
> +        logger.warning("a has %d, b has %d
> packages",len(a_catlst),len(b_catlst))
> +        # sys.exit(1)
>      for i in range(len(b_catlst)):
> -        if b_catlst[i] != a_catlst[i] :
> -            logger.warning("a is {0}, b is
> {1}".format(a_catlst[i],b_catlst[i]))
> -            sys.exit(1)
> +        try:
> +            if b_catlst[i] != a_catlst[i] :
> +                if b_catlst[i][0] != a_catlst[i][0]:
> +                    logger.warning("packages out of order: A: %s; B:
> %s",a_catlst[i][0], b_catlst[i][0])
>

Hm, what I meant is that out of order comparing:

1. should just work
2. should not be a special case

The code should use such data structures that the ordering doesn't matter.
For example, if you use a dict, then the ordering doesn't matter:

>>> a = dict([('a', 1), ('b', 2)])
>>> b = dict([('b', 2), ('a', 1)])
>>> a == b
True



> +                    compareOutOfOrder(a_catlst, b_catlst, i)
> +                    break
> +                else:
> +                    logger.warning("pkgs different: {0}
> {1}".format(a_catlst[i],b_catlst[i]))
> +                    sys.exit(1)
> +        except IndexError as e:
> +            logger.info("package %s not in acat", b_catlst[i])
>
>      # import pdb; pdb.set_trace()
> -    logger.debug("catalogs are same")
> +    logger.info("catalogs are same")
>      sys.exit(0)
>
>
>
> This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: 

From dmichelsen at users.sourceforge.net  Wed Jan 29 12:00:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Jan 2014 11:00:38 +0000
Subject: SF.net SVN: gar:[22911] csw/mgar/pkg/libcurl4/trunk
Message-ID: <3fDhZG0N45z1R5@mail.opencsw.org>

Revision: 22911
          http://sourceforge.net/p/gar/code/22911
Author:   dmichelsen
Date:     2014-01-29 11:00:34 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
libcurl4/trunk: Update to 7.35.0

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile
    csw/mgar/pkg/libcurl4/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.34.0
+VERSION = 7.35.0
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -18,8 +18,6 @@
 
 VENDOR_URL = http://curl.haxx.se
 
-PATCHFILES += 0000-trynextip-logic-inversion-bug.patch
-
 # Because of OpenSSL 1.0 update
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/checksums	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/checksums	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1 +1 @@
-552371ae5e40bd7d9c92c62ac4b7be81  curl-7.34.0.tar.lzma
+ad7d63864414c61246450dc5e2248c7b  curl-7.35.0.tar.lzma

Deleted: csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1,47 +0,0 @@
-From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= 
-Date: Sat, 28 Dec 2013 13:42:57 +0100
-Subject: [PATCH] connect: Try all addresses in first connection attempt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes a bug when all addresses in the first family fail immediately, due
-to "Network unreachable" for example, curl would hang and never try the
-next address family.
-
-Iterate through all address families when to trying establish the first
-connection attempt.
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=1315
-Reported-by: Michal G?rny and Anthony G. Basile
----
- lib/connect.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/connect.c b/lib/connect.c
-index 4b6ee00..588ac28 100644
---- a/lib/connect.c
-+++ b/lib/connect.c
-@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
-     conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2;
- 
-   /* start connecting to first IP */
--  res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
--  while(res != CURLE_OK &&
--        conn->tempaddr[0] &&
--        conn->tempaddr[0]->ai_next &&
--        conn->tempsock[0] == CURL_SOCKET_BAD)
--    res = trynextip(conn, FIRSTSOCKET, 0);
-+  while(conn->tempaddr[0]) {
-+    res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
-+    if(res == CURLE_OK)
-+        break;
-+    conn->tempaddr[0] = conn->tempaddr[0]->ai_next;
-+  }
- 
-   if(conn->tempsock[0] == CURL_SOCKET_BAD)
-     return res;
--- 
-1.8.5.1
-

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 Jan 29 15:24:52 2014
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Wed, 29 Jan 2014 14:24:52 +0000
Subject: SF.net SVN: gar:[22912] csw/mgar/pkg/lighttpd/trunk
Message-ID: <3fDn5q63Q5z9n@mail.opencsw.org>

Revision: 22912
          http://sourceforge.net/p/gar/code/22912
Author:   janholzh
Date:     2014-01-29 14:24:51 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
lighttpd/trunk: update to 1.4.34. Add solaris-userland patch. Needs some packingfixes to be released

Modified Paths:
--------------
    csw/mgar/pkg/lighttpd/trunk/Makefile
    csw/mgar/pkg/lighttpd/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-29 11:00:34 UTC (rev 22911)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-29 14:24:51 UTC (rev 22912)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = lighttpd
-VERSION = 1.4.31
+VERSION = 1.4.34
 GARTYPE = v2
 
 DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility
@@ -19,7 +19,9 @@
 DISTFILES   += $(NAME)-$(VERSION).tar.gz
 DISTFILES   += cswlighttpd
 
-PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
+#PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
+#Patch from http://buildfarm.opencsw.org/source/xref/solaris-userland/components/lighttpd/patches/05-network-nodelay.patch
+PATCHFILES += 0002-fix_missing_tcp_nodelay.patch
 
 # When mkdir is issued on an automounted directory like /home/ errno is
 # set to ENOSYS halting recursive directory generation. This patches handles
@@ -152,6 +154,6 @@
 	ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/pkg/$(NAME)
 	echo "lighttpd:lighttpd:lighttpd web server::::" \
 		> $(PKGROOT)$(sysconfdir)/pkg/$(NAME)/cswusergroup
-	(cd $(PKGROOT)$(libdir_install); ln -s . 32)
-	(cd $(PKGROOT)$(libdir_install); ln -s $(ISA_DEFAULT64) 64)
+	(cd $(PKGROOT)$(libdir_install); gln -s . 32)
+	(cd $(PKGROOT)$(libdir_install); gln -s $(ISA_DEFAULT64) 64)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/lighttpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/checksums	2014-01-29 11:00:34 UTC (rev 22911)
+++ csw/mgar/pkg/lighttpd/trunk/checksums	2014-01-29 14:24:51 UTC (rev 22912)
@@ -1 +1 @@
-7907b7167d639b8a8daab97e223249d5  lighttpd-1.4.31.tar.gz
+64ae57bd90c41bbf31bddb88ba6199fe  lighttpd-1.4.34.tar.gz

Added: csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch	                        (rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/files/0002-fix_missing_tcp_nodelay.patch	2014-01-29 14:24:51 UTC (rev 22912)
@@ -0,0 +1,27 @@
+From e908bdfe2c326786152a7cd62a6c4f6fd7d0fa55 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter 
+Date: Wed, 29 Jan 2014 15:07:49 +0100
+Subject: [PATCH] fix_missing_tcp_nodelay
+
+---
+ src/network.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network.c b/src/network.c
+index 14f2ebd..976f54d 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -274,6 +274,10 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
+ 		log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(SO_REUSEADDR) failed:", strerror(errno));
+ 		goto error_free_socket;
+ 	}
++        if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
++                log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(TCP_NODELAY) failed:", strerror(errno));
++                goto error_free_socket;
++        }
+ 
+ 	switch(srv_socket->addr.plain.sa_family) {
+ #ifdef HAVE_IPV6
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Wed Jan 29 16:11:00 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Jan 2014 15:11:00 +0000
Subject: SF.net SVN: gar:[22913] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fDp7D2fK5zKk@mail.opencsw.org>

Revision: 22913
          http://sourceforge.net/p/gar/code/22913
Author:   dmichelsen
Date:     2014-01-29 15:10:57 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Add comment of bug report

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-29 14:24:51 UTC (rev 22912)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-29 15:10:57 UTC (rev 22913)
@@ -19,6 +19,7 @@
 PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
 
 # Use patch until this is fixed:
+#   http://mirrorbrain.org/issues/issue138
 PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
 
 VENDOR_URL = http://mirrorbrain.org

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Wed Jan 29 17:30:52 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Wed, 29 Jan 2014 16:30:52 +0000
Subject: SF.net SVN: gar:[22914]
	csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
Message-ID: <3fDqvK5db3zVC@mail.opencsw.org>

Revision: 22914
          http://sourceforge.net/p/gar/code/22914
Author:   opk
Date:     2014-01-29 16:30:50 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
lang-python/matplotlib: resolve checkpkg errors

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-29 15:10:57 UTC (rev 22913)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-29 16:30:50 UTC (rev 22914)
@@ -29,18 +29,19 @@
 
 BUILD_DEP_PKGS = CSWpython27-dev
 
-RUNTIME_DEP_PKGS = CSWlibatk
-RUNTIME_DEP_PKGS += CSWggettextrt
-RUNTIME_DEP_PKGS += CSWpng
-RUNTIME_DEP_PKGS += CSWfconfig
-RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWftype2
-RUNTIME_DEP_PKGS += CSWpango
-RUNTIME_DEP_PKGS += CSWlibcairo
-RUNTIME_DEP_PKGS += CSWgtk2
-RUNTIME_DEP_PKGS += CSWzlib
+RUNTIME_DEP_PKGS = CSWlibpython2-7-1-0
+RUNTIME_DEP_PKGS += CSWlibstdc++6
+RUNTIME_DEP_PKGS += CSWlibpng15-15
+RUNTIME_DEP_PKGS += CSWlibgcc-s1
+RUNTIME_DEP_PKGS += CSWlibfreetype6
 
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/dviread.py
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/font_manager.py
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/_mathtext_data.py
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/tests/test_agg.py
+CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/matplotlib/font_manager.py
+
 PATCHFILES += 0001-avoid-reserved-variable-names.patch
 MODULATIONS_PYTHON_VERSION = 2_7
 CONFIGURE_ARGS = $(DIRPATHS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From chninkel at users.sourceforge.net  Wed Jan 29 22:23:25 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 29 Jan 2014 21:23:25 +0000
Subject: SF.net SVN: gar:[22915] csw/mgar/pkg/openssl/trunk
Message-ID: <3fDyNn3xksztW@mail.opencsw.org>

Revision: 22915
          http://sourceforge.net/p/gar/code/22915
Author:   chninkel
Date:     2014-01-29 21:23:23 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
openssl/trunk: remove the openssl metapackage

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/openssl/trunk/files/CSWopenssl.checkinstall
    csw/mgar/pkg/openssl/trunk/files/CSWopenssl.prototype

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2014-01-29 16:30:50 UTC (rev 22914)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2014-01-29 21:23:23 UTC (rev 22915)
@@ -24,15 +24,8 @@
   as a full-strength general-purpose cryptography library.
 endef
 
-PACKAGES = CSWopenssl CSWlibssl0-9-8 CSWlibssl-dev CSWopenssl-utils
+PACKAGES = CSWlibssl0-9-8 CSWlibssl-dev CSWopenssl-utils
 
-SPKG_DESC_CSWopenssl = Openssl meta package
-CATALOGNAME_CSWopenssl = openssl
-RUNTIME_DEP_PKGS_CSWopenssl = CSWlibssl-dev CSWopenssl-utils CSWlibssl0-9-8
-ARCHALL_CSWopenssl = 1
-OBSOLETED_BY_CSWopenssl = CSWossl
-CHECKPKG_OVERRIDES_CSWossl += surplus-dependency|CSWopenssl
-
 SPKG_DESC_CSWlibssl0-9-8 = Openssl runtime libraries
 CATALOGNAME_CSWlibssl0-9-8 = libssl0_9_8
 RUNTIME_DEP_PKGS_CSWlibssl0-9-8 = CSWcacertificates
@@ -52,11 +45,6 @@
 OBSOLETED_BY_CSWopenssl-utils = CSWosslutils
 CHECKPKG_OVERRIDES_CSWosslutils += surplus-dependency|CSWopenssl-utils
 
-# openssl is a meta-package
-CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWopenssl-utils
-CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWlibssl-dev
-CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWlibssl0-9-8
-
 # we use sun perl not csw one
 CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl
 
@@ -114,9 +102,6 @@
 CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/FAQ
 CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL
 CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/CHANGES
-CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/INSTALL
-CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/CHANGES
-CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/FAQ
 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/INSTALL
 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/FAQ
 CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/CHANGES
@@ -135,7 +120,6 @@
 UFILES_REGEX = $(NAME)-(0.9.8[a-z]).tar.gz
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz 
-DISTFILES += CSWopenssl.prototype
 DISTFILES += CSWlibssl0-9-8.prototype-i386 CSWlibssl0-9-8.prototype-sparc
 DISTFILES += CSWlibssl-dev.prototype-i386 CSWlibssl-dev.prototype-sparc
 DISTFILES += CSWopenssl-utils.prototype 

Deleted: csw/mgar/pkg/openssl/trunk/files/CSWopenssl.checkinstall
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWopenssl.checkinstall	2014-01-29 16:30:50 UTC (rev 22914)
+++ csw/mgar/pkg/openssl/trunk/files/CSWopenssl.checkinstall	2014-01-29 21:23:23 UTC (rev 22915)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-PLATFORM=`/usr/bin/uname -p`
-VERSION=`/usr/bin/uname -r`
-
-# Solaris 8 requires patches to have /dev/random and /dev/urandom.
-if [ $VERSION -eq "5.8" ]; then
-
-	if [ ! -c $PKG_ROOT_DIR/dev/random ]; then
-		echo "ERROR: /dev/random must exist."
-		err=1
-	fi
-
-	if [ ! -c $PKG_ROOT_DIR/dev/urandom ]; then
-		echo "ERROR: /dev/urandom must exist."
-		err=1
-	fi
-
-	if [ "$err" = "1" ]; then
-		if [ $PLATFORM -eq "sparc" ]; then
-			echo "Please install patch 112438."
-		elif [ $PLATFORM -eq "i386" ]; then
-			echo "Please install patch 112439."
-		fi
-		exit 1
-	fi
-fi
-
-exit 0

Deleted: csw/mgar/pkg/openssl/trunk/files/CSWopenssl.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWopenssl.prototype	2014-01-29 16:30:50 UTC (rev 22914)
+++ csw/mgar/pkg/openssl/trunk/files/CSWopenssl.prototype	2014-01-29 21:23:23 UTC (rev 22915)
@@ -1,14 +0,0 @@
-d none /opt/csw/share/doc/openssl 0755 root bin
-f none /opt/csw/share/doc/openssl/changelog.CSW 644 root bin
-f none /opt/csw/share/doc/openssl/license 644 root bin
-f none /opt/csw/share/doc/openssl/CHANGES 644 root bin
-f none /opt/csw/share/doc/openssl/CHANGES.SSLeay 644 root bin
-f none /opt/csw/share/doc/openssl/PROBLEMS 644 root bin
-f none /opt/csw/share/doc/openssl/README 644 root bin
-f none /opt/csw/share/doc/openssl/FAQ 644 root bin
-f none /opt/csw/share/doc/openssl/README.ASN1 644 root bin
-f none /opt/csw/share/doc/openssl/INSTALL 644 root bin
-f none /opt/csw/share/doc/openssl/NEWS 644 root bin
-f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin
-f none /opt/csw/share/doc/openssl/README.CSW 644 root bin
-i checkpkg_override=checkpkg_override.CSWopenssl

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 30 10:51:43 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 30 Jan 2014 09:51:43 +0000
Subject: SF.net SVN: gar:[22916] csw/mgar/pkg/lang-python
Message-ID: <3fFH0B1zLzz4@mail.opencsw.org>

Revision: 22916
          http://sourceforge.net/p/gar/code/22916
Author:   opk
Date:     2014-01-30 09:51:42 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
lang-python/pyparsing: package pyparsing module needed by matplotlib

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pyparsing/
    csw/mgar/pkg/lang-python/pyparsing/Makefile
    csw/mgar/pkg/lang-python/pyparsing/branches/
    csw/mgar/pkg/lang-python/pyparsing/tags/
    csw/mgar/pkg/lang-python/pyparsing/trunk/
    csw/mgar/pkg/lang-python/pyparsing/trunk/Makefile
    csw/mgar/pkg/lang-python/pyparsing/trunk/checksums
    csw/mgar/pkg/lang-python/pyparsing/trunk/files/

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-29 21:23:23 UTC (rev 22915)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-30 09:51:42 UTC (rev 22916)
@@ -34,6 +34,7 @@
 RUNTIME_DEP_PKGS += CSWlibpng15-15
 RUNTIME_DEP_PKGS += CSWlibgcc-s1
 RUNTIME_DEP_PKGS += CSWlibfreetype6
+RUNTIME_DEP_PKGS += CSWpy-pyparsing
 
 CHECKPKG_OVERRIDES_CSWpy-matplotlib += python-package-missing-py26-files
 CHECKPKG_OVERRIDES_CSWpy-matplotlib += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/dviread.py

Added: csw/mgar/pkg/lang-python/pyparsing/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyparsing/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyparsing/Makefile	2014-01-30 09:51:42 UTC (rev 22916)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/lang-python/pyparsing/trunk
===================================================================
--- csw/mgar/pkg/lang-python/pyparsing/trunk	2014-01-29 21:23:23 UTC (rev 22915)
+++ csw/mgar/pkg/lang-python/pyparsing/trunk	2014-01-30 09:51:42 UTC (rev 22916)

Property changes on: csw/mgar/pkg/lang-python/pyparsing/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/pyparsing/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyparsing/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyparsing/trunk/Makefile	2014-01-30 09:51:42 UTC (rev 22916)
@@ -0,0 +1,24 @@
+# $Id$
+
+NAME = pyparsing
+VERSION = 2.0.1
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Python parsing module
+define BLURB
+  The pyparsing module is an alternative approach to creating and executing
+  simple grammars, vs. the traditional lex/yacc approach, or the use of regular
+  expressions. The pyparsing module provides a library of classes that client
+  code uses to construct the grammar directly in Python code.
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(DISTNAME).tar.gz
+LICENSE = LICENSE
+TEST_SCRIPTS =
+
+ARCHALL = 1
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/lang-python/pyparsing/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/pyparsing/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pyparsing/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyparsing/trunk/checksums	2014-01-30 09:51:42 UTC (rev 22916)
@@ -0,0 +1 @@
+37adec94104b98591507218bc82e7c31  pyparsing-2.0.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 30 14:20:17 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 30 Jan 2014 13:20:17 +0000
Subject: SF.net SVN: gar:[22917] csw/mgar/pkg/lang-python/ipython/trunk
Message-ID: <3fFMcv0fzkzGd@mail.opencsw.org>

Revision: 22917
          http://sourceforge.net/p/gar/code/22917
Author:   opk
Date:     2014-01-30 13:20:12 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
ipython: update to 1.1.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/ipython/trunk/Makefile
    csw/mgar/pkg/lang-python/ipython/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch

Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/ipython/trunk/Makefile	2014-01-30 09:51:42 UTC (rev 22916)
+++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile	2014-01-30 13:20:12 UTC (rev 22917)
@@ -7,7 +7,7 @@
 #   shipping ipythonx?)
 # 
 NAME    = ipython
-VERSION = 0.13.2
+VERSION = 1.1.0
 CATEGORIES = python
 GARTYPE = v2
 
@@ -23,13 +23,18 @@
 PACKAGES     = CSWipython
 CATALOGNAME  = ipython
 
-PATCHFILES += 0001-rename-filenames-containing-spaces.patch
+EXTRA_MERGE_EXCLUDE_FILES = .*\.gitignore
 
-CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/IPython/core/usage.py
-CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/utils/tests/test_path.py
-CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/pexpect/_pexpect.py
-CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/path/_path.py
-CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/utils/tests/test_path.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/external/path/_path.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/external/pexpect/_pexpect.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/IPython/core/usage.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/external/path/_path.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/external/pexpect/_pexpect.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/utils/tests/test_path.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/IPython/core/usage.py
 CHECKPKG_OVERRIDES_CSWipython += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWipython += catalogname-does-not-start-with-py_
 
@@ -37,8 +42,7 @@
 
 include gar/category.mk
 
-post-extract:
-	@( cd $(WORKSRC)/docs/examples/notebooks && mv Capturing\ Output.ipynb Capturing_Output.ipynb )
-	@( cd $(WORKSRC)/docs/examples/notebooks && mv Script\ Magics.ipynb Script_Magics.ipynb )
-	@( cd $(WORKSRC)/docs/examples/parallel && mv Parallel\ Magics.ipynb Parallel_Magics.ipynb )
+post-build-modulated:
+	@gsed -i '1 s/$(subst _,.,$(PYTHON_VERSION))//' $(WORKSRC)/build/scripts-$(subst _,.,$(PYTHON_VERSION))/*
 	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/lang-python/ipython/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/ipython/trunk/checksums	2014-01-30 09:51:42 UTC (rev 22916)
+++ csw/mgar/pkg/lang-python/ipython/trunk/checksums	2014-01-30 13:20:12 UTC (rev 22917)
@@ -1 +1 @@
-ead3b7eb70c653b537fb9d96d71b8b2a  ipython-0.13.2.tar.gz
+70d69c78122923879232567ac3c47cef  ipython-1.1.0.tar.gz

Deleted: csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch
===================================================================
--- csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch	2014-01-30 09:51:42 UTC (rev 22916)
+++ csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch	2014-01-30 13:20:12 UTC (rev 22917)
@@ -1,27 +0,0 @@
-From 941fe385c376854c443eb777fe67630650f3ea14 Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle 
-Date: Thu, 4 Jul 2013 11:48:13 +0200
-Subject: [PATCH] rename filenames containing spaces
-
----
- docs/examples/notebooks/00_notebook_tour.ipynb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/examples/notebooks/00_notebook_tour.ipynb b/docs/examples/notebooks/00_notebook_tour.ipynb
-index c5f8c4c..0dffdd1 100644
---- a/docs/examples/notebooks/00_notebook_tour.ipynb
-+++ b/docs/examples/notebooks/00_notebook_tour.ipynb
-@@ -65,8 +65,8 @@
-         "00_notebook_tour.ipynb          callbacks.ipynb                 python-logo.svg\r\n",
-         "01_notebook_introduction.ipynb  cython_extension.ipynb          rmagic_extension.ipynb\r\n",
-         "Animations_and_Progress.ipynb   display_protocol.ipynb          sympy.ipynb\r\n",
--        "Capturing Output.ipynb          formatting.ipynb                sympy_quantum_computing.ipynb\r\n",
--        "Script Magics.ipynb             octavemagic_extension.ipynb     trapezoid_rule.ipynb\r\n",
-+        "Capturing_Output.ipynb          formatting.ipynb                sympy_quantum_computing.ipynb\r\n",
-+        "Script_Magics.ipynb             octavemagic_extension.ipynb     trapezoid_rule.ipynb\r\n",
-         "animation.m4v                   progbar.ipynb\r\n"
-        ]
-       }
--- 
-1.8.3.1
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 30 14:48:47 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 30 Jan 2014 13:48:47 +0000
Subject: SF.net SVN: gar:[22918] csw/mgar/pkg/zsh/trunk
Message-ID: <3fFNFh2YM9zNR@mail.opencsw.org>

Revision: 22918
          http://sourceforge.net/p/gar/code/22918
Author:   opk
Date:     2014-01-30 13:48:45 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
zsh: add completion function for opencsw alternatives

Modified Paths:
--------------
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/files/_mgar

Added Paths:
-----------
    csw/mgar/pkg/zsh/trunk/files/_alternatives

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2014-01-30 13:20:12 UTC (rev 22917)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2014-01-30 13:48:45 UTC (rev 22918)
@@ -11,7 +11,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += _pkgutil _mgar
+DISTFILES += _pkgutil _mgar _alternatives
 
 PACKAGES = CSWzsh
 CATALOGNAME_CSWzsh = zsh
@@ -41,5 +41,5 @@
 CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS)
 
 post-install-modulated:
-	cp -p $(WORKDIR)/_pkgutil $(WORKDIR)/_mgar $(DESTDIR)$(sharedstatedir)/$(NAME)/functions
+	cp -p $(WORKDIR)/_pkgutil $(WORKDIR)/_mgar $(WORKDIR)/_alternatives $(DESTDIR)$(sharedstatedir)/$(NAME)/functions
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/zsh/trunk/files/_alternatives
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/_alternatives	                        (rev 0)
+++ csw/mgar/pkg/zsh/trunk/files/_alternatives	2014-01-30 13:48:45 UTC (rev 22918)
@@ -0,0 +1,13 @@
+#compdef alternatives
+
+local -a args
+args=(
+  '(- 2)'{--display,--auto,--config} '(-)'{--set,--remove}
+  '(1 2 -)--install:path:_files:name: :priority'
+  '(1 2 -)'{--relink-missing,--list}
+  '2:path:_files'
+)
+(( CURRENT > 2 )) &&
+  args+='1:name:( ${${(f)"$(/opt/csw/sbin/alternatives --list)"}[2,-1]} )'
+
+_arguments $args

Modified: csw/mgar/pkg/zsh/trunk/files/_mgar
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/_mgar	2014-01-30 13:20:12 UTC (rev 22917)
+++ csw/mgar/pkg/zsh/trunk/files/_mgar	2014-01-30 13:48:45 UTC (rev 22918)
@@ -7,6 +7,9 @@
 if (( CURRENT == 2 )); then
   cmds=(
     help:list\ available\ commands
+    install:install\ files\ to\ staging\ directory
+    makepatch:create\ a\ patch\ for\ outstanding\ changes
+    check-prereqs checksum test
     ${${(M)${(f)"$(_call_program commands ${words[1]} help)"}:#  *}//  (#b)([a-z-]##)[^A-Z]##(?)/$match[1]:${match[2]:l}}
   )
 

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 Jan 30 15:43:54 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Jan 2014 14:43:54 +0000
Subject: SF.net SVN: gar:[22919] csw/mgar/pkg/cpan
Message-ID: <3fFPTH51lhzXC@mail.opencsw.org>

Revision: 22919
          http://sourceforge.net/p/gar/code/22919
Author:   dmichelsen
Date:     2014-01-30 14:43:54 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
cpan/Digest-MD4/trunk: iInitial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Digest-MD4/
    csw/mgar/pkg/cpan/Digest-MD4/branches/
    csw/mgar/pkg/cpan/Digest-MD4/tags/
    csw/mgar/pkg/cpan/Digest-MD4/trunk/
    csw/mgar/pkg/cpan/Digest-MD4/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-MD4/trunk/checksums
    csw/mgar/pkg/cpan/Digest-MD4/trunk/files/

Index: csw/mgar/pkg/cpan/Digest-MD4/trunk
===================================================================
--- csw/mgar/pkg/cpan/Digest-MD4/trunk	2014-01-30 13:48:45 UTC (rev 22918)
+++ csw/mgar/pkg/cpan/Digest-MD4/trunk	2014-01-30 14:43:54 UTC (rev 22919)

Property changes on: csw/mgar/pkg/cpan/Digest-MD4/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+work
+
Added: csw/mgar/pkg/cpan/Digest-MD4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Digest-MD4/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Digest-MD4/trunk/Makefile	2014-01-30 14:43:54 UTC (rev 22919)
@@ -0,0 +1,21 @@
+NAME = Digest-MD4
+VERSION = 1.9
+CATEGORIES = cpan
+GARTYPE = v2
+AUTHOR = MIKEM
+
+DESCRIPTION = Perl interface to the MD4 Algorithm
+define BLURB
+endef
+
+MASTER_SITES = $(addsuffix DigestMD4/,$(CPAN_MIRRORS))
+
+CATALOG_RELEASE = unstable
+
+LICENSE_TEXT = This module is licensed under the Perl license
+
+PACKAGES += CSWpm-digest-md4
+CATALOGNAME_CSWpm-digest-md4 = pm_digest_md4
+SPKG_DESC_CSWpm-digest-md4 = Perl interface to the MD4 Algorithm
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Digest-MD4/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Digest-MD4/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Digest-MD4/trunk/checksums	2014-01-30 14:43:54 UTC (rev 22919)
@@ -0,0 +1 @@
+7d3818b5da96fc876424caebcebf88f4  Digest-MD4-1.9.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Thu Jan 30 15:57:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Jan 2014 14:57:05 +0000
Subject: SF.net SVN: gar:[22920] csw/mgar/pkg/lighttpd/trunk/Makefile
Message-ID: <3fFPmb2WXKzcD@mail.opencsw.org>

Revision: 22920
          http://sourceforge.net/p/gar/code/22920
Author:   dmichelsen
Date:     2014-01-30 14:57:05 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
lighttpd/trunk: Enable more modules

Modified Paths:
--------------
    csw/mgar/pkg/lighttpd/trunk/Makefile

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-30 14:43:54 UTC (rev 22919)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-30 14:57:05 UTC (rev 22920)
@@ -20,7 +20,7 @@
 DISTFILES   += cswlighttpd
 
 #PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
-#Patch from http://buildfarm.opencsw.org/source/xref/solaris-userland/components/lighttpd/patches/05-network-nodelay.patch
+# Patch from http://buildfarm.opencsw.org/source/xref/solaris-userland/components/lighttpd/patches/05-network-nodelay.patch
 PATCHFILES += 0002-fix_missing_tcp_nodelay.patch
 
 # When mkdir is issued on an automounted directory like /home/ errno is
@@ -28,8 +28,8 @@
 # ENOSYS similar to EEXIST and just continues with the creation which then may
 # or may not work later on.
 #
-# There's a thread started on lighttpd forums about the issue:
-#   http://redmine.lighttpd.net/boards/2/topics/4163
+# Use patch until this is fixed:
+#   http://redmine.lighttpd.net/issues/2527
 PATCHFILES += 0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch
 
 # PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386                                                                          
@@ -43,6 +43,7 @@
 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibfam0
 
 PACKAGES += CSWlighttpd-mod-auth
 SPKG_DESC_CSWlighttpd-mod-auth = Lighttpd module for authentication
@@ -50,14 +51,24 @@
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWlighttpd
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWlibssl1-0-0
 
+# These are problems within checkpkg
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-auth += 64-bit-binaries-missing
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-auth += surplus-dependency|CSWlighttpd
+
 PACKAGES += CSWlighttpd-mod-webdav
 SPKG_DESC_CSWlighttpd-mod-webdav = Lighttpd module for WebDAV access
 PKGFILES_CSWlighttpd-mod-webdav += $(call baseisadirs,$(libdir_install),mod_webdav.so)
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlighttpd
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlibuuid1
 
+# These are problems within checkpkg
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-webdav += 64-bit-binaries-missing
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-webdav += surplus-dependency|CSWlighttpd
+
 PACKAGES += CSWlighttpd-mod-mysql-vhost
 SPKG_DESC_CSWlighttpd-mod-mysql-vhost = Lighttpd module for MySQL-driven VHOSTs
 PKGFILES_CSWlighttpd-mod-mysql-vhost += $(call baseisadirs,$(libdir_install),mod_mysql_vhost.so)
@@ -66,6 +77,21 @@
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlibz1
 
+# These are problems within checkpkg
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += 64-bit-binaries-missing
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += surplus-dependency|CSWlighttpd
+
+PACKAGES += CSWlighttpd-mod-trigger
+SPKG_DESC_CSWlighttpd-mod-trigger = Lighttpd module
+PKGFILES_CSWlighttpd-mod-trigger += $(call baseisadirs,$(libdir_install),mod_trigger_b4_dl.so)
+RUNTIME_DEP_PKGS_CSWlighttpd-mod-trigger += CSWlighttpd
+RUNTIME_DEP_PKGS_CSWlighttpd-mod-trigger += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlighttpd-mod-trigger += CSWlibgdbm4
+
+# These are problems within checkpkg
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-trigger += 64-bit-binaries-missing
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-trigger += surplus-dependency|CSWlighttpd
+
 # Add library needed for sendfilev64 referenced from .libs/liblightcomp_la-network_solaris_sendfilev.o
 EXTRA_LINKER_FLAGS += -lsendfile
 
@@ -75,13 +101,20 @@
 
 # lighttpd puts its modules under libdir, so we pass libdir as a subdirectory,
 # because modules are not supposed to be in /opt/csw/lib.
-libdir_install = $(prefix)/lib/lighttpd
+libdir_install = $(exec_prefix)/lib/lighttpd
+#libdir = $(abspath $(libdir_install)/$(MM_LIBDIR))/lighttpd
+#libdir_install = $(prefix)/lib/lighttpd
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 CONFIGURE_ARGS += --with-openssl=yes
 CONFIGURE_ARGS += --with-openssl-includes=$(includedir)
 CONFIGURE_ARGS += --with-openssl-libs=$(libpath)
+
+# Hardcode until this is fixed:
+#   http://redmine.lighttpd.net/issues/2528
+CONFIGURE_ARGS += ac_cv_search_crypt=-lcrypto
+
 # EXTRA_LINKER_FLAGS += -lcrypto
 
 # Solaris 9 does not have IPV6_V6ONLY.
@@ -109,6 +142,9 @@
 CONFIGURE_ARGS += --with-memcache
 CONFIGURE_ARGS += --with-ldap
 CONFIGURE_ARGS += --with-mysql
+CONFIGURE_ARGS += --with-fam
+CONFIGURE_ARGS += --with-gdbm
+CONFIGURE_ARGS += --with-memcache
 
 # -- LUA support
 # Disable LUA for now until this is fixed:
@@ -118,6 +154,9 @@
 CONFIGURE_ENV_LUA_CFLAGS = $(CPPFLAGS)
 CONFIGURE_ENV_LUA_LIBS = -L$(libdir) -llua
 
+# Make sure 'id -u' and 'id -g' works
+CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH)
+
 INITSMF = $(sysconfdir)/init\.d/cswlighttpd
 PRESERVECONF = $(sysconfdir)/lighttpd\.conf
 USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup
@@ -150,7 +189,7 @@
 	ginstall -d -m 755 $(DESTDIR)$(localstatedir)/log/lighttpd
 	@$(MAKECOOKIE)
 
-post-merge:
+post-merge-all:
 	ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/pkg/$(NAME)
 	echo "lighttpd:lighttpd:lighttpd web server::::" \
 		> $(PKGROOT)$(sysconfdir)/pkg/$(NAME)/cswusergroup

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 Jan 30 16:02:15 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Jan 2014 15:02:15 +0000
Subject: SF.net SVN: gar:[22921] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fFPtd3CN0zh9@mail.opencsw.org>

Revision: 22921
          http://sourceforge.net/p/gar/code/22921
Author:   dmichelsen
Date:     2014-01-30 15:02:14 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: Adjust dependencies

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-30 14:57:05 UTC (rev 22920)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-30 15:02:14 UTC (rev 22921)
@@ -68,6 +68,7 @@
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-timedate
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-libwww-perl
 RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-config-inifiles
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpm-digest-md4
 # I know these are needed
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-cmdln
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-mb
@@ -79,6 +80,7 @@
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-timedate
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-libwww-perl
 CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-config-inifiles
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpm-digest-md4
 
 # The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
 
@@ -86,6 +88,7 @@
 REINPLACE_MATCH_python = \#!.*python.*
 REINPLACE_WITH_python = \#!$(bindir)/python
 REINPLACE_FILES_python += tools/null-rsync
+REINPLACE_FILES_python += mirrorprobe/mirrorprobe.py
 
 REINPLACEMENTS += perl
 REINPLACE_MATCH_perl = \#!.*perl.*
@@ -135,6 +138,7 @@
 	ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_continent $(DESTDIR)$(bindir)/geoiplookup_continent
 	ginstall -m 0755 $(WORKSRC)/tools/null-rsync $(DESTDIR)$(bindir)/null-rsync
 	ginstall -m 0755 $(WORKSRC)/tools/scanner.pl $(DESTDIR)$(bindir)/scanner
+	ginstall -m 0755 $(WORKSRC)/mirrorprobe/mirrorprobe.py $(DESTDIR)$(bindir)/mirrorprobe
 	ginstall -d $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql
 	ginstall -m 0644 $(WORKSRC)/sql/initialdata-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/initialdata-postgresql.sql
 	@# LANG SQL must in fact be LANG sql (lowercase!) or the creation faills

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 Jan 30 16:07:40 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Jan 2014 15:07:40 +0000
Subject: SF.net SVN: gar:[22922] csw/mgar/pkg/lighttpd/trunk/Makefile
Message-ID: <3fFQ0m2vCRzmD@mail.opencsw.org>

Revision: 22922
          http://sourceforge.net/p/gar/code/22922
Author:   dmichelsen
Date:     2014-01-30 15:07:38 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
lighttpd/trunk: Add override for linker issue

Modified Paths:
--------------
    csw/mgar/pkg/lighttpd/trunk/Makefile

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-30 15:02:14 UTC (rev 22921)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2014-01-30 15:07:38 UTC (rev 22922)
@@ -56,6 +56,8 @@
 # These are problems within checkpkg
 CHECKPKG_OVERRIDES_CSWlighttpd-mod-auth += 64-bit-binaries-missing
 CHECKPKG_OVERRIDES_CSWlighttpd-mod-auth += surplus-dependency|CSWlighttpd
+# Issues with linker defect and -z ignore
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-auth += surplus-dependency|CSWliblber2-4-2
 
 PACKAGES += CSWlighttpd-mod-webdav
 SPKG_DESC_CSWlighttpd-mod-webdav = Lighttpd module for WebDAV access
@@ -80,6 +82,9 @@
 # These are problems within checkpkg
 CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += 64-bit-binaries-missing
 CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += surplus-dependency|CSWlighttpd
+# Issues with linker defect and -z ignore
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWlighttpd-mod-mysql-vhost += surplus-dependency|CSWlibssl1-0-0
 
 PACKAGES += CSWlighttpd-mod-trigger
 SPKG_DESC_CSWlighttpd-mod-trigger = Lighttpd module

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From opk at users.sourceforge.net  Thu Jan 30 17:33:10 2014
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 30 Jan 2014 16:33:10 +0000
Subject: SF.net SVN: gar:[22923] csw/mgar/pkg/lang-python
Message-ID: <3fFRvW36JgzxT@mail.opencsw.org>

Revision: 22923
          http://sourceforge.net/p/gar/code/22923
Author:   opk
Date:     2014-01-30 16:33:10 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
package for sympy

Added Paths:
-----------
    csw/mgar/pkg/lang-python/sympy/
    csw/mgar/pkg/lang-python/sympy/Makefile
    csw/mgar/pkg/lang-python/sympy/branches/
    csw/mgar/pkg/lang-python/sympy/tags/
    csw/mgar/pkg/lang-python/sympy/trunk/
    csw/mgar/pkg/lang-python/sympy/trunk/Makefile
    csw/mgar/pkg/lang-python/sympy/trunk/checksums
    csw/mgar/pkg/lang-python/sympy/trunk/files/

Added: csw/mgar/pkg/lang-python/sympy/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/sympy/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/sympy/Makefile	2014-01-30 16:33:10 UTC (rev 22923)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/lang-python/sympy/trunk
===================================================================
--- csw/mgar/pkg/lang-python/sympy/trunk	2014-01-30 15:07:38 UTC (rev 22922)
+++ csw/mgar/pkg/lang-python/sympy/trunk	2014-01-30 16:33:10 UTC (rev 22923)

Property changes on: csw/mgar/pkg/lang-python/sympy/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/sympy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/sympy/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/sympy/trunk/Makefile	2014-01-30 16:33:10 UTC (rev 22923)
@@ -0,0 +1,22 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = sympy
+VERSION = 0.7.4.1
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Python library for symbolic mathematics
+define BLURB
+  SymPy is a Python library for symbolic mathematics (manipulation). It aims to
+  become a full-featured computer algebra system (CAS) while keeping the code as
+  simple as possible in order to be comprehensible and easily extensible.
+endef
+
+VENDOR_URL = http://sympy.org/
+MASTER_SITES = https://github.com/sympy/sympy/releases/download/sympy-$(VERSION)/
+DISTFILES  = $(DISTNAME).tar.gz
+
+ARCHALL = 1
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/lang-python/sympy/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/sympy/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/sympy/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/sympy/trunk/checksums	2014-01-30 16:33:10 UTC (rev 22923)
@@ -0,0 +1 @@
+2547375b3b7eee17a3f1f4f3038c383d  sympy-0.7.4.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  Fri Jan 31 10:48:04 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 31 Jan 2014 09:48:04 +0000
Subject: SF.net SVN: gar:[22924] csw/mgar/pkg/cpan/Text-Quoted/trunk
Message-ID: <3fFtsc5DDYzGw@mail.opencsw.org>

Revision: 22924
          http://sourceforge.net/p/gar/code/22924
Author:   dmichelsen
Date:     2014-01-31 09:48:02 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
cpan/Text-Quoted/trunk: Update to 2.08 and makemake

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Text-Quoted/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Quoted/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.depend
    csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.gspec

Modified: csw/mgar/pkg/cpan/Text-Quoted/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Text-Quoted/trunk/Makefile	2014-01-30 16:33:10 UTC (rev 22923)
+++ csw/mgar/pkg/cpan/Text-Quoted/trunk/Makefile	2014-01-31 09:48:02 UTC (rev 22924)
@@ -1,25 +1,24 @@
 NAME = Text-Quoted
-VERSION = 2.06
+VERSION = 2.08
 CATEGORIES = cpan
 GARTYPE = v2
-AUTHOR = RUZ
+AUTHOR = TSIBLEY
 
-DESCRIPTION = extract the structure of a quoted mail message
+DESCRIPTION = Extract the structure of a quoted mail message
 define BLURB
-  Text::Quoted examines the structure of some text which may contain multiple
-  different levels of quoting, and turns the text into a nested data
-  structure.
 endef
 
-RUNTIME_DEP_PKGS = CSWpmtxtautofmt
-BUILD_DEP_PKGS = CSWpmtxtautofmt
+CATALOG_RELEASE = unstable
 
-CATALOGNAME = pm_txtquoted
-PACKAGES    = CSWpmtxtquoted
+LICENSE_TEXT = This module is licensed under the perl license, please see for details http://dev.perl.org/licenses/
 
-ARCHALL_CSWpmtxtquoted = 1
+PACKAGES += CSWpm-text-quoted
+CATALOGNAME_CSWpm-text-quoted = pm_text_quoted
+SPKG_DESC_CSWpm-text-quoted = Extract the structure of a quoted mail message
+# There was no information if this is pure Perl or not. Please remove if necessary.
+ARCHALL_CSWpm-text-quoted = 1
+RUNTIME_DEP_PKGS_CSWpm-text-quoted += CSWpm-text-autoformat
+OBSOLETED_BY_CSWpm-text-quoted += CSWpmtxtquoted
+CATALOGNAME_CSWpmtxtquoted = pm_txtquoted_stub
 
-LICENSE = README
-
 include gar/category.mk
-

Modified: csw/mgar/pkg/cpan/Text-Quoted/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Text-Quoted/trunk/checksums	2014-01-30 16:33:10 UTC (rev 22923)
+++ csw/mgar/pkg/cpan/Text-Quoted/trunk/checksums	2014-01-31 09:48:02 UTC (rev 22924)
@@ -1 +1 @@
-6ae8d3aa3a54c5f05bcd0c2313ebfa4d  Text-Quoted-2.06.tar.gz
+2ddedd6541460a32223cf91c7e16fcb7  Text-Quoted-2.08.tar.gz

Deleted: csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.depend
===================================================================
--- csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.depend	2014-01-30 16:33:10 UTC (rev 22923)
+++ csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.depend	2014-01-31 09:48:02 UTC (rev 22924)
@@ -1,5 +0,0 @@
-P CSWpmtxtautofmt pm_txtautofmt - automatic text wrapping and reformatting
-P CSWcommon common - common files and dirs for CSW packages
-P CSWperl perl - A high-level, general-purpose programming language
-P CSWcommon common - common files and dirs for CSW packages
-P CSWperl perl - A high-level, general-purpose programming language

Deleted: csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.gspec
===================================================================
--- csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.gspec	2014-01-30 16:33:10 UTC (rev 22923)
+++ csw/mgar/pkg/cpan/Text-Quoted/trunk/files/CSWpmtxtquoted.gspec	2014-01-31 09:48:02 UTC (rev 22924)
@@ -1,14 +0,0 @@
-%var            bitname pm_txtquoted
-%var            pkgname CSWpmtxtquoted
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (C) 2002-2003 Kasei Limited                                                              
-Copyright (C) 2003-2004 Simon Cozens                                                               
-Copyright (C) 2004 Best Practical Solutions, LLC                                                   
-                                                                                                   
-This software is distributed WITHOUT ANY WARRANTY; without even the implied                        
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                                   
-                                                                                                   
-This library is free software; you can redistribute it and/or modify                               
-it under the same terms as Perl itself.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From bonivart at users.sourceforge.net  Fri Jan 31 13:33:49 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 31 Jan 2014 12:33:49 +0000
Subject: SF.net SVN: gar:[22925] csw/mgar/pkg/cpan/Text-Autoformat/trunk
Message-ID: <3fFyXk5St5zVR@mail.opencsw.org>

Revision: 22925
          http://sourceforge.net/p/gar/code/22925
Author:   bonivart
Date:     2014-01-31 12:33:48 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
cpan/Text-Autoformat/trunk: update to 1.669004, fix stub name, fix dep name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums

Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile	2014-01-31 09:48:02 UTC (rev 22924)
+++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile	2014-01-31 12:33:48 UTC (rev 22925)
@@ -1,5 +1,5 @@
 NAME = Text-Autoformat
-VERSION = 1.669003
+VERSION = 1.669004
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = DCONWAY
@@ -14,10 +14,10 @@
 CATALOGNAME = pm_text_autoformat
 SPKG_DESC_CSWpm-text-autoformat = $(DESCRIPTION)
 OBSOLETED_BY_CSWpm-text-autoformat = CSWpmtxtautofmt
-CATALOGNAME_CSWpmtxtautofmt = pm_txtautofmt
+CATALOGNAME_CSWpmtxtautofmt = pm_txtautofmt_stub
 
 ARCHALL = 1
 
-RUNTIME_DEP_PKGS += CSWpmtxtreform
+RUNTIME_DEP_PKGS += CSWpm-text-reform
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums	2014-01-31 09:48:02 UTC (rev 22924)
+++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums	2014-01-31 12:33:48 UTC (rev 22925)
@@ -1 +1 @@
-c5b637612be7461b4102c6daf9976267  Text-Autoformat-1.669003.tar.gz
+7a7881ca625fa71e551c1f43910f2865  Text-Autoformat-1.669004.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


