From dam at opencsw.org  Fri May  1 22:30:36 2015
From: dam at opencsw.org (Dagobert Michelsen)
Date: Fri, 1 May 2015 22:30:36 +0200
Subject: SF.net SVN: gar:[24916] csw/mgar/pkg/gcc5/trunk/Makefile
In-Reply-To: <CALtRa-5W4ONG5dvHwfBFMPEzyAK_-mqFN2JXko5uPBHf70svPg@mail.gmail.com>
References: <3lcshS5psbzy7@mail.opencsw.org>
	<CALtRa-5W4ONG5dvHwfBFMPEzyAK_-mqFN2JXko5uPBHf70svPg@mail.gmail.com>
Message-ID: <1EC7E52A-F6E0-4191-8547-24C0707B0291@opencsw.org>

Hi Maciej,

Am 30.04.2015 um 19:31 schrieb Maciej (Matchek) Blizi?ski:

> 
> 2015-04-30 11:02 GMT+01:00 <dmichelsen at users.sourceforge.net>:
> +# This is really part of core
> +CHECKPKG_OVERRIDES_CSWgcc5core += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgomp-plugin-host_nonshm.so.1.0.0|soname=libgomp-plugin-host_nonshm.so.1|pkgname=CSWgcc5core|expected=CSWlibgomp-plugin-host-nonshm1
> +CHECKPKG_OVERRIDES_CSWgcc5core += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libgomp-plugin-host_nonshm.so.1.0.0|soname=libgomp-plugin-host_nonshm.so.1|pkgname=CSWgcc5core|expected=CSWlibgomp-plugin-host-nonshm1
> 
> Maybe, but if they upgrade this soname, we're screwed again. What's the problem with just following the standard?

No problem, it was just that I got the impression the library would not be used.
But to be safe you are probably right to split this off before I upload the packages.


Best regards

  -- Dago
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20150501/9176c770/attachment.html>

From bdwalton at users.sourceforge.net  Sat May  2 14:28:44 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat,  2 May 2015 12:28:44 +0000
Subject: SF.net SVN: gar:[24920] csw/mgar/pkg/git/trunk
Message-ID: <3lf8rY3RCXzM3@mail.opencsw.org>

Revision: 24920
          http://sourceforge.net/p/gar/code/24920
Author:   bdwalton
Date:     2015-05-02 12:28:44 +0000 (Sat, 02 May 2015)
Log Message:
-----------
git/trunk: version bump (2.3.5 -> 2.4.0)

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-04-30 12:13:56 UTC (rev 24919)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-05-02 12:28:44 UTC (rev 24920)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 2.3.5
+VERSION = 2.4.0
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 GARTYPE = v2

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2015-04-30 12:13:56 UTC (rev 24919)
+++ csw/mgar/pkg/git/trunk/checksums	2015-05-02 12:28:44 UTC (rev 24920)
@@ -1 +1 @@
-8101cd7497ee64d1ed07d12541826a30  git-2.3.5.tar.gz
+544d3f18ccef6479149490a4c34d53ff  git-2.4.0.tar.gz

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


From bdwalton at users.sourceforge.net  Sat May  2 14:38:43 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat,  2 May 2015 12:38:43 +0000
Subject: SF.net SVN: gar:[24921] csw/mgar/pkg/git/trunk/files/
	0001-Update-path-in-documentation-to-be-CSW-proper.patch
Message-ID: <3lf93y2BBBzPR@mail.opencsw.org>

Revision: 24921
          http://sourceforge.net/p/gar/code/24921
Author:   bdwalton
Date:     2015-05-02 12:38:42 +0000 (Sat, 02 May 2015)
Log Message:
-----------
git/trunk: update a patch

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch

Modified: csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch	2015-05-02 12:28:44 UTC (rev 24920)
+++ csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch	2015-05-02 12:38:42 UTC (rev 24921)
@@ -1,6 +1,6 @@
-From 8bc0a6b60ecd0a2f1bda622adb058426e16855fe Mon Sep 17 00:00:00 2001
+From 27d53590be0ef3a170bdbe06ff904e198bf06549 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
-Date: Sun, 21 Dec 2014 10:49:23 +0000
+Date: Sat, 2 May 2015 13:34:53 +0100
 Subject: [PATCH] Update path in documentation to be CSW-proper.
 
 Change /usr/share to /opt/csw/share in the git-init documentation.
@@ -11,12 +11,12 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
-index 369f889..2709419 100644
+index 8174d27..0707d56 100644
 --- a/Documentation/git-init.txt
 +++ b/Documentation/git-init.txt
 @@ -127,7 +127,7 @@ The template directory will be one of the following (in order):
  
-  - the `init.templatedir` configuration variable; or
+  - the `init.templateDir` configuration variable; or
  
 - - the default template directory: `/usr/share/git-core/templates`.
 + - the default template directory: `/opt/csw/share/git-core/templates`.
@@ -24,5 +24,5 @@
  The default template directory includes some directory structure, suggested
  "exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see linkgit:githooks[5]).
 -- 
-2.1.3
+2.3.3
 

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


From dmichelsen at users.sourceforge.net  Sat May  2 21:46:23 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat,  2 May 2015 19:46:23 +0000
Subject: SF.net SVN: gar:[24922] csw/mgar/pkg/gcc5/trunk/Makefile
Message-ID: <3lfLYR1Sx3zTF@mail.opencsw.org>

Revision: 24922
          http://sourceforge.net/p/gar/code/24922
Author:   dmichelsen
Date:     2015-05-02 19:46:23 +0000 (Sat, 02 May 2015)
Log Message:
-----------
gcc5/trunk: Split off CSWlibgomp-plugin-host-nonshm1

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

Modified: csw/mgar/pkg/gcc5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc5/trunk/Makefile	2015-05-02 12:38:42 UTC (rev 24921)
+++ csw/mgar/pkg/gcc5/trunk/Makefile	2015-05-02 19:46:23 UTC (rev 24922)
@@ -163,10 +163,6 @@
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap
 
-# This is really part of core
-CHECKPKG_OVERRIDES_CSWgcc5core += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgomp-plugin-host_nonshm.so.1.0.0|soname=libgomp-plugin-host_nonshm.so.1|pkgname=CSWgcc5core|expected=CSWlibgomp-plugin-host-nonshm1
-CHECKPKG_OVERRIDES_CSWgcc5core += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libgomp-plugin-host_nonshm.so.1.0.0|soname=libgomp-plugin-host_nonshm.so.1|pkgname=CSWgcc5core|expected=CSWlibgomp-plugin-host-nonshm1
-
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
 MERGE_EXCLUDE_LIBTOOL =
@@ -214,7 +210,14 @@
 PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1
 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgcc5core += CSWlibgomp-plugin-host-nonshm1
 
+PACKAGES += CSWlibgomp-plugin-host-nonshm1
+PKGFILES_CSWlibgomp-plugin-host-nonshm1 += $(call pkgfiles_lib,libgomp-plugin-host_nonshm.so.1)
+SPKG_DESC_CSWlibgomp-plugin-host-nonshm1 = GNU Offloading and Multi Processing Runtime Library
+RUNTIME_DEP_PKGS_CSWlibgomp-plugin-host-nonshm1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgomp-plugin-host-nonshm1 += CSWlibgomp1
+
 PACKAGES += CSWlibobjc$(LIBOBJC)
 PKGFILES_CSWlibobjc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc\.so\.$(LIBOBJC)(\.\d+)*)
 SPKG_DESC_CSWlibobjc$(LIBOBJC) += $(DESCRIPTION), libobjc.so.$(LIBOBJC)
@@ -496,6 +499,7 @@
 CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding
 CHECKPKG_OVERRIDES_CSWlibgo$(GO_LIB_VERSION) += no-direct-binding
 CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgomp-plugin-host-nonshm1 += no-direct-binding
 CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding
 CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding
 CHECKPKG_OVERRIDES_CSWlibobjc4 += no-direct-binding

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 May  4 09:43:48 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  4 May 2015 07:43:48 +0000
Subject: SF.net SVN: gar:[24923] csw/mgar/pkg/squid/trunk
Message-ID: <3lgGQt3Fkjzll@mail.opencsw.org>

Revision: 24923
          http://sourceforge.net/p/gar/code/24923
Author:   dmichelsen
Date:     2015-05-04 07:43:48 +0000 (Mon, 04 May 2015)
Log Message:
-----------
squid/trunk: Update to 3.5.4

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

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2015-05-02 19:46:23 UTC (rev 24922)
+++ csw/mgar/pkg/squid/trunk/Makefile	2015-05-04 07:43:48 UTC (rev 24923)
@@ -2,7 +2,7 @@
 # $Id$
 #
 NAME = squid
-VERSION = 3.5.3
+VERSION = 3.5.4
 GARTYPE = v2
 
 DESCRIPTION = High performance Web proxy cache

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2015-05-02 19:46:23 UTC (rev 24922)
+++ csw/mgar/pkg/squid/trunk/checksums	2015-05-04 07:43:48 UTC (rev 24923)
@@ -1 +1 @@
-86078afe2e5da08fb815a9216f695c1e  squid-3.5.3.tar.bz2
+436d42ced1d9eb9f5d5b364047cc3dba  squid-3.5.4.tar.bz2

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


From dmichelsen at users.sourceforge.net  Mon May  4 10:13:40 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  4 May 2015 08:13:40 +0000
Subject: SF.net SVN: gar:[24924] csw/mgar/gar/v2/gar.conf.mk
Message-ID: <3lgH5P3zhSzpB@mail.opencsw.org>

Revision: 24924
          http://sourceforge.net/p/gar/code/24924
Author:   dmichelsen
Date:     2015-05-04 08:13:40 +0000 (Mon, 04 May 2015)
Log Message:
-----------
mGAR v2: Support for GCC5

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2015-05-04 07:43:48 UTC (rev 24923)
+++ csw/mgar/gar/v2/gar.conf.mk	2015-05-04 08:13:40 UTC (rev 24924)
@@ -89,12 +89,12 @@
 
 # Select compiler
 # GARCOMPILER can be either GNU/SUN which selects the default
-# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/SOS12U4/GCC3/GCC4
+# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/SOS12U4/GCC3/GCC4/GCC5
 
 GARCOMPILER ?= SUN
 
 # We have parameters for the following compilers
-GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3 SOS12U4
+GARCOMPILERS = GCC3 GCC4 GCC5 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3 SOS12U4
 
 GARCOMPILER-SUN-5.9 = SOS12
 GARCOMPILER-SUN-5.10 = SOS12
@@ -246,6 +246,7 @@
 ARCHFLAGS_SOS12U4_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
    ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR
    ARCHFLAGS_GCC4_sparcv9+fmuladd = -m64 -mcpu=ultrasparc3 -mfmaf -Wa,-xarch=v9b
+   ARCHFLAGS_GCC5_sparcv9+fmuladd = -m64 -mcpu=ultrasparc3 -mfmaf -Wa,-xarch=v9b
       MEMORYMODEL_sparcv9+fmuladd = 64
 
      ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b
@@ -256,6 +257,7 @@
    ARCHFLAGS_SOS12U4_sparcv9+vis2 = -m64 -xarch=sparcvis2
       ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR
       ARCHFLAGS_GCC4_sparcv9+vis2 = -m64 -mcpu=ultrasparc3 -mvis2 -Wa,-xarch=v9b
+      ARCHFLAGS_GCC5_sparcv9+vis2 = -m64 -mcpu=ultrasparc3 -mvis2 -Wa,-xarch=v9b
          MEMORYMODEL_sparcv9+vis2 = 64
 
       ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a
@@ -266,6 +268,7 @@
     ARCHFLAGS_SOS12U4_sparcv9+vis = -m64 -xarch=sparcvis
        ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis
        ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis -Wa,-xarch=v9a
+       ARCHFLAGS_GCC5_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis -Wa,-xarch=v9a
           MEMORYMODEL_sparcv9+vis = 64
 
           ARCHFLAGS_SOS11_sparcv9 = -xarch=v9
@@ -276,6 +279,7 @@
         ARCHFLAGS_SOS12U4_sparcv9 = -m64 -xarch=sparc
            ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9
            ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 -Wa,-xarch=v9
+           ARCHFLAGS_GCC5_sparcv9 = -m64 -mcpu=v9 -Wa,-xarch=v9
               MEMORYMODEL_sparcv9 = 64
 
   ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR
@@ -286,6 +290,7 @@
 ARCHFLAGS_SOS12U4_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
    ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR
    ARCHFLAGS_GCC4_sparcv8plus+fmuladd = -mcpu=v9 -mfmaf -Wa,-xarch=v8plusb
+   ARCHFLAGS_GCC5_sparcv8plus+fmuladd = -mcpu=v9 -mfmaf -Wa,-xarch=v8plusb
       MEMORYMODEL_sparcv8plus+fmuladd = 32
 
   ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb
@@ -296,6 +301,7 @@
 ARCHFLAGS_SOS12U4_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
    ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR
    ARCHFLAGS_GCC4_sparcv8plus+vis2 = -mcpu=v9 -mvis2 -Wa,-xarch=v8plusb
+   ARCHFLAGS_GCC5_sparcv8plus+vis2 = -mcpu=v9 -mvis2 -Wa,-xarch=v8plusb
       MEMORYMODEL_sparcv8plus+vis2 = 32
 
   ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa
@@ -306,6 +312,7 @@
 ARCHFLAGS_SOS12U4_sparcv8plus+vis = -m32 -xarch=sparcvis
    ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis
    ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v9 -mvis -Wa,-xarch=v8plusa
+   ARCHFLAGS_GCC5_sparcv8plus+vis = -mcpu=v9 -mvis -Wa,-xarch=v8plusa
       MEMORYMODEL_sparcv8plus+vis = 32
 
       ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus
@@ -316,6 +323,7 @@
     ARCHFLAGS_SOS12U4_sparcv8plus = -m32 -xarch=sparc
        ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus
        ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 -Wa,-xarch=v8plus
+       ARCHFLAGS_GCC5_sparcv8plus = -mcpu=v9 -Wa,-xarch=v8plus
           MEMORYMODEL_sparcv8plus = 32
 
           ARCHFLAGS_SOS11_sparcv8 = -xarch=v8
@@ -326,6 +334,7 @@
         ARCHFLAGS_SOS12U4_sparcv8 = -m32 -xarch=v8
            ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8
            ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8
+           ARCHFLAGS_GCC5_sparcv8 = -mcpu=v8
               MEMORYMODEL_sparcv8 = 32
 
    ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a
@@ -336,6 +345,7 @@
  ARCHFLAGS_SOS12U4_sparcv8-fsmuld = -m32 -xarch=v8a
     ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR
     ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR
+    ARCHFLAGS_GCC5_sparcv8-fsmuld = ERROR
        MEMORYMODEL_sparcv8-fsmuld = 32
 
             ARCHFLAGS_SOS11_amd64 = -xarch=amd64
@@ -346,6 +356,7 @@
           ARCHFLAGS_SOS12U4_amd64 = -m64 -xarch=sse2
              ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron
              ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron
+             ARCHFLAGS_GCC5_amd64 = -m64 -march=opteron
                 MEMORYMODEL_amd64 = 64
 
   ARCHFLAGS_SOS11_pentium_pro+mmx = -xarch=pentium_proa
@@ -356,6 +367,7 @@
 ARCHFLAGS_SOS12U4_pentium_pro+mmx = -m32 -xarch=pentium_proa
    ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2
    ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2
+   ARCHFLAGS_GCC5_pentium_pro+mmx = -m32 -march=pentium2
       MEMORYMODEL_pentium_pro+mmx = 32
 
       ARCHFLAGS_SOS11_pentium_pro = -xarch=pentium_pro -xchip=pentium_pro
@@ -366,6 +378,7 @@
     ARCHFLAGS_SOS12U4_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
        ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro
        ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro
+       ARCHFLAGS_GCC5_pentium_pro = -m32 -march=pentiumpro
           MEMORYMODEL_pentium_pro = 32
 
       ARCHFLAGS_SOS11_pentium+mmx = ERROR
@@ -376,6 +389,7 @@
     ARCHFLAGS_SOS12U4_pentium+mmx = ERROR
        ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx
        ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx
+       ARCHFLAGS_GCC5_pentium+mmx = -m32 -march=pentium-mmx
           MEMORYMODEL_pentium+mmx = 32
 
           ARCHFLAGS_SOS11_pentium = -xchip=pentium
@@ -385,7 +399,7 @@
         ARCHFLAGS_SOS12U3_pentium = -m32 -xchip=pentium
         ARCHFLAGS_SOS12U4_pentium = -m32 -xchip=pentium
            ARCHFLAGS_GCC3_pentium = -m32 -march=pentium
-           ARCHFLAGS_GCC4_pentium = -m32 -march=pentium
+           ARCHFLAGS_GCC5_pentium = -m32 -march=pentium
               MEMORYMODEL_pentium = 32
 
              ARCHFLAGS_SOS11_i486 = -xarch=386 -xchip=486
@@ -396,6 +410,7 @@
            ARCHFLAGS_SOS12U4_i486 = -m32 -xarch=386 -xchip=486
               ARCHFLAGS_GCC3_i486 = -m32 -march=i486
               ARCHFLAGS_GCC4_i486 = -m32 -march=i486
+              ARCHFLAGS_GCC5_i486 = -m32 -march=i486
                  MEMORYMODEL_i486 = 32
 
              ARCHFLAGS_SOS11_i386 = -xarch=386
@@ -406,6 +421,7 @@
            ARCHFLAGS_SOS12U4_i386 = -m32 -xarch=386
               ARCHFLAGS_GCC3_i386 = -m32 -march=i386
               ARCHFLAGS_GCC4_i386 = -m32 -march=i386
+              ARCHFLAGS_GCC5_i386 = -m32 -march=i386
                  MEMORYMODEL_i386 = 32
 
 # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler
@@ -436,6 +452,7 @@
 OPT_FLAGS_SOS12U4 ?= $(OPT_FLAGS_SOS)
    OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC)
    OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC)
+   OPT_FLAGS_GCC5 ?= $(OPT_FLAGS_GCC)
 
   OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11)
   OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12)
@@ -445,6 +462,7 @@
 OPT_FLAGS_SOS12U4_sparc ?= $(OPT_FLAGS_SOS12U4)
    OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3)
    OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4)
+   OPT_FLAGS_GCC5_sparc ?= $(OPT_FLAGS_GCC5)
    OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11)
    OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12)
  OPT_FLAGS_SOS12U1_i386 ?= $(OPT_FLAGS_SOS12U1)
@@ -453,20 +471,27 @@
  OPT_FLAGS_SOS12U4_i386 ?= $(OPT_FLAGS_SOS12U4)
     OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3)
     OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4)
+    OPT_FLAGS_GCC5_i386 ?= $(OPT_FLAGS_GCC5)
 
 # Most of these are empty because '-march' implies '-mtune'
           OPT_ISAFLAGS_GCC3_amd64 ?=
           OPT_ISAFLAGS_GCC4_amd64 ?=
+          OPT_ISAFLAGS_GCC5_amd64 ?=
 OPT_ISAFLAGS_GCC3_pentium_pro+mmx ?=
 OPT_ISAFLAGS_GCC4_pentium_pro+mmx ?=
+OPT_ISAFLAGS_GCC5_pentium_pro+mmx ?=
     OPT_ISAFLAGS_GCC3_pentium_pro ?=
     OPT_ISAFLAGS_GCC4_pentium_pro ?=
+    OPT_ISAFLAGS_GCC5_pentium_pro ?=
     OPT_ISAFLAGS_GCC3_pentium+mmx ?=
     OPT_ISAFLAGS_GCC4_pentium+mmx ?=
+    OPT_ISAFLAGS_GCC5_pentium+mmx ?=
         OPT_ISAFLAGS_GCC3_pentium ?=
         OPT_ISAFLAGS_GCC4_pentium ?=
+        OPT_ISAFLAGS_GCC5_pentium ?=
            OPT_ISAFLAGS_GCC3_i386 ?= -mtune=i686
            OPT_ISAFLAGS_GCC4_i386 ?= -mtune=i686
+           OPT_ISAFLAGS_GCC5_i386 ?= -mtune=i686
 
 
   DBG_FLAGS_SOS11_sparc ?= -g
@@ -477,6 +502,7 @@
 DBG_FLAGS_SOS12U4_sparc ?= -g
    DBG_FLAGS_GCC3_sparc ?= -g
    DBG_FLAGS_GCC4_sparc ?= -g
+   DBG_FLAGS_GCC5_sparc ?= -g
    DBG_FLAGS_SOS11_i386 ?= -g
    DBG_FLAGS_SOS12_i386 ?= -g
  DBG_FLAGS_SOS12U1_i386 ?= -g
@@ -485,6 +511,7 @@
  DBG_FLAGS_SOS12U4_i386 ?= -g
     DBG_FLAGS_GCC3_i386 ?= -g
     DBG_FLAGS_GCC4_i386 ?= -g
+    DBG_FLAGS_GCC5_i386 ?= -g
 
 # This variable contains the opt flags for the current compiler on the current architecture
 FLAVOR_FLAGS ?= $($(GARFLAVOR)_ISAFLAGS_$(GARCOMPILER)_$(ISA)) $($(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH))
@@ -567,6 +594,7 @@
 
    GCC3_CC_HOME ?= /opt/csw/gcc3
    GCC4_CC_HOME ?= /opt/csw
+   GCC5_CC_HOME ?= /opt/csw
   SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro
   SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro
 SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1
@@ -575,9 +603,11 @@
 SOS12U4_CC_HOME ?= /opt/solarisstudio12.4
 
    GCC4_VERSION ?= 4.9
+   GCC5_VERSION ?= 5.1
 
      GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc
      GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc-$(GCC4_VERSION)
+     GCC5_CC ?= $(GCC5_CC_HOME)/bin/gcc-$(GCC5_VERSION)
     SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc
     SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc
   SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc
@@ -586,6 +616,7 @@
   SOS12U4_CC ?= $(SOS12U4_CC_HOME)/bin/cc
     GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++
     GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++-$(GCC4_VERSION)
+    GCC5_CXX ?= $(GCC5_CC_HOME)/bin/g++-$(GCC5_VERSION)
    SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC
    SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC
  SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC
@@ -594,6 +625,7 @@
  SOS12U4_CXX ?= $(SOS12U4_CC_HOME)/bin/CC
     GCC3_F77 ?= $(GCC3_CC_HOME)/bin/g77
     GCC4_F77 ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION)
+    GCC5_F77 ?= $(GCC5_CC_HOME)/bin/gfortran-$(GCC5_VERSION)
    SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77
    SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77
  SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77
@@ -602,6 +634,7 @@
  SOS12U4_CXX ?= $(SOS12U4_CC_HOME)/bin/CC
      GCC3_FC ?= $(GCC3_CC_HOME)/bin/g77
      GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION)
+     GCC5_FC ?= $(GCC5_CC_HOME)/bin/gfortran-$(GCC5_VERSION)
     SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95
     SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95
   SOS12U1_FC ?= $(SOS12U1_CC_HOME)/bin/f95
@@ -611,6 +644,7 @@
 
     GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
     GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+    GCC5_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC5_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
    SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
    SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
  SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
@@ -619,6 +653,7 @@
  SOS12U4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U4_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
    GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
    GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+   GCC5_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC5_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
   SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
   SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
 SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
@@ -627,6 +662,7 @@
 SOS12U4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U4_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
     GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
     GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
+    GCC5_AS_FLAGS ?= $(EXTRA_GCC5_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
    SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
    SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
  SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
@@ -634,8 +670,9 @@
  SOS12U3_AS_FLAGS ?= $(EXTRA_SOS12U3_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
  SOS12U4_AS_FLAGS ?= $(EXTRA_SOS12U4_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
     GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-    GCC3_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath,$(abspath $(GCC3_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+    GCC3_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath,$(abspath $(GCC3_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
     GCC4_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath),$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+    GCC5_LD_FLAGS ?= $(foreach D,$(filter-out $(libpath),$(abspath $(GCC5_CC_HOME)/lib/$(MM_LIBDIR))),-L$D) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC5_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
 
    SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
    SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
@@ -645,6 +682,7 @@
  SOS12U4_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U4_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
       GCC3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
       GCC4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
+      GCC5_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC5_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
      SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
      SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
    SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
@@ -653,6 +691,7 @@
    SOS12U4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U4_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
       GCC3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
       GCC4_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
+      GCC5_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC5_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
      SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
      SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
    SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
@@ -668,6 +707,10 @@
    GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version)
    GCC4_F77_VERSION = $(shell $(GCC4_F77) -v 2>&1| ggrep version)
     GCC4_FC_VERSION = $(shell $(GCC4_FC) -v 2>&1| ggrep version)
+    GCC5_CC_VERSION = $(shell $(GCC5_CC) -v 2>&1| ggrep version)
+   GCC5_CXX_VERSION = $(shell $(GCC5_CXX) -v 2>&1| ggrep version)
+   GCC5_F77_VERSION = $(shell $(GCC5_F77) -v 2>&1| ggrep version)
+    GCC5_FC_VERSION = $(shell $(GCC5_FC) -v 2>&1| ggrep version)
 
    SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
   SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
@@ -765,6 +808,7 @@
 
 GCC3_LD_OPTIONS = $(foreach D,$(filter-out $(libpath),$(abspath $(GCC3_CC_HOME)/lib/$(MM_LIBDIR))),-R$D) $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
 GCC4_LD_OPTIONS = $(foreach D,$(filter-out $(libpath),$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR))),-R$D) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
+GCC5_LD_OPTIONS = $(foreach D,$(filter-out $(libpath),$(abspath $(GCC5_CC_HOME)/lib/$(MM_LIBDIR))),-R$D) $(EXTRA_GCC5_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
 SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)

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


From bdwalton at users.sourceforge.net  Mon May  4 10:40:30 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon,  4 May 2015 08:40:30 +0000
Subject: SF.net SVN: gar:[24925] csw/mgar/pkg/git/trunk
Message-ID: <3lgHhB2cYWzw3@mail.opencsw.org>

Revision: 24925
          http://sourceforge.net/p/gar/code/24925
Author:   bdwalton
Date:     2015-05-04 08:40:30 +0000 (Mon, 04 May 2015)
Log Message:
-----------
git/trunk: patch around a tr oddity

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-05-04 08:13:40 UTC (rev 24924)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-05-04 08:40:30 UTC (rev 24925)
@@ -98,6 +98,7 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+PATCHFILES += 0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Added: csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch	2015-05-04 08:40:30 UTC (rev 24925)
@@ -0,0 +1,31 @@
+From 7720e8a3d98ad630b53e649ac4ff0150b73f8abc Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 4 May 2015 09:37:44 +0100
+Subject: [PATCH] Adapt test to account for differing tr behaviour on Solaris
+
+The tr as found in /usr/xpg4/bin fails to strip the [ character as
+used in tr -d "[]". To correct this, prefix the [ with the escape
+sequence so it is interpreted as a character, not the start of a
+special sequence.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t5500-fetch-pack.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
+index 3a9b775..1df340c 100755
+--- a/t/t5500-fetch-pack.sh
++++ b/t/t5500-fetch-pack.sh
+@@ -547,7 +547,7 @@ check_prot_host_port_path () {
+ 		*ssh*)
+ 		pp=ssh
+ 		uah=userandhost
+-		ehost=$(echo $3 | tr -d "[]")
++		ehost=$(echo $3 | tr -d "\[]")
+ 		diagport="Diag: port=$4"
+ 		;;
+ 		*)
+-- 
+2.3.3
+

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


From dmichelsen at users.sourceforge.net  Mon May  4 10:43:18 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  4 May 2015 08:43:18 +0000
Subject: SF.net SVN: gar:[24926] csw/mgar/pkg/ansible/trunk
Message-ID: <3lgHlN2SMYzyP@mail.opencsw.org>

Revision: 24926
          http://sourceforge.net/p/gar/code/24926
Author:   dmichelsen
Date:     2015-05-04 08:43:18 +0000 (Mon, 04 May 2015)
Log Message:
-----------
ansible/trunk: Update to 1.9.1

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

Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile	2015-05-04 08:40:30 UTC (rev 24925)
+++ csw/mgar/pkg/ansible/trunk/Makefile	2015-05-04 08:43:18 UTC (rev 24926)
@@ -1,5 +1,5 @@
 NAME = ansible
-VERSION = 1.9.0.1
+VERSION = 1.9.1
 GARTYPE = v2
 CATEGORIES = python
 

Modified: csw/mgar/pkg/ansible/trunk/checksums
===================================================================
--- csw/mgar/pkg/ansible/trunk/checksums	2015-05-04 08:40:30 UTC (rev 24925)
+++ csw/mgar/pkg/ansible/trunk/checksums	2015-05-04 08:43:18 UTC (rev 24926)
@@ -1 +1 @@
-3773b0df98288c237f2329cf184ff59f  ansible-1.9.0.1.tar.gz
+3c0f0ecc8b5d60831b10045dba64bbbb  ansible-1.9.1.tar.gz

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


From cgrzemba at users.sourceforge.net  Mon May  4 16:18:34 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon,  4 May 2015 14:18:34 +0000
Subject: SF.net SVN: gar:[24927]
	csw/mgar/pkg/lang-java/jss/branches/fromfedora/
Message-ID: <3lgRD40XGsz17t@mail.opencsw.org>

Revision: 24927
          http://sourceforge.net/p/gar/code/24927
Author:   cgrzemba
Date:     2015-05-04 14:18:32 +0000 (Mon, 04 May 2015)
Log Message:
-----------
try fedora patches

Added Paths:
-----------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/

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


From bdwalton at users.sourceforge.net  Mon May  4 23:36:04 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon,  4 May 2015 21:36:04 +0000
Subject: SF.net SVN: gar:[24928] csw/mgar/pkg/git/trunk
Message-ID: <3lgcv914jfz1Hl@mail.opencsw.org>

Revision: 24928
          http://sourceforge.net/p/gar/code/24928
Author:   bdwalton
Date:     2015-05-04 21:36:04 +0000 (Mon, 04 May 2015)
Log Message:
-----------
git/trunk: update latest patch for more breakages

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-05-04 14:18:32 UTC (rev 24927)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-05-04 21:36:04 UTC (rev 24928)
@@ -98,7 +98,7 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-PATCHFILES += 0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch
+PATCHFILES += 0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Added: csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch	2015-05-04 21:36:04 UTC (rev 24928)
@@ -0,0 +1,76 @@
+From 6fe0705c4b3e59a34b1276f48e00f8e0e85ddaac Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 4 May 2015 09:37:44 +0100
+Subject: [PATCH] Modify use of sed and tr to be compatible with xpg4 tools on
+ Solaris
+
+The tr as found in /usr/xpg4/bin fails to strip the [ character as
+used in tr -d "[]". To correct this, prefix the [ with the escape
+sequence so it is interpreted as a character, not the start of a
+special sequence.
+
+A sed command with a trailing space isn't accepted by sed on solaris,
+so remove it since it's not semantically important.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t5500-fetch-pack.sh | 2 +-
+ t/t5601-clone.sh      | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
+index 3a9b775..1df340c 100755
+--- a/t/t5500-fetch-pack.sh
++++ b/t/t5500-fetch-pack.sh
+@@ -547,7 +547,7 @@ check_prot_host_port_path () {
+ 		*ssh*)
+ 		pp=ssh
+ 		uah=userandhost
+-		ehost=$(echo $3 | tr -d "[]")
++		ehost=$(echo $3 | tr -d "\[]")
+ 		diagport="Diag: port=$4"
+ 		;;
+ 		*)
+diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
+index 1befc45..41021e4 100755
+--- a/t/t5601-clone.sh
++++ b/t/t5601-clone.sh
+@@ -412,7 +412,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
+ #IPv6
+ for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
+ do
+-	ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
++	ehost=$(echo $tuah | sed -e "s/1\]:/1\]/ "| tr -d "\[]")
+ 	test_expect_success "clone ssh://$tuah/home/user/repo" "
+ 	  test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
+ 	"
+@@ -421,7 +421,7 @@ done
+ #IPv6 from home directory
+ for tuah in ::1 [::1] user@::1 user@[::1] [user@::1]
+ do
+-	euah=$(echo $tuah | tr -d "[]")
++	euah=$(echo $tuah | tr -d "\[]")
+ 	test_expect_success "clone ssh://$tuah/~repo" "
+ 	  test_clone_url ssh://$tuah/~repo $euah '~repo'
+ 	"
+@@ -430,7 +430,7 @@ done
+ #IPv6 with port number
+ for tuah in [::1] user@[::1] [user@::1]
+ do
+-	euah=$(echo $tuah | tr -d "[]")
++	euah=$(echo $tuah | tr -d "\[]")
+ 	test_expect_success "clone ssh://$tuah:22/home/user/repo" "
+ 	  test_clone_url ssh://$tuah:22/home/user/repo '-p 22' $euah /home/user/repo
+ 	"
+@@ -439,7 +439,7 @@ done
+ #IPv6 from home directory with port number
+ for tuah in [::1] user@[::1] [user@::1]
+ do
+-	euah=$(echo $tuah | tr -d "[]")
++	euah=$(echo $tuah | tr -d "\[]")
+ 	test_expect_success "clone ssh://$tuah:22/~repo" "
+ 	  test_clone_url ssh://$tuah:22/~repo '-p 22' $euah '~repo'
+ 	"
+-- 
+2.3.3
+

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


From bdwalton at users.sourceforge.net  Tue May  5 09:00:57 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue,  5 May 2015 07:00:57 +0000
Subject: SF.net SVN: gar:[24929] csw/mgar/pkg/git/trunk/files/
	0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
Message-ID: <3lgsQw61Ptz1NP@mail.opencsw.org>

Revision: 24929
          http://sourceforge.net/p/gar/code/24929
Author:   bdwalton
Date:     2015-05-05 07:00:57 +0000 (Tue, 05 May 2015)
Log Message:
-----------
git/trunk: correct the last patch - captured the wrong version of the change while testing

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch

Modified: csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch	2015-05-04 21:36:04 UTC (rev 24928)
+++ csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch	2015-05-05 07:00:57 UTC (rev 24929)
@@ -1,4 +1,4 @@
-From 6fe0705c4b3e59a34b1276f48e00f8e0e85ddaac Mon Sep 17 00:00:00 2001
+From 8bf59ec75260d585ad49dceb7bd51d632eca432a Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
 Date: Mon, 4 May 2015 09:37:44 +0100
 Subject: [PATCH] Modify use of sed and tr to be compatible with xpg4 tools on
@@ -32,7 +32,7 @@
  		;;
  		*)
 diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
-index 1befc45..41021e4 100755
+index 1befc45..97af1fb 100755
 --- a/t/t5601-clone.sh
 +++ b/t/t5601-clone.sh
 @@ -412,7 +412,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
@@ -40,7 +40,7 @@
  for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
  do
 -	ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
-+	ehost=$(echo $tuah | sed -e "s/1\]:/1\]/ "| tr -d "\[]")
++	ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "\[]")
  	test_expect_success "clone ssh://$tuah/home/user/repo" "
  	  test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
  	"

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 May  5 10:38:19 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  5 May 2015 08:38:19 +0000
Subject: SF.net SVN: gar:[24930] csw/mgar/pkg/collectd/trunk/Makefile
Message-ID: <3lgvbK69H1z1VR@mail.opencsw.org>

Revision: 24930
          http://sourceforge.net/p/gar/code/24930
Author:   dmichelsen
Date:     2015-05-05 08:38:18 +0000 (Tue, 05 May 2015)
Log Message:
-----------
collectd/trunk: Add java.so plugin

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

Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile	2015-05-05 07:00:57 UTC (rev 24929)
+++ csw/mgar/pkg/collectd/trunk/Makefile	2015-05-05 08:38:18 UTC (rev 24930)
@@ -15,12 +15,14 @@
 # Lots of others missing
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWnetsnmp-dev
+BUILD_DEP_PKGS += CSWjdk7
 
 EXTRA_CPPFLAGS = -D__EXTENSIONS__
 
 GARCOMPILER = GNU
 
 BUILD64 = 1
+# BUILD64_ONLY = 1
 ISAEXEC = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
@@ -32,6 +34,32 @@
 # Make sure net-snmp-config is found at the correct path for both 32 and 64 bit
 CONFIGURE_ARGS += --with-snmp-config=$(bindir)/net-snmp-config
 
+# Use only Java 8 and 64 bit until this is fixed:
+#   https://github.com/collectd/collectd/issues/1007
+# Also the detection uses "find" which does not follow symlinks
+
+JAVA_ARCHDIR-sparc-32 = sparc
+JAVA_ARCHDIR-sparc-64 = sparcv9
+JAVA_ARCHDIR-i386-32 = i386
+JAVA_ARCHDIR-i386-64 = amd64
+JAVA_ARCHDIR = $(JAVA_ARCHDIR-$(GARCH)-$(MEMORYMODEL))
+
+JAVA_HOME=/opt/csw/java/jdk/jdk7
+JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
+
+JAVAC = $(JAVA_HOME)/bin/javac
+JAR = $(JAVA_HOME)/bin/jar
+JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
+JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -R$(JAVA_LIBDIR)
+
+CONFIGURE_ARGS += --enable-java
+CONFIGURE_ARGS += JAVAC="$(JAVAC)"
+CONFIGURE_ARGS += JAR="$(JAR)"
+CONFIGURE_ARGS += JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)"
+CONFIGURE_ARGS += JAVA_LDFLAGS="$(JAVA_LDFLAGS)" 
+
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
 PACKAGES += CSWlibcollectdclient1
 SPKG_DESC_CSWlibcollectdclient1 = $(DESCRIPTION), libcollectdclient.so.1
 PKGFILES_CSWlibcollectdclient1 += $(call pkgfiles_lib,libcollectdclient.so.1)
@@ -73,6 +101,16 @@
 # No 64 bit ganglia yet
 CHECKPKG_OVERRIDES_CSWcollectd-plugin-gmond += 64-bit-binaries-missing
 
+PACKAGES += CSWcollectd-plugin-java
+SPKG_DESC_CSWcollectd-plugin-java = CollectD Plugin for Java
+PKGFILES_CSWcollectd-plugin-java += $(call pkgfiles_lib,collectd/java.so)
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7
+# There are some symlinks that confuse checkpkg
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/sparcv9/collectd/java.so
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/collectd/java.so
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWjre7
+
 PACKAGES += CSWcollectd-plugin-mysql
 SPKG_DESC_CSWcollectd-plugin-mysql = CollectD Plugin for MySQL
 PKGFILES_CSWcollectd-plugin-mysql += $(call pkgfiles_lib,collectd/mysql.so)

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 May  5 11:47:33 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue,  5 May 2015 09:47:33 +0000
Subject: SF.net SVN: gar:[24931] csw/mgar/pkg/lang-java/jss/branches/fromfedora
Message-ID: <3lgx8P6j7Wz1Y7@mail.opencsw.org>

Revision: 24931
          http://sourceforge.net/p/gar/code/24931
Author:   cgrzemba
Date:     2015-05-05 09:47:33 +0000 (Tue, 05 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: take source from fedora srcrpm

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0001-jss-ECC-pop.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0002-jss-eliminate-native-coverity-defects.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0003-jss-undo-BadPaddingException-deprecation.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0004-jss-fixed-build-issue-on-F17-or-newer.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0005-jss-key_pair_usage_with_op_flags.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0006-jss-loadlibrary.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0007-jss-javadocs-param.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0008-jss-ipv6.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0009-jss-ocspSettings.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0010-jss-ECC_keygen_byCurveName.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0011-jss-VerifyCertificate.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0012-jss-bad-error-string-pointer.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0013-jss-VerifyCertificateReturnCU.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0014-jss-ECC-HSM-FIPS.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0015-jss-eliminate-java-compiler-warnings.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0016-jss-eliminate-native-compiler-warnings.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0017-jss-PKCS12-FIPS.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0018-jss-PBE-PKCS5-V2-secure-P12.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0019-jss-wrapInToken.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0020-jss-HSM-manufacturerID.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0021-jss-ECC-Phase2KeyArchivalRecovery.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0022-jss-undo-JCA-deprecations.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0023-jss-SHA-OID-fix.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0024-jss-RC4-strengh-verify.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0025-jss-support-TLS1_1-TLS1_2.patch
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/jss-4.2.6.tar.gz

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-05 08:38:18 UTC (rev 24930)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-05 09:47:33 UTC (rev 24931)
@@ -4,7 +4,7 @@
 NAME = jss
 MAJOR_VERSION = 4
 FULLVERSION = 4.3.2
-VERSION = 4
+VERSION = 4.2.6
 GARTYPE = v2
 CATEGORIES = java
 
@@ -16,39 +16,99 @@
 
 NSS is the cryptographic module where all cryptographic operations are performed. JSS essentially provides a Java JNI bridge to NSS C shared libraries. When NSS is put in FIPS mode, JSS ensures FIPS compliance by ensuring that all cryptographic operations are performed by the NSS cryptographic module.
 
-https://developer.mozilla.org/En/JSS
 endef
+VENDOR_URL=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS
 
+GARFLAVOR = OPT
+BUILD64 = 1
 
-
-MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/mozilla.org/mozilla.org/security/jss/releases/JSS_4_3_2_RTM
-DISTFILES  = $(NAME)$(MAJOR_VERSION).jar
+# MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/mozilla.org/mozilla.org/security/jss/releases/JSS_4_3_2_RTM/
+# DISTFILES  = $(NAME)$(MAJOR_VERSION).jar
 DISTFILES += COPYING
+DISTFILES += $(DISTNAME).tar.gz
 
 PACKAGES = CSWjss4
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
+PATCHFILES += 0005-jss-key_pair_usage_with_op_flags.patch
+PATCHFILES += 0007-jss-javadocs-param.patch
+PATCHFILES += 0008-jss-ipv6.patch
+PATCHFILES += 0001-jss-ECC-pop.patch
+PATCHFILES += 0006-jss-loadlibrary.patch
+PATCHFILES += 0009-jss-ocspSettings.patch
+PATCHFILES += 0010-jss-ECC_keygen_byCurveName.patch
+PATCHFILES += 0011-jss-VerifyCertificate.patch
+PATCHFILES += 0012-jss-bad-error-string-pointer.patch
+PATCHFILES += 0013-jss-VerifyCertificateReturnCU.patch
+PATCHFILES += 0014-jss-ECC-HSM-FIPS.patch
+PATCHFILES += 0016-jss-eliminate-native-compiler-warnings.patch
+PATCHFILES += 0015-jss-eliminate-java-compiler-warnings.patch
+PATCHFILES += 0017-jss-PKCS12-FIPS.patch
+PATCHFILES += 0002-jss-eliminate-native-coverity-defects.patch
+PATCHFILES += 0018-jss-PBE-PKCS5-V2-secure-P12.patch
+PATCHFILES += 0019-jss-wrapInToken.patch
+PATCHFILES += 0020-jss-HSM-manufacturerID.patch
+PATCHFILES += 0021-jss-ECC-Phase2KeyArchivalRecovery.patch
+PATCHFILES += 0022-jss-undo-JCA-deprecations.patch
+PATCHFILES += 0003-jss-undo-BadPaddingException-deprecation.patch
+PATCHFILES += 0004-jss-fixed-build-issue-on-F17-or-newer.patch
+PATCHFILES += 0023-jss-SHA-OID-fix.patch
+PATCHFILES += 0024-jss-RC4-strengh-verify.patch
+PATCHFILES += 0025-jss-support-TLS1_1-TLS1_2.patch
 
-ARCHALL = 1
-
+PACKAGES = CSWjss4
 CATALOGNAME_CSWjss4 = jss4
+SPKG_DESC_CSWjss4 += $(DESCRIPTION), jss4.jar, libjss4.so
 
+PACKAGES = CSWjss4-doc
+CATALOGNAME_CSWjss4-doc = jss4_doc
+PKGFILES_CSWjss4-doc = $(PKGFILES_DOC)
+SPKG_DESC_CSWjss4-doc += $(DESCRIPTION), javadoc
+ARCHALL_CSWjss4-doc = 1
+
 WORKSRC = $(WORKDIR)
 DISTDIR = mozilla/security/jss
 LICENSE = COPYING
 
-# JAVA_HOME = /usr/j2sdk1.4.2_17
+OBJ_PATH = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_$(GARFLAVOR).OBJ
 
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = 
+CONFIGURE_ARGS_OPT += BUILD_OPT=1
+CONFIGURE_ARGS += NSPR_INCLUDE_DIR=$(shell pkg-config --cflags-only-I nspr | sed 's/-I//')
+CONFIGURE_ARGS += NSPR_LIB_DIR=$(shell pkg-config --libs-only-L nspr | sed 's/-L//')
+CONFIGURE_ARGS += NSS_INCLUDE_DIR=$(shell pkg-config --cflags-only-I nss | sed 's/-I//')
+CONFIGURE_ARGS += NSS_LIB_DIR=$(shell pkg-config --libs-only-L nss | sed 's/-L//')
+CONFIGURE_ARGS += JAVA_HOME=/usr/java
+CONFIGURE_ARGS_64 += USE_64
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(BUILD_ISAS)))
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+	
+CONFIGURE_SCRIPTS = 
+BUILD_SCRIPTS = jss
 TEST_SCRIPTS =
+
 INSTALL_SCRIPTS = custom
+JAVA_INSTALL_DIR = $(DESTDIR)$(datadir)/java/$(MM_LIBDIR)
+EXTRA_INSTALL_ENV = PATH=$(PATH):/opt/csw/gnu
 
 include gar/category.mk
 
+build-jss:
+	(cd $(WORKSRC) && \
+	gmake -C mozilla/security/coreconf $(CONFIGURE_ARGS) && \
+	gmake -C mozilla/security/jss $(CONFIGURE_ARGS) && \
+	gmake -C mozilla/security/jss javadoc $(CONFIGURE_ARGS) )
+	@$(MAKECOOKIE)
+
 install-custom: 
-	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(CATALOGNAME_CSWjss4).jar $(DESTDIR)$(datadir)/java
+	(cd $(WORKSRC) && $(EXTRA_INSTALL_ENV) gmake -C mozilla/security/jss install $(CONFIGURE_ARGS))
+	ginstall -d $(JAVA_INSTALL_DIR)
+	ginstall -d $(DESTDIR)$(libdir)
+	(cd $(WORKSRC)/mozilla/dist && \
+	ginstall $(OBJ_PATH)/lib/libjss4.so $(DESTDIR)/$(libdir) && \
+	ginstall xpclass.jar $(JAVA_INSTALL_DIR)/jss4.jar && \
+        gcp -r jssdoc $(DESTDIR)/$(datadir)) 
 	@$(MAKECOOKIE)
 
+WORKSRC := $(WORKDIR)/$(DISTNAME)
+DISTNAME := $(NAME)-$(VERSION)

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/checksums
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/checksums	2015-05-05 08:38:18 UTC (rev 24930)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/checksums	2015-05-05 09:47:33 UTC (rev 24931)
@@ -1 +0,0 @@
-cd4b98830955491929d55ad0d7140fb7  jss4.jar

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0001-jss-ECC-pop.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0001-jss-ECC-pop.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0001-jss-ECC-pop.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,29 @@
+diff -rupN jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java jss-4.2.6.cfu/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java	2004-04-25 08:02:26.000000000 -0700
++++ jss-4.2.6.cfu/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java	2009-07-27 13:38:38.197422000 -0700
+@@ -130,6 +130,16 @@ public class CertReqMsg implements ASN1V
+     ///////////////////////////////////////////////////////////////////////
+ 
+ 	public void verify() throws SignatureException,
++        InvalidKeyFormatException, NoSuchAlgorithmException,
++        org.mozilla.jss.CryptoManager.NotInitializedException,
++        TokenException, java.security.InvalidKeyException, IOException{
++
++        CryptoToken token = CryptoManager.getInstance()
++                                .getInternalCryptoToken();
++        verify(token);
++    }
++
++    public void verify(CryptoToken token) throws SignatureException,
+ 		InvalidKeyFormatException, NoSuchAlgorithmException,
+ 		org.mozilla.jss.CryptoManager.NotInitializedException,
+ 		TokenException, java.security.InvalidKeyException, IOException{
+@@ -149,8 +159,6 @@ public class CertReqMsg implements ASN1V
+ 				pubkey = (PublicKey) spi.toPublicKey();
+ 			}
+ 
+-			CryptoToken token = CryptoManager.getInstance()
+-                                .getInternalCryptoToken();
+ 			SignatureAlgorithm sigAlg =
+ 				SignatureAlgorithm.fromOID(alg.getOID());
+ 			Signature sig = token.getSignatureContext(sigAlg);

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0002-jss-eliminate-native-coverity-defects.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0002-jss-eliminate-native-coverity-defects.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0002-jss-eliminate-native-coverity-defects.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,253 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/coreconf/nsinstall/pathsub.c jss-4.2.6/mozilla/security/coreconf/nsinstall/pathsub.c
+--- jss-4.2.6.orig/mozilla/security/coreconf/nsinstall/pathsub.c	2004-04-25 08:02:18.000000000 -0700
++++ jss-4.2.6/mozilla/security/coreconf/nsinstall/pathsub.c	2011-09-17 18:37:39.875900000 -0700
+@@ -275,9 +275,11 @@ diagnosePath(const char * path)
+ 	    rv = readlink(myPath, buf, sizeof buf);
+ 	    if (rv < 0) {
+ 	    	perror("readlink");
+-		buf[0] = 0;
+-	    } else {
++	    	buf[0] = 0;
++	    } else if ( rv < BUFSIZ ) {
+ 	    	buf[rv] = 0;
++	    } else {
++	    	buf[BUFSIZ-1] = 0;
+ 	    }
+ 	    fprintf(stderr, "%s is a link to %s\n", myPath, buf);
+ 	} else if (S_ISDIR(sb.st_mode)) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.c	2011-09-17 17:33:08.823975000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c	2011-09-17 20:09:35.446977000 -0700
+@@ -728,14 +728,14 @@ getPWFromCallback(PK11SlotInfo *slot, PR
+     }
+ 
+ finish:
+-    if( (exception=(*env)->ExceptionOccurred(env)) != NULL) {
+ #ifdef DEBUG
++    if( (exception=(*env)->ExceptionOccurred(env)) != NULL) {
+         jclass giveupClass;
+         jmethodID printStackTrace;
+         jclass excepClass;
+-#endif
++
+         (*env)->ExceptionClear(env);
+-#ifdef DEBUG
++
+         giveupClass = (*env)->FindClass(env, GIVE_UP_EXCEPTION);
+         PR_ASSERT(giveupClass != NULL);
+         if( ! (*env)->IsInstanceOf(env, exception, giveupClass) ) {
+@@ -746,8 +746,12 @@ finish:
+             PR_ASSERT( PR_FALSE );
+         }
+         PR_ASSERT(returnchars==NULL);
+-#endif
+     }
++#else
++    if( ((*env)->ExceptionOccurred(env)) != NULL) {
++        (*env)->ExceptionClear(env);
++    }
++#endif
+     return returnchars;
+ }
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/PK11Finder.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/PK11Finder.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/PK11Finder.c	2011-09-17 17:33:08.834976000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/PK11Finder.c	2011-09-19 16:51:46.438021000 -0700
+@@ -768,6 +768,10 @@ static int find_leaf_cert(
+     int *linked = NULL;
+ 
+     linked = PR_Malloc( sizeof(int) * numCerts );
++    if (linked == NULL) {
++        status = 0;
++        goto finish;
++    }
+ 
+     /* initialize the bitmap */
+     for (i = 0; i < numCerts; i++) {
+@@ -1735,7 +1739,7 @@ Java_org_mozilla_jss_CryptoManager_verif
+ {
+     SECStatus         rv    = SECFailure;
+     SECCertUsage      certUsage;
+-    SECItem *derCerts[2];
++    SECItem *derCerts[2] = { NULL, NULL };
+     CERTCertificate **certArray = NULL;
+     CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
+ 
+@@ -1749,7 +1753,6 @@ Java_org_mozilla_jss_CryptoManager_verif
+     }
+     PR_ASSERT(certdb != NULL);
+ 
+-    derCerts[0] = NULL;
+     derCerts[0] = JSS_ByteArrayToSECItem(env, packageArray);
+     derCerts[1] = NULL;
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-09-17 17:33:08.708976000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c	2011-09-17 19:37:52.834292000 -0700
+@@ -235,7 +235,7 @@ static PRStatus
+ getAlgInfo(JNIEnv *env, jobject alg, JSS_AlgInfo *info)
+ {
+     jint index;
+-    PRStatus status;
++    PRStatus status = PR_FAILURE;
+ 
+     PR_ASSERT(env!=NULL && alg!=NULL && info!=NULL);
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-09-17 17:33:08.970975000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c	2011-09-17 19:47:21.850722000 -0700
+@@ -181,7 +181,7 @@ Java_org_mozilla_jss_pkcs11_PK11MessageD
+     PK11Context *context=NULL;
+     jbyte *bytes=NULL;
+     SECStatus status;
+-    unsigned int outLen;
++    unsigned int outLen = 0;
+ 
+     if( JSS_PK11_getCipherContext(env, proxyObj, &context) != PR_SUCCESS) {
+         /* exception was thrown */
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-09-17 17:33:09.013977000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c	2011-09-17 18:16:40.231161000 -0700
+@@ -273,6 +273,7 @@ Java_org_mozilla_jss_pkcs11_PK11PubKey_g
+         break;
+     case keaKey:
+         keyTypeFieldName = KEA_KEYTYPE_FIELD;
++        break;
+     default:
+         PR_ASSERT(PR_FALSE);
+         keyTypeFieldName = NULL_KEYTYPE_FIELD;
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-09-17 17:33:09.032977000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c	2011-09-17 19:48:57.776628000 -0700
+@@ -390,12 +390,6 @@ importPrivateKey
+     SECStatus status;
+     SECItem nickname;
+ 
+-    keyType = JSS_PK11_getKeyType(env, keyTypeObj);
+-    if( keyType == nullKey ) {
+-        /* exception was thrown */
+-        goto finish;
+-    }
+-
+     /*
+      * initialize so we can goto finish
+      */
+@@ -403,6 +397,12 @@ importPrivateKey
+     derPK.len = 0;
+ 
+ 
++    keyType = JSS_PK11_getKeyType(env, keyTypeObj);
++    if( keyType == nullKey ) {
++        /* exception was thrown */
++        goto finish;
++    }
++
+     PR_ASSERT(env!=NULL && this!=NULL);
+ 
+     if(keyArray == NULL) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-09-17 17:33:09.050976000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.c	2011-09-17 19:53:46.184339000 -0700
+@@ -962,12 +962,12 @@ JNIEXPORT jstring JNICALL Java_org_mozil
+ {
+     PK11SlotInfo *slot;
+     const char* c_subject=NULL;
+-    jboolean isCopy;
++    jboolean isCopy = JNI_FALSE;
+     unsigned char *b64request=NULL;
+     SECItem p, q, g;
+     PQGParams *dsaParams=NULL;
+     const char* c_keyType;
+-    jboolean k_isCopy;
++    jboolean k_isCopy = JNI_FALSE;
+     SECOidTag signType = SEC_OID_UNKNOWN;
+     PK11RSAGenParams rsaParams;
+     void *params = NULL;
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-09-17 17:33:09.073977000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2011-09-17 19:56:20.428184000 -0700
+@@ -516,11 +516,6 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+         goto finish;
+     }
+ 
+-    if( addrBAelems == NULL ) {
+-        ASSERT_OUTOFMEM(env);
+-        goto finish;
+-    }
+-
+     if(addrBALen != 4 && addrBALen != 16) {
+         JSSL_throwSSLSocketException(env, "Invalid address in connect!");
+         goto finish;
+@@ -720,7 +715,7 @@ Java_org_mozilla_jss_ssl_SSLSocket_getCi
+ {
+     JSSL_SocketData *sock=NULL;
+     SECStatus status;
+-    PRBool enabled;
++    PRBool enabled = PR_FAILURE;
+ 
+     /* get the fd */
+     if( JSSL_getSockData(env, sockObj, &sock) != PR_SUCCESS) {
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c	2004-09-03 11:32:03.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c	2011-09-17 18:15:07.825252000 -0700
+@@ -684,17 +684,13 @@ JSSL_ConfirmExpiredPeerCert(void *arg, P
+         * Now check the name field in the cert against the desired hostname.
+         * NB: This is our only defense against Man-In-The-Middle (MITM) attacks!
+         */
+-        if( peerCert == NULL ) {
+-            rv = SECFailure;
++        char* hostname = NULL;
++        hostname = SSL_RevealURL(fd); /* really is a hostname, not a URL */
++        if (hostname && hostname[0]) {
++            rv = CERT_VerifyCertName(peerCert, hostname);
++            PORT_Free(hostname);
+         } else {
+-            char* hostname = NULL;
+-            hostname = SSL_RevealURL(fd); /* really is a hostname, not a URL */
+-            if (hostname && hostname[0]) {
+-                rv = CERT_VerifyCertName(peerCert, hostname);
+-                PORT_Free(hostname);
+-            } else {
+-                rv = SECFailure;
+-            }
++            rv = SECFailure;
+         }
+     }
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2011-09-17 17:33:09.094977000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2011-09-17 19:16:38.546566000 -0700
+@@ -95,6 +95,10 @@ writebuf(JNIEnv *env, PRFileDesc *fd, jo
+     jint arrayLen=-1;
+     PRInt32 retval;
+ 
++    if( env == NULL ) {
++        goto finish;
++    }
++
+     /*
+      * get the OutputStream
+      */
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c	2002-07-03 17:25:46.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/NativeErrcodes.c	2011-09-18 23:02:28.130883000 -0700
+@@ -427,6 +427,7 @@ JSS_ConvertNativeErrcodeToJava(PRErrorCo
+ #endif
+ 
+     key.native = nativeErrcode;
++    key.java = -1;
+     target = bsearch( &key, errcodeTable, numErrcodes, sizeof(Errcode),
+         errcodeCompare );
+ 
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/jssutil.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/jssutil.c
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/util/jssutil.c	2011-09-17 17:33:09.103977000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/jssutil.c	2011-09-19 16:38:19.428634000 -0700
+@@ -529,7 +529,7 @@ JSS_wipeCharArray(char* array)
+  */
+ static char* getPWFromConsole()
+ {
+-    char c;
++    int c;
+     char *ret;
+     int i;
+     char buf[200];  /* no buffer overflow: we bail after 200 chars */

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0003-jss-undo-BadPaddingException-deprecation.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0003-jss-undo-BadPaddingException-deprecation.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0003-jss-undo-BadPaddingException-deprecation.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,13 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java	2004-04-25 08:02:21.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java	2012-03-30 16:17:30.748371000 -0700
+@@ -35,9 +35,6 @@
+  * ***** END LICENSE BLOCK ***** */
+ package org.mozilla.jss.crypto;
+ 
+-/**
+- * @deprecated Use javax.crypto.BadPaddingException.
+- */
+ public class BadPaddingException extends Exception {
+     public BadPaddingException() {
+         super();

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0004-jss-fixed-build-issue-on-F17-or-newer.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0004-jss-fixed-build-issue-on-F17-or-newer.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0004-jss-fixed-build-issue-on-F17-or-newer.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,23 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/coreconf/config.mk jss-4.2.6/mozilla/security/coreconf/config.mk
+--- jss-4.2.6.orig/mozilla/security/coreconf/config.mk	2007-05-03 23:54:05.000000000 -0700
++++ jss-4.2.6/mozilla/security/coreconf/config.mk	2013-07-22 18:42:19.000000000 -0700
+@@ -68,8 +68,19 @@ TARGET_OSES = FreeBSD BSD_OS NetBSD Open
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+ else
++ifeq ($(OS_TARGET), Linux)
++OS_RELEASE_VER_MAJOR := $(shell echo $(OS_RELEASE) | cut -f1 -d.)
++OS_RELEASE_VER_MINOR := $(shell echo $(OS_RELEASE) | cut -f2 -d.)
++OS_RELEASE_GT_2_6 := $(shell [ $(OS_RELEASE_VER_MAJOR) -ge 2 -o \( $(OS_RELEASE_VER_MAJOR) -eq 2 -a $(OS_RELEASE_VER_MINOR) -ge 6 \) ] && echo true)
++ifeq ($(OS_RELEASE_GT_2_6),true)
++include $(CORE_DEPTH)/coreconf/Linux2.6.mk
++else
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
+ endif
++else
++include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
++endif
++endif
+ 
+ #######################################################################
+ # [4.0] Master "Core Components" source and release <platform> tags   #

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0005-jss-key_pair_usage_with_op_flags.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0005-jss-key_pair_usage_with_op_flags.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0005-jss-key_pair_usage_with_op_flags.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,544 @@
+diff -rupN jss-4.2.5/mozilla/security/jss/lib/jss.def jss-4.2.6/mozilla/security/jss/lib/jss.def
+--- jss-4.2.5/mozilla/security/jss/lib/jss.def	2007-05-08 18:40:14.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/lib/jss.def	2009-05-30 01:57:48.000000000 -0700
+@@ -316,3 +316,12 @@ Java_org_mozilla_jss_ssl_SSLSocket_isFip
+ ;+    local:
+ ;+       *;
+ ;+};
++;+JSS_4.2.6 {     # JSS 4.2.6 release
++;+    global:
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateECKeyPairWithOpFlags;
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPairWithOpFlags;
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
++;+    local:
++;+       *;
++;+};
++
+diff -rupN jss-4.2.5/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java
+--- jss-4.2.5/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java	2005-11-14 14:15:06.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java	2009-05-22 07:40:14.000000000 -0700
+@@ -81,7 +81,6 @@ public class KeyPairGenerator {
+ 	genKeyPair() throws TokenException {
+ 		return engine.generateKeyPair();
+ 	}
+-
+     /**
+      * @return The type of key that this generator generates.
+      */
+@@ -192,6 +191,15 @@ public class KeyPairGenerator {
+         engine.extractablePairs(extractable);
+     }
+ 
++    public void setKeyPairUsages(KeyPairGeneratorSpi.Usage[] usages, 
++                                 KeyPairGeneratorSpi.Usage[] usages_mask) {
++        engine.setKeyPairUsages(usages,usages_mask);
++    }
++   
++
++
++
++
+ 	protected KeyPairAlgorithm algorithm;
+ 	protected KeyPairGeneratorSpi engine;
+ }
+diff -rupN jss-4.2.5/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java
+--- jss-4.2.5/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java	2005-11-14 14:15:06.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java	2009-05-30 03:24:31.000000000 -0700
+@@ -60,4 +60,38 @@ public abstract class KeyPairGeneratorSp
+     public abstract void extractablePairs(boolean extractable);
+ 
+     public abstract boolean keygenOnInternalToken();
++
++    /**
++     * In PKCS #11, each keypair can be marked with the operations it will
++     * be used to perform. Some tokens require that a key be marked for
++     * an operation before the key can be used to perform that operation;
++     * other tokens don't care. NSS provides a way to specify a set of
++     * flags and a corresponding mask for these flags.  If a specific usage
++     * is desired set the value for that usage. If it is not set, let NSS
++     * behave in it's default fashion.  If a behavior is desired, also set
++     * that behavior in the mask as well as the flags.
++     * 
++     */
++    public final static class Usage {
++        private Usage() { }
++        private Usage(int val) { this.val = val;}
++        private int val;
++
++        public int getVal() { return val; }
++
++        // these enums must match the 
++        // and the opFlagForUsage list in PK11KeyPairGenerator.java
++        public static final Usage ENCRYPT = new Usage(0);
++        public static final Usage DECRYPT = new Usage(1);
++        public static final Usage SIGN = new Usage(2);
++        public static final Usage SIGN_RECOVER = new Usage(3);
++        public static final Usage VERIFY = new Usage(4);
++        public static final Usage VERIFY_RECOVER = new Usage(5);
++        public static final Usage WRAP = new Usage(6);
++        public static final Usage UNWRAP = new Usage(7);
++        public static final Usage DERIVE = new Usage(8);
++    }
++
++    public abstract void setKeyPairUsages(KeyPairGeneratorSpi.Usage[] usages, 
++                                          KeyPairGeneratorSpi.Usage[] usages_mask);
+ }
+diff -rupN jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
+--- jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2006-02-22 17:21:42.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c	2009-06-02 10:36:46.819581000 -0700
+@@ -120,13 +120,11 @@ finish:
+ 
+ int PK11_NumberObjectsFor(PK11SlotInfo*, CK_ATTRIBUTE*, int);
+ 
+-/*
+- * make a common key gen function for both this file and PK11Token.c
+- */
+ SECStatus
+-JSS_PK11_generateKeyPair(JNIEnv *env, CK_MECHANISM_TYPE mechanism, 
++JSS_PK11_generateKeyPairWithOpFlags(JNIEnv *env, CK_MECHANISM_TYPE mechanism, 
+     PK11SlotInfo *slot, SECKEYPublicKey **pubk, SECKEYPrivateKey **privk,
+-    void *params, PRBool temporary, jint sensitive, jint extractable)
++    void *params, PRBool temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask)
+ {
+     PK11AttrFlags attrFlags = 0;
+     *privk=NULL;
+@@ -173,12 +171,16 @@ JSS_PK11_generateKeyPair(JNIEnv *env, CK
+     } else {
+         attrFlags |= (PK11_ATTR_INSENSITIVE | PK11_ATTR_PUBLIC);
+     }
+-    *privk = PK11_GenerateKeyPairWithFlags(slot,
++
++    *privk = PK11_GenerateKeyPairWithOpFlags(slot,
+                                           mechanism,
+                                           params, 
+                                           pubk,
+                                           attrFlags,
++                                          (CK_FLAGS) op_flags,
++                                          (CK_FLAGS) op_flags_mask/* the ones we don't want*/,
+                                           NULL /* default PW callback */ );
++
+     if( *privk == NULL ) {
+         int errLength;
+         char *errBuf;
+@@ -217,13 +219,28 @@ finish:
+     return SECFailure;
+ }
+ 
++/*
++ * make a common key gen function for both this file and PK11Token.c
++ */
++SECStatus
++JSS_PK11_generateKeyPair(JNIEnv *env, CK_MECHANISM_TYPE mechanism,
++    PK11SlotInfo *slot, SECKEYPublicKey **pubk, SECKEYPrivateKey **privk,
++    void *params, PRBool temporary, jint sensitive, jint extractable)
++{
++
++    return JSS_PK11_generateKeyPairWithOpFlags(env, mechanism, slot, pubk, privk, params, temporary, sensitive, extractable, 0, 0);
++}
++
++
+ /**********************************************************************
+- * Local generic helper
++ * Local generic helpers
+  */
++
+ static jobject 
+-PK11KeyPairGenerator(JNIEnv *env, jobject this, jobject token, 
++PK11KeyPairGeneratorWithOpFlags(JNIEnv *env, jobject this, jobject token, 
+     CK_MECHANISM_TYPE mechanism, void *params, 
+-    jboolean temporary, jint sensitive, jint extractable)
++    jboolean temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask)
+ {
+     PK11SlotInfo* slot;
+     SECKEYPrivateKey *privk=NULL;
+@@ -242,8 +259,8 @@ PK11KeyPairGenerator(JNIEnv *env, jobjec
+     }
+     PR_ASSERT(slot != NULL);
+ 
+-    rv = JSS_PK11_generateKeyPair(env, mechanism, slot, &pubk, &privk,
+-    	params, temporary, sensitive, extractable);
++    rv = JSS_PK11_generateKeyPairWithOpFlags(env, mechanism, slot, &pubk, &privk,
++    	params, temporary, sensitive, extractable, op_flags, op_flags_mask);
+     if (rv != SECSuccess) {
+         goto finish;
+     }
+@@ -267,6 +284,16 @@ finish:
+     return keyPair;
+ }
+ 
++static jobject
++PK11KeyPairGenerator(JNIEnv *env, jobject this, jobject token,
++    CK_MECHANISM_TYPE mechanism, void *params,
++    jboolean temporary, jint sensitive, jint extractable)
++{
++    return PK11KeyPairGeneratorWithOpFlags(env, this, token, mechanism, params, temporary, sensitive, extractable, 0, 0);
++}
++
++
++
+ /**********************************************************************
+  * PK11KeyPairGenerator.generateRSAKeyPair
+  */
+@@ -289,6 +316,30 @@ Java_org_mozilla_jss_pkcs11_PK11KeyPairG
+      &params, temporary, sensitive, extractable);
+ }
+ 
++/**********************************************************************
++ * PK11KeyPairGenerator.generateRSAKeyPairWithOpFlags
++ */
++JNIEXPORT jobject JNICALL
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPairWithOpFlags
++  (JNIEnv *env, jobject this, jobject token, jint keySize, jlong publicExponent,
++    jboolean temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask)
++{
++    PK11RSAGenParams params;
++
++    PR_ASSERT(env!=NULL && this!=NULL && token!=NULL);
++
++    /**************************************************
++     * setup parameters
++     *************************************************/
++    params.keySizeInBits = keySize;
++    params.pe = publicExponent;
++
++    return PK11KeyPairGeneratorWithOpFlags(env, this, token, CKM_RSA_PKCS_KEY_PAIR_GEN,
++     &params, temporary, sensitive, extractable, op_flags, op_flags_mask);
++}
++
++
+ #define ZERO_SECITEM(item) {(item).len=0; (item).data=NULL;}
+ 
+ /**********************************************************************
+@@ -339,6 +390,57 @@ finish:
+     return keyPair;
+ }
+ 
++/**********************************************************************
++ *
++ * PK11KeyPairGenerator.generateDSAKeyPair
++ *
++ */
++JNIEXPORT jobject JNICALL
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags
++  (JNIEnv *env, jobject this, jobject token, jbyteArray P, jbyteArray Q,
++    jbyteArray G, jboolean temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask)
++{
++    SECItem p, q, g;
++    PQGParams *params=NULL;
++    jobject keyPair=NULL;
++
++    PR_ASSERT(env!=NULL && this!=NULL && token!=NULL && P!=NULL && Q!=NULL
++                && G!=NULL);
++
++    /* zero these so we can free them indiscriminately later */
++    ZERO_SECITEM(p);
++    ZERO_SECITEM(q);
++    ZERO_SECITEM(g);
++
++    /**************************************************
++     * Setup the parameters
++     *************************************************/
++    if( JSS_ByteArrayToOctetString(env, P, &p) ||
++        JSS_ByteArrayToOctetString(env, Q, &q) ||
++        JSS_ByteArrayToOctetString(env, G, &g) )
++    {
++        PR_ASSERT( (*env)->ExceptionOccurred(env) != NULL);
++        goto finish;
++    }
++    params = PK11_PQG_NewParams(&p, &q, &g);
++    if(params == NULL) {
++        JSS_throw(env, OUT_OF_MEMORY_ERROR);
++        goto finish;
++    }
++    keyPair = PK11KeyPairGeneratorWithOpFlags(env, this, token, CKM_DSA_KEY_PAIR_GEN,
++                        params, temporary, sensitive, extractable,
++                        op_flags, op_flags_mask);
++
++finish:
++    SECITEM_FreeItem(&p, PR_FALSE);
++    SECITEM_FreeItem(&q, PR_FALSE);
++    SECITEM_FreeItem(&g, PR_FALSE);
++    PK11_PQG_DestroyParams(params);
++    return keyPair;
++}
++
++
+ void
+ DumpItem(SECItem *item)
+ {
+@@ -361,6 +463,7 @@ Java_org_mozilla_jss_pkcs11_PK11KeyPairG
+   (JNIEnv *env, jobject this, jobject token, jbyteArray Curve, 
+     jboolean temporary, jint sensitive, jint extractable)
+ {
++
+     SECItem curve;
+     jobject keyPair=NULL;
+ 
+@@ -385,3 +488,39 @@ finish:
+     SECITEM_FreeItem(&curve, PR_FALSE);
+     return keyPair;
+ }
++
++/**********************************************************************
++ *
++ * PK11KeyPairGenerator.generateECKeyPairWithOpFlags
++ *
++ */
++JNIEXPORT jobject JNICALL
++Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateECKeyPairWithOpFlags
++  (JNIEnv *env, jobject this, jobject token, jbyteArray Curve, 
++    jboolean temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask)
++{
++    SECItem curve;
++    jobject keyPair=NULL;
++
++    PR_ASSERT(env!=NULL && this!=NULL && token!=NULL && Curve!=NULL );
++
++    /* zero these so we can free them indiscriminately later */
++    ZERO_SECITEM(curve);
++
++    /**************************************************
++     * Setup the parameters
++     *************************************************/
++    if( JSS_ByteArrayToOctetString(env, Curve, &curve))
++    {
++        PR_ASSERT( (*env)->ExceptionOccurred(env) != NULL);
++        goto finish;
++    }
++    keyPair = PK11KeyPairGeneratorWithOpFlags(env, this, token, CKM_EC_KEY_PAIR_GEN,
++     			&curve, temporary, sensitive, extractable,
++                op_flags, op_flags_mask);
++
++finish:
++    SECITEM_FreeItem(&curve, PR_FALSE);
++    return keyPair;
++}
+diff -rupN jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java
+--- jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java	2006-02-22 17:21:42.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java	2009-05-30 05:30:25.000000000 -0700
+@@ -55,6 +55,39 @@ public final class PK11KeyPairGenerator
+     extends org.mozilla.jss.crypto.KeyPairGeneratorSpi
+ {
+ 
++    // opFlag constants: each of these flags specifies a crypto operation
++    // the key will support.  Their values must match the same-named C
++    // preprocessor macros defined in the PKCS #11 header pkcs11t.h.
++    private static final int CKF_ENCRYPT = 0x00000100;
++    private static final int CKF_DECRYPT = 0x00000200;
++    private static final int CKF_SIGN = 0x00000800;
++    private static final int CKF_SIGN_RECOVER = 0x00001000;
++    private static final int CKF_VERIFY = 0x00002000;
++    private static final int CKF_VERIFY_RECOVER = 0x00004000;
++    private static final int CKF_WRAP = 0x00020000;
++    private static final int CKF_UNWRAP = 0x00040000;
++    private static final int CKF_DERIVE = 0x00080000;
++
++    // A table for mapping SymmetricKey.Usage to opFlag.  This must be
++    // synchronized with SymmetricKey.Usage.
++    private static final int opFlagForUsage[] = {
++        CKF_ENCRYPT,        /* 0 */
++        CKF_DECRYPT,        /* 1 */
++        CKF_SIGN,           /* 2 */
++        CKF_SIGN_RECOVER,   /* 3 */
++        CKF_VERIFY,         /* 4 */
++        CKF_VERIFY_RECOVER, /* 5 */
++        CKF_WRAP,           /* 6 */
++        CKF_UNWRAP,         /* 7 */
++        CKF_DERIVE          /* 8 */
++    };
++
++    // The crypto operations the key will support.  It is the logical OR
++    // of the opFlag constants, each specifying a supported operation.
++    private int opFlags = 0;
++    private int opFlagsMask = 0;
++
++
+     ///////////////////////////////////////////////////////////////////////
+     ///////////////////////////////////////////////////////////////////////
+     // Constructors
+@@ -189,41 +222,45 @@ public final class PK11KeyPairGenerator
+      * Generates a key pair on a token. Uses parameters if they were passed
+      * in through a call to <code>initialize</code>, otherwise uses defaults.
+      */
++
+     public KeyPair generateKeyPair()
+         throws TokenException
+     {
+         if(algorithm == KeyPairAlgorithm.RSA) {
+             if(params != null) {
+                 RSAParameterSpec rsaparams = (RSAParameterSpec)params;
+-                return generateRSAKeyPair(
++                return generateRSAKeyPairWithOpFlags(
+                                     token,
+                                     rsaparams.getKeySize(),
+                                     rsaparams.getPublicExponent().longValue(),
+                                     temporaryPairMode,
+                                     sensitivePairMode,
+-                                    extractablePairMode);
++                                    extractablePairMode,
++                                    opFlags, opFlagsMask);
+             } else {
+-                return generateRSAKeyPair(
++                return generateRSAKeyPairWithOpFlags(
+                                     token,
+                                     DEFAULT_RSA_KEY_SIZE,
+                                     DEFAULT_RSA_PUBLIC_EXPONENT.longValue(),
+                                     temporaryPairMode,
+                                     sensitivePairMode,
+-                                    extractablePairMode);
++                                    extractablePairMode,
++                                    opFlags, opFlagsMask);
+             }
+         } else if(algorithm == KeyPairAlgorithm.DSA ) {
+             if(params==null) {
+                 params = PQG1024;
+             }
+             DSAParameterSpec dsaParams = (DSAParameterSpec)params;
+-            return generateDSAKeyPair(
++            return generateDSAKeyPairWithOpFlags(
+                 token,
+                 PQGParams.BigIntegerToUnsignedByteArray(dsaParams.getP()),
+                 PQGParams.BigIntegerToUnsignedByteArray(dsaParams.getQ()),
+                 PQGParams.BigIntegerToUnsignedByteArray(dsaParams.getG()),
+                 temporaryPairMode,
+                 sensitivePairMode,
+-                extractablePairMode);
++                extractablePairMode,
++                opFlags, opFlagsMask);
+         } else {
+             Assert._assert( algorithm == KeyPairAlgorithm.EC );
+             // requires JAVA 1.5 for ECParameters.
+@@ -233,12 +270,14 @@ public final class PK11KeyPairGenerator
+ 	    // ecParams.init(params);
+             PK11ParameterSpec ecParams = (PK11ParameterSpec) params;
+ 
+-            return generateECKeyPair(
++            return generateECKeyPairWithOpFlags(
+                 token,
+ 		ecParams.getEncoded(), /* curve */
+                 temporaryPairMode,
+                 sensitivePairMode,
+-                extractablePairMode);
++                extractablePairMode,
++                opFlags,
++                opFlagsMask);
+         } 
+     }
+ 
+@@ -266,6 +305,17 @@ public final class PK11KeyPairGenerator
+         throws TokenException;
+ 
+     /**
++     * Generates an RSA key pair with the given size and public exponent.
++     * Adds the ability to specify a set of flags and masks
++     * to control how NSS generates the key pair.
++     */
++    private native KeyPair
++    generateRSAKeyPairWithOpFlags(PK11Token token, int keySize, long publicExponent,
++            boolean temporary, int sensitive, int extractable,
++            int op_flags, int op_flags_mask)
++        throws TokenException;
++
++    /**
+      * Generates a DSA key pair with the given P, Q, and G values.
+      * P, Q, and G are stored as big-endian twos-complement octet strings.
+      */
+@@ -275,6 +325,19 @@ public final class PK11KeyPairGenerator
+         throws TokenException;
+ 
+     /**
++     * Generates a DSA key pair with the given P, Q, and G values.
++     * P, Q, and G are stored as big-endian twos-complement octet strings.
++     * Adds the ability to specify a set of flags and masks
++     * to control how NSS generates the key pair.
++     */
++    private native KeyPair
++    generateDSAKeyPairWithOpFlags(PK11Token token, byte[] P, byte[] Q, byte[] G,
++            boolean temporary, int sensitive, int extractable,
++            int op_flags, int op_flags_mask)
++        throws TokenException;
++
++
++    /**
+      * Generates a EC key pair with the given a curve.
+      * Curves are stored as DER Encoded Parameters.
+      */
+@@ -282,6 +345,18 @@ public final class PK11KeyPairGenerator
+     generateECKeyPair(PK11Token token, byte[] Curve, 
+             boolean temporary, int sensitive, int extractable)
+         throws TokenException;
++    /**
++     * Generates a EC key pair with the given a curve.
++     * Curves are stored as DER Encoded Parameters.
++     * Adds the ability to specify a set of flags and masks
++     * to control how NSS generates the key pair.
++     */
++
++    private native KeyPair
++    generateECKeyPairWithOpFlags(PK11Token token, byte[] Curve, 
++            boolean temporary, int sensitive, int extractable,
++            int op_flags, int op_flags_mask)
++        throws TokenException;
+ 
+     ///////////////////////////////////////////////////////////////////////
+     ///////////////////////////////////////////////////////////////////////
+@@ -397,6 +472,38 @@ public final class PK11KeyPairGenerator
+         extractablePairMode = extractable ? 1 : 0;
+     }
+ 
++    /**
++     * Sets the requested key usages desired for the 
++     * generated key pair. 
++     * This allows the caller to suggest how NSS generates the key pair.
++     * @param usages List of desired key usages. 
++     * @param usages_mask Corresponding mask for the key usages.
++     * if a usages is desired, make sure it is in the mask as well.
++     */
++
++    public void setKeyPairUsages(org.mozilla.jss.crypto.KeyPairGeneratorSpi.Usage[] usages, 
++                                 org.mozilla.jss.crypto.KeyPairGeneratorSpi.Usage[] usages_mask) {
++
++        this.opFlags = 0;
++        this.opFlagsMask = 0;
++
++        if(usages != null) {
++            for( int i = 0; i < usages.length; i++ ) {
++                if( usages[i] != null ) {
++                    this.opFlags |= opFlagForUsage[usages[i].getVal()];
++                }
++            }
++        }
++
++        if(usages_mask != null) {
++            for( int i = 0; i < usages_mask.length; i++ ) {
++                if( usages_mask[i] != null ) {
++                    this.opFlagsMask |= opFlagForUsage[usages_mask[i].getVal()];
++                }
++            }
++        }
++    }
++
+     //
+     // requires JAVA 1.5
+     //
+diff -rupN jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h
+--- jss-4.2.5/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h	2006-02-22 17:21:42.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h	2009-05-29 08:34:24.000000000 -0700
+@@ -157,6 +157,12 @@ JSS_PK11_generateKeyPair(JNIEnv *env, CK
+     PK11SlotInfo *slot, SECKEYPublicKey **pubk, SECKEYPrivateKey **privK,
+     void *params, PRBool temporary, jint senstive, jint extractable);
+ 
++SECStatus
++JSS_PK11_generateKeyPair_withOpFlags(JNIEnv *env, CK_MECHANISM_TYPE mechanism,
++    PK11SlotInfo *slot, SECKEYPublicKey **pubk, SECKEYPrivateKey **privk,
++    void *params, PRBool temporary, jint sensitive, jint extractable,
++    jint op_flags, jint op_flags_mask);
++
+ /*=====================================================================
+                        C E R T I F I C A T E S
+ =====================================================================*/

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0006-jss-loadlibrary.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0006-jss-loadlibrary.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0006-jss-loadlibrary.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,29 @@
+diff -uN --recursive jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
+--- jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2008-01-31 17:29:16.000000000 -0500
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2010-01-07 10:47:04.000000000 -0500
+@@ -1334,11 +1334,20 @@
+      */
+     synchronized static void loadNativeLibraries()
+     {
+-        if( ! mNativeLibrariesLoaded )
+-        {
+-            System.loadLibrary("jss4");
+-            Debug.trace(Debug.VERBOSE, "jss library loaded");
+-            mNativeLibrariesLoaded = true;
++        if( ! mNativeLibrariesLoaded ) {
++            try {
++                System.load( "/usr/lib64/jss/libjss4.so" );
++                Debug.trace(Debug.VERBOSE, "jss library loaded");
++                mNativeLibrariesLoaded = true;
++            } catch( UnsatisfiedLinkError e ) {
++                try {
++                    System.load( "/usr/lib/jss/libjss4.so" );
++                    Debug.trace(Debug.VERBOSE, "jss library loaded");
++                    mNativeLibrariesLoaded = true;
++                } catch( UnsatisfiedLinkError f ) {
++                    Debug.trace(Debug.VERBOSE, "jss library load failed");
++                }
++            }
+         }
+     }
+     static private boolean mNativeLibrariesLoaded = false;

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0007-jss-javadocs-param.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0007-jss-javadocs-param.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0007-jss-javadocs-param.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,13 @@
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java.orig	2008-01-18 16:39:46.000000000 -0500
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java	2009-06-05 11:08:54.000000000 -0400
+@@ -116,7 +116,9 @@
+     }
+     /**
+      * 
+-     * @param  
++     * @param key
++     * @param kg
++     * @return
+      */
+     public javax.crypto.SecretKey genSecretKey(String keyType, String provider){
+         javax.crypto.SecretKey key = null;

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0008-jss-ipv6.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0008-jss-ipv6.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0008-jss-ipv6.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,623 @@
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/lib/jss.def jss-4.2.6/mozilla/security/jss/lib/jss.def
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/lib/jss.def	2009-06-24 17:08:59.784371000 -0700
++++ jss-4.2.6/mozilla/security/jss/lib/jss.def	2009-06-19 17:56:00.000000000 -0700
+@@ -175,6 +175,7 @@ Java_org_mozilla_jss_ssl_SSLServerSocket
+ Java_org_mozilla_jss_ssl_SSLSocket_forceHandshake;
+ Java_org_mozilla_jss_ssl_SSLSocket_getKeepAlive;
+ Java_org_mozilla_jss_ssl_SSLSocket_getLocalAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SSLSocket_getPort;
+ Java_org_mozilla_jss_ssl_SSLSocket_getReceiveBufferSize;
+ Java_org_mozilla_jss_ssl_SSLSocket_getSendBufferSize;
+@@ -199,6 +200,7 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+ Java_org_mozilla_jss_ssl_SSLSocket_socketWrite;
+ Java_org_mozilla_jss_ssl_SocketBase_getLocalPortNative;
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative;
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setClientCertNicknameNative;
+ Java_org_mozilla_jss_ssl_SocketBase_requestClientAuthNoExpiryCheckNative;
+ Java_org_mozilla_jss_ssl_SocketBase_setSSLOption;
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	2007-03-20 15:39:28.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java	2009-06-24 13:46:49.000000000 -0700
+@@ -36,7 +36,8 @@
+ 
+ package org.mozilla.jss.ssl;
+ 
+-import java.net.InetAddress;
++import java.util.*;
++import java.net.*;
+ import java.io.IOException;
+ import java.net.Socket;
+ import java.net.SocketException;
+@@ -138,34 +139,34 @@ public class SSLServerSocket extends jav
+         super.close();
+ 
+         // create the socket
++
++        int socketFamily = SocketBase.SSL_AF_INET;
++        if(SocketBase.supportsIPV6()) {
++            socketFamily = SocketBase.SSL_AF_INET6;
++        }
++
+         sockProxy = new SocketProxy(
+-            base.socketCreate(this, certApprovalCallback, null) );
++            base.socketCreate(this, certApprovalCallback, null,socketFamily) );
+ 
+         base.setProxy(sockProxy);
+ 
+         setReuseAddress(reuseAddr);
+ 
+-        // bind it to the local address and port
+-        if( bindAddr == null ) {
+-            bindAddr = anyLocalAddr;
+-        }
+         byte[] bindAddrBA = null;
+         if( bindAddr != null ) {
+             bindAddrBA = bindAddr.getAddress();
+         }
+         base.socketBind(bindAddrBA, port);
++
++        String hostName = null;
++        if(bindAddr != null)  {
++            hostName = bindAddr.getCanonicalHostName();
++        }
+         socketListen(backlog);
+     }
+ 
+     private native void socketListen(int backlog) throws SocketException;
+ 
+-    private static InetAddress anyLocalAddr;
+-    static {
+-        try {
+-            anyLocalAddr = InetAddress.getByName("0.0.0.0");
+-        } catch (java.net.UnknownHostException e) { }
+-    }
+-
+     /**
+      * Accepts a connection. This call will block until a connection is made
+      * or the timeout is reached.
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2007-05-08 18:40:14.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c	2009-06-24 13:27:15.000000000 -0700
+@@ -460,10 +460,15 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+     JSSL_SocketData *sock;
+     PRNetAddr addr;
+     jbyte *addrBAelems = NULL;
++    int addrBALen = 0; 
+     PRStatus status;
+     int stat;
+     const char *hostnameStr=NULL;
+ 
++    jmethodID supportsIPV6ID;
++    jclass socketBaseClass;
++    jboolean supportsIPV6 = 0;
++
+     if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+         /* exception was thrown */
+         goto finish;
+@@ -472,16 +477,32 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+     /*
+      * setup the PRNetAddr structure
+      */
+-    addr.inet.family = AF_INET;
+-    addr.inet.port = htons(port);
+-    PR_ASSERT(sizeof(addr.inet.ip) == 4);
+-    PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
++
++    socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++    if( socketBaseClass == NULL ) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++    supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++        SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++    if( supportsIPV6ID == NULL ) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++
++    supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++         supportsIPV6ID);
++
+     addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++    addrBALen = (*env)->GetArrayLength(env, addrBA);
++
++    PR_ASSERT(addrBALen != 0);
++
+     if( addrBAelems == NULL ) {
+         ASSERT_OUTOFMEM(env);
+         goto finish;
+     }
+-    memcpy(&addr.inet.ip, addrBAelems, 4);
+ 
+     /*
+      * Tell SSL the URL we think we want to connect to.
+@@ -495,6 +516,38 @@ Java_org_mozilla_jss_ssl_SSLSocket_socke
+         goto finish;
+     }
+ 
++    if( addrBAelems == NULL ) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++
++    if(addrBALen != 4 && addrBALen != 16) {
++        JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++        goto finish;
++    }
++
++    if( addrBALen == 4) {
++        addr.inet.family = AF_INET;
++        addr.inet.port = PR_htons(port);
++        memcpy(&addr.inet.ip, addrBAelems, 4);
++
++        if(supportsIPV6) {
++            addr.ipv6.family = AF_INET6;
++            addr.ipv6.port = PR_htons(port);
++            PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++        }
++
++    }  else {   /* Must be 16 and ipv6 */
++        if(supportsIPV6) {
++            addr.ipv6.family = AF_INET6;
++            addr.ipv6.port = PR_htons(port);
++            memcpy(&addr.ipv6.ip,addrBAelems, 16);
++        }  else {
++                JSSL_throwSSLSocketException(env, "Invalid address in connect!");
++                goto finish;
++        }
++    }
++
+     /*
+      * make the connect call
+      */
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2007-05-08 18:40:14.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java	2009-06-24 13:45:59.000000000 -0700
+@@ -243,11 +243,16 @@ public class SSLSocket extends java.net.
+         SSLClientCertificateSelectionCallback clientCertSelectionCallback)
+             throws IOException
+     {
++
++        int socketFamily = SocketBase.SSL_AF_INET;
++        if(SocketBase.supportsIPV6()) {
++            socketFamily = SocketBase.SSL_AF_INET6;
++        }
+         // create the socket
+         sockProxy =
+             new SocketProxy(
+                 base.socketCreate(
+-                    this, certApprovalCallback, clientCertSelectionCallback) );
++                    this, certApprovalCallback, clientCertSelectionCallback,socketFamily) );
+ 
+         base.setProxy(sockProxy);
+ 
+@@ -288,7 +293,7 @@ public class SSLSocket extends java.net.
+             new SocketProxy(
+                 base.socketCreate(
+                     this, certApprovalCallback, clientCertSelectionCallback,
+-                    s, host ) );
++                    s, host,SocketBase.SSL_AF_INET ) );
+ 
+         base.setProxy(sockProxy);
+         resetHandshake();
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	2007-03-20 15:39:28.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java	2009-06-24 13:50:32.000000000 -0700
+@@ -70,16 +70,16 @@ class SocketBase {
+     native byte[] socketCreate(Object socketObject,
+         SSLCertificateApprovalCallback certApprovalCallback,
+         SSLClientCertificateSelectionCallback clientCertSelectionCallback,
+-        java.net.Socket javaSock, String host)
++        java.net.Socket javaSock, String host,int family)
+             throws SocketException;
+ 
+     byte[] socketCreate(Object socketObject,
+         SSLCertificateApprovalCallback certApprovalCallback,
+-        SSLClientCertificateSelectionCallback clientCertSelectionCallback)
++        SSLClientCertificateSelectionCallback clientCertSelectionCallback,int family)
+             throws SocketException
+     {
+         return socketCreate(socketObject, certApprovalCallback,
+-            clientCertSelectionCallback, null, null);
++            clientCertSelectionCallback, null, null,family);
+     }
+ 
+     native void socketBind(byte[] addrBA, int port) throws SocketException;
+@@ -115,6 +115,10 @@ class SocketBase {
+     static final int SSL_REQUIRE_FIRST_HANDSHAKE = 20;
+     static final int SSL_REQUIRE_NO_ERROR = 21;
+ 
++
++    static final int SSL_AF_INET  = 50;
++    static final int SSL_AF_INET6 = 51;
++
+     void close() throws IOException {
+         socketClose();
+     }
+@@ -281,13 +285,25 @@ class SocketBase {
+         return in;
+     }
+ 
++    private native byte[] getLocalAddressByteArrayNative() throws SocketException;
++    private native byte[] getPeerAddressByteArrayNative() throws SocketException;
+     /**
+      * @return the InetAddress of the peer end of the socket.
+      */
+     InetAddress getInetAddress()
+     {
+         try {
+-            return convertIntToInetAddress( getPeerAddressNative() );
++            byte[] address = getPeerAddressByteArrayNative(); 
++
++            InetAddress iAddr = null;
++
++            try {
++
++                iAddr = InetAddress.getByAddress(address);
++            }   catch(UnknownHostException e) {
++            }
++
++            return iAddr;
+         } catch(SocketException e) {
+             return null;
+         }
+@@ -299,7 +315,17 @@ class SocketBase {
+      */
+     InetAddress getLocalAddress() {
+         try {
+-            return convertIntToInetAddress( getLocalAddressNative() );
++            byte[] address = getLocalAddressByteArrayNative();
++
++            InetAddress lAddr = null;
++
++            try {
++
++                lAddr = InetAddress.getByAddress(address);
++            }   catch(UnknownHostException e) {
++            }
++
++            return lAddr;
+         } catch(SocketException e) {
+             return null;
+         }
+@@ -378,4 +404,45 @@ class SocketBase {
+         return topException;
+       }
+     }
++   
++    static private int supportsIPV6 = -1;
++    static boolean supportsIPV6() {
++
++        if(supportsIPV6 >= 0) {
++            if(supportsIPV6 > 0) {
++                return true;
++            } else {
++                return false;
++            } 
++        }
++
++        Enumeration netInter;
++        try {
++                 netInter = NetworkInterface.getNetworkInterfaces();
++        }  catch (SocketException e) {
++
++                 return false;
++        }
++        while ( netInter.hasMoreElements() )
++        {
++            NetworkInterface ni = (NetworkInterface)netInter.nextElement();
++            Enumeration addrs = ni.getInetAddresses();
++            while ( addrs.hasMoreElements() )
++            {
++                 Object o = addrs.nextElement();
++                 if ( o.getClass() == InetAddress.class ||
++                     o.getClass() == Inet4Address.class ||
++                     o.getClass() == Inet6Address.class )
++                 {
++                      InetAddress iaddr = (InetAddress) o;
++                      if(o.getClass() == Inet6Address.class) {
++                          supportsIPV6 = 1;
++                          return true;
++                      }
++                 }
++            }
++        }
++        supportsIPV6 = 0;
++        return false;
++    }
+ }
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/common.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/common.c
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/common.c	2007-04-24 11:34:58.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/common.c	2009-06-24 14:22:02.000000000 -0700
+@@ -33,7 +33,6 @@
+  * the terms of any one of the MPL, the GPL or the LGPL.
+  *
+  * ***** END LICENSE BLOCK ***** */
+-
+ #include <nspr.h>
+ #include <jni.h>
+ #include <pk11func.h>
+@@ -51,6 +50,9 @@
+ #include <winsock.h>
+ #endif
+ 
++#define SSL_AF_INET  50
++#define SSL_AF_INET6 51
++
+ void
+ JSSL_throwSSLSocketException(JNIEnv *env, char *message)
+ {
+@@ -142,7 +144,7 @@ finish:
+ JNIEXPORT jbyteArray JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_socketCreate(JNIEnv *env, jobject self,
+     jobject sockObj, jobject certApprovalCallback,
+-    jobject clientCertSelectionCallback, jobject javaSock, jstring host)
++    jobject clientCertSelectionCallback, jobject javaSock, jstring host,jint family)
+ {
+     jbyteArray sdArray = NULL;
+     JSSL_SocketData *sockdata = NULL;
+@@ -150,10 +152,21 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+     PRFileDesc *newFD;
+     PRFileDesc *tmpFD;
+     PRFilePrivate *priv = NULL;
++    int socketFamily = 0;
++
++    if (family != SSL_AF_INET6 && family  != SSL_AF_INET) {
++       JSSL_throwSSLSocketException(env,
++                "socketCreate() Invalid family!");
++            goto finish;
++    }
++    if( family == SSL_AF_INET) 
++       socketFamily = PR_AF_INET;
++    else
++       socketFamily = PR_AF_INET6;
+ 
+     if( javaSock == NULL ) {
+         /* create a TCP socket */
+-        newFD = PR_NewTCPSocket();
++        newFD = PR_OpenTCPSocket(socketFamily);
+         if( newFD == NULL ) {
+             JSSL_throwSSLSocketException(env,
+                 "PR_NewTCPSocket() returned NULL");
+@@ -394,10 +407,10 @@ PRInt32 JSSL_enums[] = {
+     SSL_REQUIRE_ALWAYS,         /* 19 */        /* ssl.h */
+     SSL_REQUIRE_FIRST_HANDSHAKE,/* 20 */        /* ssl.h */
+     SSL_REQUIRE_NO_ERROR,       /* 21 */        /* ssl.h */
+-
+     0
+ };
+ 
++
+ JNIEXPORT void JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_socketBind
+     (JNIEnv *env, jobject self, jbyteArray addrBA, jint port)
+@@ -405,8 +418,13 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+     JSSL_SocketData *sock;
+     PRNetAddr addr;
+     jbyte *addrBAelems = NULL;
++    int addrBALen = 0;
+     PRStatus status;
+ 
++    jmethodID supportsIPV6ID;
++    jclass socketBaseClass;
++    jboolean supportsIPV6 = 0;
++
+     if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
+         /* exception was thrown */
+         goto finish;
+@@ -415,19 +433,72 @@ Java_org_mozilla_jss_ssl_SocketBase_sock
+     /*
+      * setup the PRNetAddr structure
+      */
+-    addr.inet.family = AF_INET;
+-    addr.inet.port = htons(port);
++
++    /* 
++     * Do we support IPV6? 
++     */
++
++    socketBaseClass = (*env)->FindClass(env, SOCKET_BASE_NAME);
++    if( socketBaseClass == NULL ) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++    supportsIPV6ID = (*env)->GetStaticMethodID(env, socketBaseClass,
++        SUPPORTS_IPV6_NAME, SUPPORTS_IPV6_SIG);
++
++    if( supportsIPV6ID == NULL ) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++
++    supportsIPV6 = (*env)->CallStaticBooleanMethod(env, socketBaseClass,
++         supportsIPV6ID);
++
++    memset( &addr, 0, sizeof( PRNetAddr ));
++
+     if( addrBA != NULL ) {
+-        PR_ASSERT(sizeof(addr.inet.ip) == 4);
+-        PR_ASSERT( (*env)->GetArrayLength(env, addrBA) == 4);
+         addrBAelems = (*env)->GetByteArrayElements(env, addrBA, NULL);
++        addrBALen = (*env)->GetArrayLength(env, addrBA);
++
+         if( addrBAelems == NULL ) {
+             ASSERT_OUTOFMEM(env);
+             goto finish;
+         }
+-        memcpy(&addr.inet.ip, addrBAelems, 4);
++
++        if(addrBALen != 4 && addrBALen != 16) {
++            JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++            "Invalid address in bind!");
++             goto finish;
++        }
++
++        if( addrBALen == 4) {
++            addr.inet.family = PR_AF_INET;
++            addr.inet.port = PR_htons(port);
++            memcpy(&addr.inet.ip, addrBAelems, 4);
++
++            if(supportsIPV6) {
++                addr.inet.family = PR_AF_INET6;
++                addr.ipv6.port = PR_htons(port);
++                PR_ConvertIPv4AddrToIPv6(addr.inet.ip,&addr.ipv6.ip);
++            } 
++
++        }  else {   /* Must be 16 and ipv6 */
++            if(supportsIPV6) {
++                addr.ipv6.family = PR_AF_INET6;
++                addr.ipv6.port = PR_htons(port);
++                memcpy(&addr.ipv6.ip,addrBAelems, 16);
++            }  else {
++                JSS_throwMsgPrErr(env, BIND_EXCEPTION,
++                    "Invalid address in bind!");
++                goto finish;
++            }
++        }
+     } else {
+-        addr.inet.ip = PR_htonl(INADDR_ANY);
++        if(supportsIPV6) {
++            status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr);
++        } else {
++            status = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET, port, &addr);
++        }
+     }
+ 
+     /* do the bind() call */
+@@ -601,6 +672,78 @@ finish:
+     return status;
+ }
+ 
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressByteArrayNative
++    (JNIEnv *env, jobject self)
++{
++    jbyteArray byteArray=NULL;
++    PRNetAddr addr;
++    jbyte *address=NULL;
++    int size=4;
++
++    if( JSSL_getSockAddr(env, self, &addr, PEER_SOCK) != PR_SUCCESS) { 
++        goto finish;
++    }
++
++    if( PR_NetAddrFamily(&addr) ==  PR_AF_INET6) {
++        size = 16;
++        address = (jbyte *) &addr.ipv6.ip;
++    } else {
++        address = (jbyte *) &addr.inet.ip;
++    }
++
++    byteArray = (*env)->NewByteArray(env,size);
++    if(byteArray == NULL) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++    (*env)->SetByteArrayRegion(env, byteArray, 0,size ,address);
++    if( (*env)->ExceptionOccurred(env) != NULL) {
++        PR_ASSERT(PR_FALSE);
++        goto finish;
++    }
++
++finish:
++    return byteArray;
++}
++
++JNIEXPORT jbyteArray JNICALL
++Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressByteArrayNative
++    (JNIEnv *env, jobject self)
++{
++    jbyteArray byteArray=NULL;
++    PRNetAddr addr;
++    jbyte *address=NULL;
++    int size=4;
++
++    if( JSSL_getSockAddr(env, self, &addr, LOCAL_SOCK) != PR_SUCCESS) {
++        goto finish;
++    }
++
++    if( PR_NetAddrFamily(&addr) ==  PR_AF_INET6) {
++        size = 16;
++        address = (jbyte *) &addr.ipv6.ip; 
++    } else {
++        address = (jbyte *) &addr.inet.ip;
++    }
++   
++    byteArray = (*env)->NewByteArray(env,size);
++    if(byteArray == NULL) {
++        ASSERT_OUTOFMEM(env);
++        goto finish;
++    }
++    (*env)->SetByteArrayRegion(env, byteArray, 0,size,address);
++    if( (*env)->ExceptionOccurred(env) != NULL) {
++        PR_ASSERT(PR_FALSE);
++        goto finish;
++    }
++
++finish:
++    return byteArray;
++}
++
++/* Leave the original versions of these functions for compatibility */
++
+ JNIEXPORT jint JNICALL
+ Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative
+     (JNIEnv *env, jobject self)
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2007-04-24 11:34:58.000000000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/ssl/javasock.c	2009-06-24 13:43:13.000000000 -0700
+@@ -290,6 +290,7 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+     jobject inetAddress;
+     jbyteArray addrByteArray;
+     jint port;
++    int addrBALen = 0;
+ 
+     if( GET_ENV(fd->secret->javaVM, env) ) goto finish;
+ 
+@@ -377,8 +378,9 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+ 
+         memset(addr, 0, sizeof(PRNetAddr));
+ 
+-        /* we only handle IPV4 */
+-        PR_ASSERT( (*env)->GetArrayLength(env, addrByteArray) == 4 );
++        addrBALen = (*env)->GetArrayLength(env, addrByteArray);
++
++        PR_ASSERT( (addrBALen == 4) || (addrBALen == 16 ) );
+ 
+         /* make sure you release them later */
+         addrBytes = (*env)->GetByteArrayElements(env, addrByteArray, NULL);
+@@ -388,9 +390,16 @@ getInetAddress(PRFileDesc *fd, PRNetAddr
+         }
+ 
+         /* ip field is in network byte order */
+-        memcpy( (void*) &addr->inet.ip, addrBytes, 4);
+-        addr->inet.family = PR_AF_INET;
+-        addr->inet.port = port;
++
++        if (addrBALen == 4) {
++            memcpy( (void*) &addr->inet.ip, addrBytes, 4);
++            addr->inet.family = PR_AF_INET;
++            addr->inet.port = port;
++        } else {
++            memcpy( (void*) &addr->ipv6.ip,addrBytes, 16);
++            addr->inet.family = PR_AF_INET6;
++            addr->inet.port = port;
++        }
+ 
+         (*env)->ReleaseByteArrayElements(env, addrByteArray, addrBytes,
+             JNI_ABORT);
+diff -rupN jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/util/java_ids.h jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/java_ids.h
+--- jss-4.2.6.pre-IPv6/mozilla/security/jss/org/mozilla/jss/util/java_ids.h	2006-02-22 17:21:52.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/util/java_ids.h	2009-06-19 17:56:00.000000000 -0700
+@@ -312,6 +312,8 @@ PR_BEGIN_EXTERN_C
+ #define SOCKET_BASE_NAME "org/mozilla/jss/ssl/SocketBase"
+ #define PROCESS_EXCEPTIONS_NAME "processExceptions"
+ #define PROCESS_EXCEPTIONS_SIG "(Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable;"
++#define SUPPORTS_IPV6_NAME "supportsIPV6"
++#define SUPPORTS_IPV6_SIG "()Z"
+ 
+ /*
+  * SSLCertificateApprovalCallback

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0009-jss-ocspSettings.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0009-jss-ocspSettings.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0009-jss-ocspSettings.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,106 @@
+diff -up jss-4.2.6/mozilla/security/jss/lib/jss.def.orig jss-4.2.6/mozilla/security/jss/lib/jss.def
+--- jss-4.2.6/mozilla/security/jss/lib/jss.def.orig	2009-11-04 14:26:26.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/lib/jss.def	2009-11-04 14:11:05.000000000 -0800
+@@ -329,6 +329,8 @@ Java_org_mozilla_jss_pkcs11_PK11Token_ne
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateECKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPairWithOpFlags;
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
+ ;+    local:
+ ;+       *;
+ ;+};
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c.orig jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c.orig	2009-11-04 14:20:43.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.c	2009-11-05 10:48:32.590000000 -0800
+@@ -976,3 +976,45 @@ Java_org_mozilla_jss_CryptoManager_confi
+     }
+ }
+ 
++
++/**********************************************************************
++* OCSPCacheSettingsNative
++*
++* Allows configuration of the OCSP responder cache during runtime.
++*/
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative(
++        JNIEnv *env, jobject this,
++        jint ocsp_cache_size,
++        jint ocsp_min_cache_entry_duration,
++        jint ocsp_max_cache_entry_duration)
++{
++    SECStatus rv = SECFailure;
++
++    rv = CERT_OCSPCacheSettings(
++        ocsp_cache_size, ocsp_min_cache_entry_duration,
++        ocsp_max_cache_entry_duration);
++
++    if (rv != SECSuccess) {
++        JSS_throwMsgPrErr(env,
++                     GENERAL_SECURITY_EXCEPTION,
++                     "Failed to set OCSP cache: error "+ PORT_GetError());
++    }
++}
++
++JNIEXPORT void JNICALL
++Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative(
++        JNIEnv *env, jobject this,
++        jint ocsp_timeout )
++{
++    SECStatus rv = SECFailure;
++
++    rv = CERT_SetOCSPTimeout(ocsp_timeout);
++
++    if (rv != SECSuccess) {
++        JSS_throwMsgPrErr(env,
++                     GENERAL_SECURITY_EXCEPTION,
++                     "Failed to set OCSP timeout: error "+ PORT_GetError());
++    }
++}
++
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java.orig jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java.orig	2009-11-04 14:20:33.000000000 -0800
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2009-11-05 10:48:59.415001000 -0800
+@@ -1479,4 +1479,41 @@ public final class CryptoManager impleme
+                     String ocspResponderCertNickname )
+                     throws GeneralSecurityException;
+ 
++    /**
++     * change OCSP cache settings
++     *      * @param ocsp_cache_size max cache entries
++     *      * @param ocsp_min_cache_entry_duration minimum seconds to next fetch attempt
++     *      * @param ocsp_max_cache_entry_duration maximum seconds to next fetch attempt
++     */
++    public void OCSPCacheSettings(
++        int ocsp_cache_size, 
++        int ocsp_min_cache_entry_duration,
++        int ocsp_max_cache_entry_duration)
++    throws GeneralSecurityException
++    {
++        OCSPCacheSettingsNative(ocsp_cache_size,
++                                   ocsp_min_cache_entry_duration,
++                                   ocsp_max_cache_entry_duration);
++    }
++
++    private native void OCSPCacheSettingsNative(
++        int ocsp_cache_size, 
++        int ocsp_min_cache_entry_duration,
++        int ocsp_max_cache_entry_duration)
++                    throws GeneralSecurityException;
++
++    /**
++     * set OCSP timeout value
++     *      * @param ocspTimeout OCSP timeout in seconds
++     */
++    public void setOCSPTimeout(
++        int ocsp_timeout )
++    throws GeneralSecurityException
++    {
++        setOCSPTimeoutNative( ocsp_timeout);
++    }
++
++    private native void setOCSPTimeoutNative(
++        int ocsp_timeout )
++                    throws GeneralSecurityException;
+ }

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0010-jss-ECC_keygen_byCurveName.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0010-jss-ECC_keygen_byCurveName.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0010-jss-ECC_keygen_byCurveName.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,490 @@
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java.fix jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java.fix	2010-10-20 09:54:35.189680000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java	2010-10-20 10:54:53.154835000 -0700
+@@ -196,7 +196,10 @@ public class KeyPairGenerator {
+         engine.setKeyPairUsages(usages,usages_mask);
+     }
+    
+-
++    public int getCurveCodeByName(String curveName)
++        throws InvalidParameterException {
++        return engine.getCurveCodeByName(curveName);
++    }
+ 
+ 
+ 
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java.fix jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java.fix	2010-10-20 09:54:52.393628000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java	2010-10-20 10:55:39.441698000 -0700
+@@ -94,4 +94,6 @@ public abstract class KeyPairGeneratorSp
+ 
+     public abstract void setKeyPairUsages(KeyPairGeneratorSpi.Usage[] usages, 
+                                           KeyPairGeneratorSpi.Usage[] usages_mask);
++
++    public abstract int getCurveCodeByName(String curveName) throws InvalidParameterException;
+ }
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java.fix jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java.fix	2010-10-15 10:30:57.832196000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java	2010-10-20 11:09:30.523208000 -0700
+@@ -44,6 +44,7 @@ import java.security.*;
+ import java.security.SecureRandom;
+ import java.security.spec.AlgorithmParameterSpec;
+ import java.security.spec.DSAParameterSpec;
++import java.util.Hashtable;
+ 
+ 
+ /**
+@@ -55,6 +56,246 @@ public final class PK11KeyPairGenerator
+     extends org.mozilla.jss.crypto.KeyPairGeneratorSpi
+ {
+ 
++    // curve code for getting the actual EC curve
++    private enum ECCurve_Code {
++      // NIST, SEC2 Prime curves
++        secp521r1 , // == nistp521
++        nistp521 ,
++        secp384r1 , // == nistp384
++        nistp384 ,
++        secp256r1 , // == nistp256
++        nistp256 ,
++        secp256k1 ,
++        secp224r1 , // == nistp224
++        nistp224 ,
++        secp224k1 ,
++        secp192r1 , // == nistp192
++        nistp192 ,
++        secp192k1 ,
++        secp160r2 ,
++        secp160r1 ,
++        secp160k1 ,
++        secp128r2 ,
++        secp128r1 ,
++        secp112r2 ,
++        secp112r1 ,
++      // NIST, SEC2 Binary curves
++        sect571r1 , // == nistb571
++        nistb571 ,
++        sect571k1 , // == nistk571
++        nistk571 ,
++        sect409r1 , // == nistb409
++        nistb409 ,
++        sect409k1 , // == nistk409
++        nistk409 ,
++        sect283r1 , // == nistb283
++        nistb283 ,
++        sect283k1 , // == nistk283
++        nistk283 ,
++        sect239k1 ,
++        sect233r1 , // == nistb233
++        nistb233 ,
++        sect233k1 , // == nistk233
++        nistk233 ,
++        sect193r2 ,
++        sect193r1 ,
++        nistb163 ,
++        sect163r2 , // == nistb163
++        sect163r1 ,
++        sect163k1 , // == nistk163
++        nistk163 ,
++        sect131r2 ,
++        sect131r1 ,
++        sect113r2 ,
++        sect113r1 ,
++      // ANSI X9.62 Prime curves
++        prime239v3 ,
++        prime239v2 ,
++        prime239v1 ,
++        prime192v3 ,
++        prime192v2 ,
++        prime192v1 , // == nistp192
++        // prime256v1 == nistp256
++      // ANSI X9.62 Binary curves
++        c2pnb163v1 ,
++        c2pnb163v2 ,
++        c2pnb163v3 ,
++        c2pnb176v1 ,
++        c2tnb191v1 ,
++        c2tnb191v2 ,
++        c2tnb191v3 ,
++        //c2onb191v4 ,
++        //c2onb191v5 ,
++        c2pnb208w1 ,
++        c2tnb239v1 ,
++        c2tnb239v2 ,
++        c2tnb239v3 ,
++        //c2onb239v4 ,
++        //c2onb239v5 ,
++        c2pnb272w1 ,
++        c2pnb304w1 ,
++        c2tnb359v1 ,
++        c2pnb368w1 ,
++        c2tnb431r1
++        // no WTLS curves fo now
++    };
++
++    private static Hashtable ECCurve_NameToCode = new Hashtable();
++    static {
++      // NIST, SEC2 Prime curves
++        ECCurve_NameToCode.put(
++            "secp521r1", ECCurve_Code.secp521r1);
++        ECCurve_NameToCode.put(
++            "nistp521", ECCurve_Code.nistp521);
++        ECCurve_NameToCode.put(
++            "secp384r1", ECCurve_Code.secp384r1);
++        ECCurve_NameToCode.put(
++            "nistp384", ECCurve_Code.nistp384);
++        ECCurve_NameToCode.put(
++            "secp256r1", ECCurve_Code.secp256r1);
++        ECCurve_NameToCode.put(
++            "nistp256", ECCurve_Code.nistp256);
++        ECCurve_NameToCode.put(
++            "secp256k1", ECCurve_Code.secp256k1);
++        ECCurve_NameToCode.put(
++            "secp224r1", ECCurve_Code.secp224r1);
++        ECCurve_NameToCode.put(
++            "nistp224", ECCurve_Code.nistp224);
++        ECCurve_NameToCode.put(
++            "secp224k1", ECCurve_Code.secp224k1);
++        ECCurve_NameToCode.put(
++            "secp192r1", ECCurve_Code.secp192r1);
++        ECCurve_NameToCode.put(
++            "nistp192", ECCurve_Code.nistp192);
++        ECCurve_NameToCode.put(
++            "secp192k1", ECCurve_Code.secp192k1);
++        ECCurve_NameToCode.put(
++            "secp160r2", ECCurve_Code.secp160r2);
++        ECCurve_NameToCode.put(
++            "secp160r1", ECCurve_Code.secp160r1);
++        ECCurve_NameToCode.put(
++            "secp160k1", ECCurve_Code.secp160k1);
++        ECCurve_NameToCode.put(
++            "secp128r2", ECCurve_Code.secp128r2);
++        ECCurve_NameToCode.put(
++            "secp128r1", ECCurve_Code.secp128r1);
++        ECCurve_NameToCode.put(
++            "secp112r2", ECCurve_Code.secp112r2);
++        ECCurve_NameToCode.put(
++            "secp112r1", ECCurve_Code.secp112r1);
++      // NIST, SEC2 Binary curves
++        ECCurve_NameToCode.put(
++            "sect571r1", ECCurve_Code.sect571r1);
++        ECCurve_NameToCode.put(
++            "nistb571", ECCurve_Code.nistb571);
++        ECCurve_NameToCode.put(
++            "sect571k1", ECCurve_Code.sect571k1);
++        ECCurve_NameToCode.put(
++            "nistk571", ECCurve_Code.nistk571);
++        ECCurve_NameToCode.put(
++            "sect409r1", ECCurve_Code.sect409r1);
++        ECCurve_NameToCode.put(
++            "nistb409", ECCurve_Code.nistb409);
++        ECCurve_NameToCode.put(
++            "sect409k1", ECCurve_Code.sect409k1);
++        ECCurve_NameToCode.put(
++            "nistk409", ECCurve_Code.nistk409);
++        ECCurve_NameToCode.put(
++            "sect283r1", ECCurve_Code.sect283r1);
++        ECCurve_NameToCode.put(
++            "nistb283", ECCurve_Code.nistb283);
++        ECCurve_NameToCode.put(
++            "sect283k1", ECCurve_Code.sect283k1);
++        ECCurve_NameToCode.put(
++            "nistk283", ECCurve_Code.nistk283);
++        ECCurve_NameToCode.put(
++            "sect239k1", ECCurve_Code.sect239k1);
++        ECCurve_NameToCode.put(
++            "sect233r1", ECCurve_Code.sect233r1);
++        ECCurve_NameToCode.put(
++            "nistb233", ECCurve_Code.nistb233);
++        ECCurve_NameToCode.put(
++            "sect233k1", ECCurve_Code.sect233k1);
++        ECCurve_NameToCode.put(
++            "nistk233", ECCurve_Code.nistk233);
++        ECCurve_NameToCode.put(
++            "sect193r2", ECCurve_Code.sect193r2);
++        ECCurve_NameToCode.put(
++            "sect193r1", ECCurve_Code.sect193r1);
++        ECCurve_NameToCode.put(
++            "nistb163", ECCurve_Code.nistb163);
++        ECCurve_NameToCode.put(
++            "sect163r2", ECCurve_Code.sect163r2);
++        ECCurve_NameToCode.put(
++            "sect163r1", ECCurve_Code.sect163r1);
++        ECCurve_NameToCode.put(
++            "sect163k1", ECCurve_Code.sect163k1);
++        ECCurve_NameToCode.put(
++            "nistk163", ECCurve_Code.nistk163);
++        ECCurve_NameToCode.put(
++            "sect131r2", ECCurve_Code.sect131r2);
++        ECCurve_NameToCode.put(
++            "sect131r1", ECCurve_Code.sect131r1);
++        ECCurve_NameToCode.put(
++            "sect113r2", ECCurve_Code.sect113r2);
++        ECCurve_NameToCode.put(
++            "sect113r1", ECCurve_Code.sect113r1);
++      // ANSI Prime curves
++        ECCurve_NameToCode.put(
++            "prime239v3", ECCurve_Code.prime239v3);
++        ECCurve_NameToCode.put(
++            "prime239v2", ECCurve_Code.prime239v2);
++        ECCurve_NameToCode.put(
++            "prime239v1", ECCurve_Code.prime239v1);
++        ECCurve_NameToCode.put(
++            "prime192v3", ECCurve_Code.prime192v3);
++        ECCurve_NameToCode.put(
++            "prime192v2", ECCurve_Code.prime192v2);
++        ECCurve_NameToCode.put(
++            "prime192v1", ECCurve_Code.prime192v1);
++      // ANSI Binary curves
++        ECCurve_NameToCode.put(
++            "c2pnb163v1", ECCurve_Code.c2pnb163v1);
++        ECCurve_NameToCode.put(
++            "c2pnb163v2", ECCurve_Code.c2pnb163v2);
++        ECCurve_NameToCode.put(
++            "c2pnb163v3", ECCurve_Code.c2pnb163v3);
++        ECCurve_NameToCode.put(
++            "c2pnb176v1", ECCurve_Code.c2pnb176v1);
++        ECCurve_NameToCode.put(
++            "c2tnb191v1", ECCurve_Code.c2tnb191v1);
++        ECCurve_NameToCode.put(
++            "c2tnb191v2", ECCurve_Code.c2tnb191v2);
++        ECCurve_NameToCode.put(
++            "c2tnb191v3", ECCurve_Code.c2tnb191v3);
++        //ECCurve_NameToCode.put(
++        //    "c2onb191v4", ECCurve_Code.c2onb191v4);
++        //ECCurve_NameToCode.put(
++        //    "c2onb191v5", ECCurve_Code.c2onb191v5);
++        ECCurve_NameToCode.put(
++            "c2pnb208w1", ECCurve_Code.c2pnb208w1);
++        ECCurve_NameToCode.put(
++            "c2tnb239v1", ECCurve_Code.c2tnb239v1);
++        ECCurve_NameToCode.put(
++            "c2tnb239v2", ECCurve_Code.c2tnb239v2);
++        ECCurve_NameToCode.put(
++            "c2tnb239v3", ECCurve_Code.c2tnb239v3);
++        //ECCurve_NameToCode.put(
++        //    "c2onb239v4", ECCurve_Code.c2onb239v4);
++        //ECCurve_NameToCode.put(
++        //    "c2onb239v5", ECCurve_Code.c2onb239v5);
++        ECCurve_NameToCode.put(
++            "c2pnb272w1", ECCurve_Code.c2pnb272w1);
++        ECCurve_NameToCode.put(
++            "c2pnb304w1", ECCurve_Code.c2pnb304w1);
++        ECCurve_NameToCode.put(
++            "c2tnb359v1", ECCurve_Code.c2tnb359v1);
++        ECCurve_NameToCode.put(
++            "c2pnb368w1", ECCurve_Code.c2pnb368w1);
++        ECCurve_NameToCode.put(
++            "c2tnb431r1", ECCurve_Code.c2tnb431r1);
++    }
++
+     // opFlag constants: each of these flags specifies a crypto operation
+     // the key will support.  Their values must match the same-named C
+     // preprocessor macros defined in the PKCS #11 header pkcs11t.h.
+@@ -165,7 +406,15 @@ public final class PK11KeyPairGenerator
+             }
+         } else {
+             Assert._assert( algorithm == KeyPairAlgorithm.EC );
+-            params = getCurve(strength);
++            if (strength < 112) {
++                // for EC, "strength" is actually a code for curves defined in 
++                //   ECCurve_Code
++                params = getECCurve(strength);
++            } else {
++                // this is the old method of strength to curve mapping,
++                // which is somewhat defective
++                params = getCurve(strength);
++            }
+         }
+     }
+ 
+@@ -642,6 +891,189 @@ public final class PK11KeyPairGenerator
+     static final OBJECT_IDENTIFIER CURVE_SECG_T571R1
+ 	= SECG_EC_CURVE.subBranch(39);
+ 
++    // the EC curvecode to oid hash table
++    private static Hashtable mECCurve_CodeToCurve = new Hashtable();
++    static {
++      // SEG Prime curves
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp521r1.ordinal(), (Object) CURVE_SECG_P521R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistp521.ordinal(), (Object) CURVE_SECG_P521R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp384r1.ordinal(), (Object) CURVE_SECG_P384R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistp384.ordinal(), (Object) CURVE_SECG_P384R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp256r1.ordinal(), (Object) CURVE_ANSI_P256V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistp256.ordinal(), (Object) CURVE_ANSI_P256V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp256k1.ordinal(), (Object) CURVE_SECG_P256K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp224r1.ordinal(), (Object) CURVE_SECG_P224R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistp224.ordinal(), (Object) CURVE_SECG_P224R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp224k1.ordinal(), (Object) CURVE_SECG_P224K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp192r1.ordinal(), (Object) CURVE_ANSI_P192V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistp192.ordinal(), (Object) CURVE_ANSI_P192V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp192k1.ordinal(), (Object) CURVE_SECG_P192K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp160r2.ordinal(), (Object) CURVE_SECG_P160R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp160r1.ordinal(), (Object) CURVE_SECG_P160R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp160k1.ordinal(), (Object) CURVE_SECG_P160K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp128r2.ordinal(), (Object) CURVE_SECG_P128R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp128r1.ordinal(), (Object) CURVE_SECG_P128R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp112r2.ordinal(), (Object) CURVE_SECG_P112R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.secp112r1.ordinal(), (Object) CURVE_SECG_P112R1);
++      // SEG Binary curves
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect571r1.ordinal(), (Object) CURVE_SECG_T571R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistb571.ordinal(), (Object) CURVE_SECG_T571R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect571k1.ordinal(), (Object) CURVE_SECG_T571K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistk571.ordinal(), (Object) CURVE_SECG_T571K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect409r1.ordinal(), (Object) CURVE_SECG_T409R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistb409.ordinal(), (Object) CURVE_SECG_T409R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect409k1.ordinal(), (Object) CURVE_SECG_T409K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistk409.ordinal(), (Object) CURVE_SECG_T409K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect283r1.ordinal(), (Object) CURVE_SECG_T283R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistb283.ordinal(), (Object) CURVE_SECG_T283R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect283k1.ordinal(), (Object) CURVE_SECG_T283K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistk283.ordinal(), (Object) CURVE_SECG_T283K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect239k1.ordinal(), (Object) CURVE_SECG_T239K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect233r1.ordinal(), (Object) CURVE_SECG_T233R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistb233.ordinal(), (Object) CURVE_SECG_T233R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect233k1.ordinal(), (Object) CURVE_SECG_T233K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistk233.ordinal(), (Object) CURVE_SECG_T233K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect193r2.ordinal(), (Object) CURVE_SECG_T193R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect193r1.ordinal(), (Object) CURVE_SECG_T193R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistb163.ordinal(), (Object) CURVE_SECG_T163K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect163r2.ordinal(), (Object) CURVE_SECG_T163R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect163r1.ordinal(), (Object) CURVE_SECG_T163R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect163k1.ordinal(), (Object) CURVE_SECG_T163K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.nistk163.ordinal(), (Object) CURVE_SECG_T163K1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect131r2.ordinal(), (Object) CURVE_SECG_T131R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect131r1.ordinal(), (Object) CURVE_SECG_T131R1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect113r2.ordinal(), (Object) CURVE_SECG_T113R2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.sect113r1.ordinal(), (Object) CURVE_SECG_T113R1);
++      // ANSI Prime curves
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime239v3.ordinal(), (Object) CURVE_ANSI_P239V3);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime239v2.ordinal(), (Object) CURVE_ANSI_P239V2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime239v1.ordinal(), (Object) CURVE_ANSI_P239V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime192v3.ordinal(), (Object) CURVE_ANSI_P192V3);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime192v2.ordinal(), (Object) CURVE_ANSI_P192V2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.prime192v1.ordinal(), (Object) CURVE_ANSI_P192V1);
++      // ANSI Binary curves
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb163v1.ordinal(), (Object) CURVE_ANSI_PNB163V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb163v2.ordinal(), (Object) CURVE_ANSI_PNB163V2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb163v3.ordinal(), (Object) CURVE_ANSI_PNB163V3);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb176v1.ordinal(), (Object) CURVE_ANSI_PNB176V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb191v1.ordinal(), (Object) CURVE_ANSI_TNB191V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb191v2.ordinal(), (Object) CURVE_ANSI_TNB191V2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb191v3.ordinal(), (Object) CURVE_ANSI_TNB191V3);
++        //mECCurve_CodeToCurve.put(
++        //    ECCurve_Code.c2onb191v4.ordinal(), (Object) CURVE_ANSI_ONB191V4);
++        //mECCurve_CodeToCurve.put(
++        //    ECCurve_Code.c2onb191v5.ordinal(), (Object) CURVE_ANSI_ONB191V5);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb208w1.ordinal(), (Object) CURVE_ANSI_PNB208W1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb239v1.ordinal(), (Object) CURVE_ANSI_TNB239V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb239v2.ordinal(), (Object) CURVE_ANSI_TNB239V2);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb239v3.ordinal(), (Object) CURVE_ANSI_TNB239V3);
++        //mECCurve_CodeToCurve.put(
++        //    ECCurve_Code.c2onb239v4.ordinal(), (Object) CURVE_ANSI_ONB239V4);
++        //mECCurve_CodeToCurve.put(
++        //    ECCurve_Code.c2onb239v5.ordinal(), (Object) CURVE_ANSI_ONB239V5);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb272w1.ordinal(), (Object) CURVE_ANSI_PNB272W1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb304w1.ordinal(), (Object) CURVE_ANSI_PNB304W1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb359v1.ordinal(), (Object) CURVE_ANSI_TNB359V1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2pnb368w1.ordinal(), (Object) CURVE_ANSI_PNB368W1);
++        mECCurve_CodeToCurve.put(
++            ECCurve_Code.c2tnb431r1.ordinal(), (Object) CURVE_ANSI_TNB431R1);
++    }
++
++    public int getCurveCodeByName(String curveName)
++        throws InvalidParameterException {
++        if (curveName == null)
++            throw new InvalidParameterException();
++        ECCurve_Code c = (ECCurve_Code) ECCurve_NameToCode.get(curveName);
++        if (c == null)
++            throw new InvalidParameterException(curveName);
++        return c.ordinal();
++    }
++
++    /*
++     * getECCurve
++     *     maps curvecode to the actual oid of the curve and
++     *     returns the PK11ParameterSpec
++     */
++    private AlgorithmParameterSpec getECCurve(int curvecode)
++        throws InvalidParameterException
++    {
++        OBJECT_IDENTIFIER oid;
++
++        oid = (OBJECT_IDENTIFIER) mECCurve_CodeToCurve.get(curvecode);
++        if (oid == null)
++            throw new IllegalArgumentException("curvecode ="+curvecode);
++        return new PK11ParameterSpec(ASN1Util.encode(oid));
++    }
++
+     private AlgorithmParameterSpec getCurve(int strength) 
+         throws InvalidParameterException
+     {

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0011-jss-VerifyCertificate.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0011-jss-VerifyCertificate.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0011-jss-VerifyCertificate.patch	2015-05-05 09:47:33 UTC (rev 24931)
@@ -0,0 +1,220 @@
+diff -up jss-4.2.6/mozilla/security/jss/lib/jss.def.fix jss-4.2.6/mozilla/security/jss/lib/jss.def
+--- jss-4.2.6/mozilla/security/jss/lib/jss.def.fix	2010-10-20 09:53:10.288935000 -0700
++++ jss-4.2.6/mozilla/security/jss/lib/jss.def	2010-10-29 10:29:48.664212000 -0700
+@@ -331,6 +331,7 @@ Java_org_mozilla_jss_pkcs11_PK11KeyPairG
+ Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPairWithOpFlags;
+ Java_org_mozilla_jss_CryptoManager_OCSPCacheSettingsNative;
+ Java_org_mozilla_jss_CryptoManager_setOCSPTimeoutNative;
++Java_org_mozilla_jss_CryptoManager_verifyCertificateNowNative;
+ ;+    local:
+ ;+       *;
+ ;+};
+diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java.fix jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
+--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java.fix	2010-10-28 16:44:46.366082000 -0700
++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/CryptoManager.java	2010-10-31 17:30:25.502670000 -0700
+@@ -61,6 +61,7 @@ import org.mozilla.jss.provider.java.sec
+ public final class CryptoManager implements TokenSupplier
+ {
+     /**
++     * note: this is obsolete in NSS
+      * CertUsage options for validation
+      */
+     public final static class CertUsage {
+@@ -86,8 +87,6 @@ public final class CryptoManager impleme
+             return name;
+         }
+ 
+-
+-
+         // certUsage, these must be kept in sync with nss/lib/certdb/certt.h
+         public static final CertUsage SSLClient = new CertUsage(0, "SSLClient");
+         public static final CertUsage SSLServer = new CertUsage(1, "SSLServer");
+@@ -103,6 +102,63 @@ public final class CryptoManager impleme
+         public static final CertUsage AnyCA = new CertUsage(11, "AnyCA");
+     }
+ 
++    /**
++     * CertificateUsage options for validation
++     */
++    public final static class CertificateUsage {
++        private int usage;
++        private String name;
++
++        // certificateUsage, these must be kept in sync with nss/lib/certdb/certt.h
++        private static final int certificateUsageCheckAllUsages = 0x0000;
++        private static final int certificateUsageSSLClient = 0x0001;
++        private static final int certificateUsageSSLServer = 0x0002;
++        private static final int certificateUsageSSLServerWithStepUp = 0x0004;
++        private static final int certificateUsageSSLCA = 0x0008;
++        private static final int certificateUsageEmailSigner = 0x0010;
++        private static final int certificateUsageEmailRecipient = 0x0020;
++        private static final int certificateUsageObjectSigner = 0x0040;
++        private static final int certificateUsageUserCertImport = 0x0080;
++        private static final int certificateUsageVerifyCA = 0x0100;
++        private static final int certificateUsageProtectedObjectSigner = 0x0200;
++        private static final int certificateUsageStatusResponder = 0x0400;
++        private static final int certificateUsageAnyCA = 0x0800;
++
++        static private ArrayList list = new ArrayList();
++        private CertificateUsage() {};
++        private CertificateUsage(int usage, String name) {
++            this.usage = usage;
++            this.name =  name;
++            this.list.add(this);
++
++        }
++        public int getUsage() {
++            return usage;
++        }
++
++        static public Iterator getCertificateUsages() {
++            return list.iterator();
++
++        }
++        public String toString() {
++            return name;
++        }
++
++        public static final CertificateUsage CheckAllUsages = new CertificateUsage(certificateUsageCheckAllUsages, "CheckAllUsages");
++        public static final CertificateUsage SSLClient = new CertificateUsage(certificateUsageSSLClient, "SSLClient");
++        public static final CertificateUsage SSLServer = new CertificateUsage(certificateUsageSSLServer, "SSLServer");
++        public static final CertificateUsage SSLServerWithStepUp = new CertificateUsage(certificateUsageSSLServerWithStepUp, "SSLServerWithStepUp");
++        public static final CertificateUsage SSLCA = new CertificateUsage(certificateUsageSSLCA, "SSLCA");
++        public static final CertificateUsage EmailSigner = new CertificateUsage(certificateUsageEmailSigner, "EmailSigner");
++        public static final CertificateUsage EmailRecipient = new CertificateUsage(certificateUsageEmailRecipient, "EmailRecipient");
++        public static final CertificateUsage ObjectSigner = new CertificateUsage(certificateUsageObjectSigner, "ObjectSigner");
++        public static final CertificateUsage UserCertImport = new CertificateUsage(certificateUsageUserCertImport, "UserCertImport");
++        public static final CertificateUsage VerifyCA = new CertificateUsage(certificateUsageVerifyCA, "VerifyCA");
++        public static final CertificateUsage ProtectedObjectSigner = new CertificateUsage(certificateUsageProtectedObjectSigner, "ProtectedObjectSigner");

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Tue May  5 11:53:28 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  5 May 2015 09:53:28 +0000
Subject: SF.net SVN: gar:[24932] csw/mgar/pkg/collectd/trunk/Makefile
Message-ID: <3lgxFs5mtXz3K@mail.opencsw.org>

Revision: 24932
          http://sourceforge.net/p/gar/code/24932
Author:   dmichelsen
Date:     2015-05-05 09:53:27 +0000 (Tue, 05 May 2015)
Log Message:
-----------
collectd/trunk: Add missing override

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

Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile	2015-05-05 09:47:33 UTC (rev 24931)
+++ csw/mgar/pkg/collectd/trunk/Makefile	2015-05-05 09:53:27 UTC (rev 24932)
@@ -108,6 +108,7 @@
 RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7
 # There are some symlinks that confuse checkpkg
 CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/sparcv9/collectd/java.so
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/amd64/collectd/java.so
 CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/collectd/java.so
 CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWjre7
 

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 May  5 11:54:47 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  5 May 2015 09:54:47 +0000
Subject: SF.net SVN: gar:[24933] csw/mgar/pkg/libdatrie/trunk
Message-ID: <3lgxHR5WRmz5g@mail.opencsw.org>

Revision: 24933
          http://sourceforge.net/p/gar/code/24933
Author:   dmichelsen
Date:     2015-05-05 09:54:47 +0000 (Tue, 05 May 2015)
Log Message:
-----------
libdatrie/trunk: Update to 0.2.9

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

Removed Paths:
-------------
    csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch

Modified: csw/mgar/pkg/libdatrie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/Makefile	2015-05-05 09:53:27 UTC (rev 24932)
+++ csw/mgar/pkg/libdatrie/trunk/Makefile	2015-05-05 09:54:47 UTC (rev 24933)
@@ -1,14 +1,13 @@
 NAME = libdatrie
-VERSION = 0.2.5
+VERSION = 0.2.9
 GARTYPE = v2
 
 DESCRIPTION = Double array tree library
 define BLURB
 endef
 
-MASTER_SITES = ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
-DISTFILES += $(DISTNAME).tar.gz
-PATCHFILES += 0001-Remove-unnecessary-inclusing-of-stdint.h.patch
+MASTER_SITES += ftp://linux.thai.net/pub/thailinux/software/libthai/
+DISTFILES += $(DISTNAME).tar.xz
 
 VENDOR_URL = http://linux.thai.net/~thep/datrie/datrie.html
 

Modified: csw/mgar/pkg/libdatrie/trunk/checksums
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/checksums	2015-05-05 09:53:27 UTC (rev 24932)
+++ csw/mgar/pkg/libdatrie/trunk/checksums	2015-05-05 09:54:47 UTC (rev 24933)
@@ -1 +1 @@
-c9b057d07198d66e1ac2eff32937d3d4  libdatrie-0.2.5.tar.gz
+687624f374e748de81b01399736bb735  libdatrie-0.2.9.tar.xz

Deleted: csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch	2015-05-05 09:53:27 UTC (rev 24932)
+++ csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch	2015-05-05 09:54:47 UTC (rev 24933)
@@ -1,37 +0,0 @@
-From 978cdfe1134e27b35897951bd44957a76573e45e Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 9 Jul 2011 15:27:27 +0200
-Subject: [PATCH] Remove unnecessary inclusing of stdint.h
-
----
- datrie/darray.c |    1 -
- datrie/tail.c   |    1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/datrie/darray.c b/datrie/darray.c
-index 234e904..02471e2 100644
---- a/datrie/darray.c
-+++ b/datrie/darray.c
-@@ -26,7 +26,6 @@
- 
- #include <string.h>
- #include <stdlib.h>
--#include <stdint.h>
- #include <stdio.h>
- 
- #include "trie-private.h"
-diff --git a/datrie/tail.c b/datrie/tail.c
-index 4e31d9f..d835c57 100644
---- a/datrie/tail.c
-+++ b/datrie/tail.c
-@@ -26,7 +26,6 @@
- 
- #include <string.h>
- #include <stdlib.h>
--#include <stdint.h>
- #include <stdio.h>
- 
- #include "tail.h"
--- 
-1.7.6
-

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


From bdwalton at users.sourceforge.net  Tue May  5 23:14:25 2015
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue,  5 May 2015 21:14:25 +0000
Subject: SF.net SVN: gar:[24934] csw/mgar/pkg/git/trunk
Message-ID: <3lhDMf3NPwzTH@mail.opencsw.org>

Revision: 24934
          http://sourceforge.net/p/gar/code/24934
Author:   bdwalton
Date:     2015-05-05 21:14:24 +0000 (Tue, 05 May 2015)
Log Message:
-----------
git/trunk: fix another test breakage

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-05-05 09:54:47 UTC (rev 24933)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-05-05 21:14:24 UTC (rev 24934)
@@ -99,6 +99,7 @@
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
 PATCHFILES += 0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
+PATCHFILES += 0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Added: csw/mgar/pkg/git/trunk/files/0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch	2015-05-05 21:14:24 UTC (rev 24934)
@@ -0,0 +1,44 @@
+From bec24a752202eb5b440ca6d056fa217e39e1d6ab Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 5 May 2015 22:04:21 +0100
+Subject: [PATCH] Work around sed invocation that Solaris' xpg4/sed cannot
+ handle
+
+In 99094a7a, a trivial && breakage was fixed. This exposed a problem
+with the test when run on Solaris with /usr/xpg4/bin/sed that had gone
+silently undetected since its introduction in e4bd10b2. Solaris' sed
+executes the requested substitution but prints a warning about the
+missing newline at the end of the file and exists with status 2.
+
+% echo "CHANGE_ME" | \
+tr -d "\\012" | /usr/xpg4/bin/sed -e 's/CHANGE_ME/change_me/'
+sed: Missing newline at end of file standard input.
+change_me
+% echo $?
+2
+
+To work around this, use perl to execute the substitution instead. By
+using inplace replacement, we can subsequently drop the mv command.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t9500-gitweb-standalone-no-errors.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
+index e94b2f1..eb264f9 100755
+--- a/t/t9500-gitweb-standalone-no-errors.sh
++++ b/t/t9500-gitweb-standalone-no-errors.sh
+@@ -290,8 +290,7 @@ test_expect_success 'setup incomplete lines' '
+ 	echo "incomplete" | tr -d "\\012" >>file &&
+ 	git commit -a -m "Add incomplete line" &&
+ 	git tag incomplete_lines_add &&
+-	sed -e s/CHANGE_ME/change_me/ <file >file+ &&
+-	mv -f file+ file &&
++	perl -pi -e "s/CHANGE_ME/change_me/" file &&
+ 	git commit -a -m "Incomplete context line" &&
+ 	git tag incomplete_lines_ctx &&
+ 	echo "Dominus regit me," >file &&
+-- 
+2.3.3
+

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


From cgrzemba at users.sourceforge.net  Wed May  6 08:07:54 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 06:07:54 +0000
Subject: SF.net SVN: gar:[24935] csw/mgar/pkg/lang-java/jss/branches/fromfedora
Message-ID: <3lhSCD3xhCzYs@mail.opencsw.org>

Revision: 24935
          http://sourceforge.net/p/gar/code/24935
Author:   cgrzemba
Date:     2015-05-06 06:07:53 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: fix 64bit build, runpath

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-05 21:14:24 UTC (rev 24934)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-06 06:07:53 UTC (rev 24935)
@@ -5,6 +5,7 @@
 MAJOR_VERSION = 4
 FULLVERSION = 4.3.2
 VERSION = 4.2.6
+RELEASE = 37.el7
 GARTYPE = v2
 CATEGORIES = java
 
@@ -22,12 +23,13 @@
 GARFLAVOR = OPT
 BUILD64 = 1
 
-# MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/mozilla.org/mozilla.org/security/jss/releases/JSS_4_3_2_RTM/
-# DISTFILES  = $(NAME)$(MAJOR_VERSION).jar
+# The source for this package was pulled from upstream's cvs. Use the
+# following commands to generate the tarball:
+# cvs -d :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot export -r JSS_4_2_6_RTM -d jss-4.2.6 -N mozilla/security/coreconf mozilla/security/jss
+MASTER_SITES =  http://pki.fedoraproject.org/pki/sources/$(NAME)/$(NAME)-$(VERSION)-$(RELEASE)/
 DISTFILES += COPYING
 DISTFILES += $(DISTNAME).tar.gz
 
-PACKAGES = CSWjss4
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
@@ -56,12 +58,25 @@
 PATCHFILES += 0023-jss-SHA-OID-fix.patch
 PATCHFILES += 0024-jss-RC4-strengh-verify.patch
 PATCHFILES += 0025-jss-support-TLS1_1-TLS1_2.patch
+PATCHFILES += 0026-SunOS5.mk.patch
 
-PACKAGES = CSWjss4
+PACKAGES += CSWjss4
 CATALOGNAME_CSWjss4 = jss4
 SPKG_DESC_CSWjss4 += $(DESCRIPTION), jss4.jar, libjss4.so
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWjss4 += CSWlibnspr4
+CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename|file=/opt/csw/lib/amd64/libjss4.so
+CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename|file=/opt/csw/lib/libjss4.so
+CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
+CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 
-PACKAGES = CSWjss4-doc
+
+
+PACKAGES += CSWjss4-doc
 CATALOGNAME_CSWjss4-doc = jss4_doc
 PKGFILES_CSWjss4-doc = $(PKGFILES_DOC)
 SPKG_DESC_CSWjss4-doc += $(DESCRIPTION), javadoc
@@ -71,16 +86,20 @@
 DISTDIR = mozilla/security/jss
 LICENSE = COPYING
 
-OBJ_PATH = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_$(GARFLAVOR).OBJ
+OBJ_PATH_32 = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_$(GARFLAVOR).OBJ
+OBJ_PATH_64 = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_64_$(GARFLAVOR).OBJ
+OBJ_PATH = $(OBJ_PATH_$(MEMORYMODEL_$(ISA)))
 
 CONFIGURE_ARGS_OPT += BUILD_OPT=1
 CONFIGURE_ARGS += NSPR_INCLUDE_DIR=$(shell pkg-config --cflags-only-I nspr | sed 's/-I//')
-CONFIGURE_ARGS += NSPR_LIB_DIR=$(shell pkg-config --libs-only-L nspr | sed 's/-L//')
+CONFIGURE_ARGS_32 += NSPR_LIB_DIR=$(shell pkg-config --libs-only-L nspr | sed 's/-L//')
+CONFIGURE_ARGS_64 += NSPR_LIB_DIR=$(shell PKG_CONFIG_PATH=/opt/csw/lib/64/pkgconfig pkg-config --libs-only-L nspr | sed 's/-L//')
 CONFIGURE_ARGS += NSS_INCLUDE_DIR=$(shell pkg-config --cflags-only-I nss | sed 's/-I//')
-CONFIGURE_ARGS += NSS_LIB_DIR=$(shell pkg-config --libs-only-L nss | sed 's/-L//')
+CONFIGURE_ARGS_32 += NSS_LIB_DIR=$(shell pkg-config --libs-only-L nss | sed 's/-L//')
+CONFIGURE_ARGS_64 += NSS_LIB_DIR=$(shell PKG_CONFIG_PATH=/opt/csw/lib/64/pkgconfig pkg-config --libs-only-L nss | sed 's/-L//')
 CONFIGURE_ARGS += JAVA_HOME=/usr/java
-CONFIGURE_ARGS_64 += USE_64
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(BUILD_ISAS)))
+CONFIGURE_ARGS_64 += USE_64=1
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(ISA)))
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 	
 CONFIGURE_SCRIPTS = 
@@ -101,7 +120,7 @@
 	@$(MAKECOOKIE)
 
 install-custom: 
-	(cd $(WORKSRC) && $(EXTRA_INSTALL_ENV) gmake -C mozilla/security/jss install $(CONFIGURE_ARGS))
+	(cd $(WORKSRC) && $(EXTRA_INSTALL_ENV) gmake -C mozilla/security/jss install $(CONFIGURE_ARGS) ROOT=$(DESTDIR))
 	ginstall -d $(JAVA_INSTALL_DIR)
 	ginstall -d $(DESTDIR)$(libdir)
 	(cd $(WORKSRC)/mozilla/dist && \

Added: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch	2015-05-06 06:07:53 UTC (rev 24935)
@@ -0,0 +1,11 @@
+--- a/mozilla/security/coreconf/SunOS5.mk
++++ b/mozilla/security/coreconf/SunOS5.mk
+@@ -177,7 +177,7 @@ ifeq ($(USE_64), 1)
+ endif
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+-DSO_LDOPTS += -z combreloc -z defs -z ignore
++DSO_LDOPTS += -R'/opt/csw/lib/$$ISALIST' -M /home/grzemba/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z combreloc -z defs -z ignore
+ 
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)

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


From cgrzemba at users.sourceforge.net  Wed May  6 09:15:23 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 07:15:23 +0000
Subject: SF.net SVN: gar:[24936]
	csw/mgar/pkg/lang-java/jss/branches/fromfedora/ Makefile
Message-ID: <3lhTj16Hthzd5@mail.opencsw.org>

Revision: 24936
          http://sourceforge.net/p/gar/code/24936
Author:   cgrzemba
Date:     2015-05-06 07:15:23 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: reorg package content, add jss4.jar for 64bit

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-06 06:07:53 UTC (rev 24935)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-06 07:15:23 UTC (rev 24936)
@@ -60,6 +60,7 @@
 PATCHFILES += 0025-jss-support-TLS1_1-TLS1_2.patch
 PATCHFILES += 0026-SunOS5.mk.patch
 
+MERGE_INCLUDE_FILES += $(datadir)/java/64/jss4.jar
 PACKAGES += CSWjss4
 CATALOGNAME_CSWjss4 = jss4
 SPKG_DESC_CSWjss4 += $(DESCRIPTION), jss4.jar, libjss4.so
@@ -74,11 +75,9 @@
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 
-
-
 PACKAGES += CSWjss4-doc
 CATALOGNAME_CSWjss4-doc = jss4_doc
-PKGFILES_CSWjss4-doc = $(PKGFILES_DOC)
+PKGFILES_CSWjss4-doc = $(call baseisadirs,$(datadir)/jssdoc,.*)
 SPKG_DESC_CSWjss4-doc += $(DESCRIPTION), javadoc
 ARCHALL_CSWjss4-doc = 1
 

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


From rmottola at users.sourceforge.net  Wed May  6 10:48:08 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Wed,  6 May 2015 08:48:08 +0000
Subject: SF.net SVN: gar:[24937] csw/mgar/pkg/libpng/trunk/Makefile
Message-ID: <3lhWm73mHPzqW@mail.opencsw.org>

Revision: 24937
          http://sourceforge.net/p/gar/code/24937
Author:   rmottola
Date:     2015-05-06 08:48:07 +0000 (Wed, 06 May 2015)
Log Message:
-----------
libpng/trunk: versioned dev package

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

Modified: csw/mgar/pkg/libpng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpng/trunk/Makefile	2015-05-06 07:15:23 UTC (rev 24936)
+++ csw/mgar/pkg/libpng/trunk/Makefile	2015-05-06 08:48:07 UTC (rev 24937)
@@ -34,10 +34,10 @@
 PACKAGING_PLATFORMS += solaris10-i386
 
 
-PACKAGES += CSWlibpng-dev
-SPKG_DESC_CSWlibpng-dev += $(DESCRIPTION), development files
-RUNTIME_DEP_PKGS_CSWlibpng-dev += CSWlibpng16-16
-BUILD_DEP_PKGS_CSWlibpng-dev += CSWlibz-dev
+PACKAGES += CSWlibpng16-dev
+SPKG_DESC_CSWlibpng16-dev += $(DESCRIPTION), development files
+RUNTIME_DEP_PKGS_CSWlibpng16-dev += CSWlibpng16-16
+BUILD_DEP_PKGS_CSWlibpng16-dev += CSWlibz-dev
 
 PACKAGES += CSWlibpng-utils
 SPKG_DESC_CSWlibpng-utils += $(DESCRIPTION), binary utilities

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


From claudio_sf at users.sourceforge.net  Wed May  6 10:57:28 2015
From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net)
Date: Wed,  6 May 2015 08:57:28 +0000
Subject: SF.net SVN: gar:[24938] csw/mgar/pkg/perl/trunk/Makefile
Message-ID: <3lhWyp20Zczsv@mail.opencsw.org>

Revision: 24938
          http://sourceforge.net/p/gar/code/24938
Author:   claudio_sf
Date:     2015-05-06 08:57:28 +0000 (Wed, 06 May 2015)
Log Message:
-----------
perl/trunk: GCC5 build

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

Modified: csw/mgar/pkg/perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/perl/trunk/Makefile	2015-05-06 08:48:07 UTC (rev 24937)
+++ csw/mgar/pkg/perl/trunk/Makefile	2015-05-06 08:57:28 UTC (rev 24938)
@@ -26,7 +26,7 @@
 LICENSE = Copying
 
 # GCC build (Sun Studio build has been fixed)
-GARCOMPILER = GCC4
+GARCOMPILER = GCC5
 MAKE_OPT_unstable10s = -j 24
 MAKE_OPT_unstable10x = -j 4
 MAKE_OPT = $(MAKE_OPT_$(shell hostname))

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


From cgrzemba at users.sourceforge.net  Wed May  6 11:17:53 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 09:17:53 +0000
Subject: SF.net SVN: gar:[24939] csw/mgar/pkg/lang-java/idm-console-base/trunk
Message-ID: <3lhXQR3RSQzwP@mail.opencsw.org>

Revision: 24939
          http://sourceforge.net/p/gar/code/24939
Author:   cgrzemba
Date:     2015-05-06 09:17:53 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/idm-console-base/trunk: update version 1.1.9

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
    csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2015-05-06 08:57:28 UTC (rev 24938)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2015-05-06 09:17:53 UTC (rev 24939)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = idm-console-framework
-VERSION = 1.1.7
+VERSION = 1.1.9
 MAJOR_VERSION = 1.1
 GARTYPE = v2
 CATEGORIES = java
@@ -13,7 +13,7 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389.org/sources
+MASTER_SITES = http://www.port389.org/binaries/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 BUNDLE = 389-ds
@@ -40,17 +40,20 @@
 INSTALL_SCRIPTS = custom
 
 CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Framework
-# CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-mcc-1.1_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar
+CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-mcc_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar
+CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-nmclf-1.1_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar
+CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-nmclf_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar
 
 include gar/category.mk
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-base-$(VERSION).jar $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc-$(VERSION).jar $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf-$(VERSION).jar $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-base.jar $(DESTDIR)$(datadir)/java/idm-console-base-$(VERSION).jar
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc.jar $(DESTDIR)$(datadir)/java/idm-console-mcc-$(VERSION).jar
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc_en.jar $(DESTDIR)$(datadir)/java/idm-console-mcc_en-$(VERSION).jar
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf.jar $(DESTDIR)$(datadir)/java/idm-console-nmclf-$(VERSION).jar
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf_en.jar $(DESTDIR)$(datadir)/java/idm-console-nmclf_en-$(VERSION).jar
 	@( cd $(DESTDIR)$(datadir)/java ; \
 	   ln -s idm-console-base-$(VERSION).jar idm-console-base-$(MAJOR_VERSION).jar ; \
 	   ln -s idm-console-base-$(VERSION).jar idm-console-base.jar ; \

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums	2015-05-06 08:57:28 UTC (rev 24938)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums	2015-05-06 09:17:53 UTC (rev 24939)
@@ -1 +1 @@
-14bfcf3848b57711a665b3cea45756ea  idm-console-framework-1.1.7.tar.bz2
+5972f92b8bd1c6b91e52a46e73e1514f  idm-console-framework-1.1.9.tar.bz2

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


From cgrzemba at users.sourceforge.net  Wed May  6 11:37:25 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 09:37:25 +0000
Subject: SF.net SVN: gar:[24940] csw/mgar/pkg/lang-java/389-console/trunk
Message-ID: <3lhXrx2D1Kz131@mail.opencsw.org>

Revision: 24940
          http://sourceforge.net/p/gar/code/24940
Author:   cgrzemba
Date:     2015-05-06 09:37:25 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/389-console/trunk: update version 1.1.9

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile
    csw/mgar/pkg/lang-java/389-console/trunk/checksums

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2015-05-06 09:17:53 UTC (rev 24939)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2015-05-06 09:37:25 UTC (rev 24940)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = 389-console
-VERSION = 1.1.7
+VERSION = 1.1.9
 MAJOR_VERSION = 1.1
 GARTYPE = v2
 CATEGORIES = java
@@ -14,8 +14,10 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389.org/sources
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# MASTER_SITES = http://port389.org/sources/
+MASTER_SITES = https://git.fedorahosted.org/cgit/389/console.git/snapshot/
+DISTNAME = console-$(NAME)-$(VERSION)
+DISTFILES  = $(DISTNAME).tar.bz2
 
 BUNDLE = 389-ds
 
@@ -43,7 +45,7 @@
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
 	@ginstall -d $(DESTDIR)$(bindir)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/$(NAME)-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/$(NAME)_en.jar $(DESTDIR)$(datadir)/java/$(NAME)-$(VERSION)_en.jar
 	@ginstall -m 755 $(WORKSRC)/$(DISTNAME)/389-console $(DESTDIR)$(bindir)
 	@( cd $(DESTDIR)$(datadir)/java ; \
 	   ln -s $(NAME)-$(VERSION)_en.jar $(NAME)-$(MAJOR_VERSION)_en.jar ; \
@@ -63,7 +65,7 @@
 	@$(MAKECOOKIE)
 
 build-custom:
-	@( cd $(WORKSRC)/$(DISTNAME); \
+	( cd $(WORKSRC)/$(DISTNAME); \
 	  pwd; \
-	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java -Dconsole.local.location=/opt/csw/share/java )
+	  ant -Dbuilt.dir=`pwd`/built -Dlib.dir=$(libdir) -Dclassdest=$(datadir)/java -Dldapjdk.local.location=$(datadir)/java -Djss.local.location=$(datadir)/java -Dman.dir=$(INSTALLISADIR)/$(mandir) -Dconsole.local.location=$(datadir)/java )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/lang-java/389-console/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/checksums	2015-05-06 09:17:53 UTC (rev 24939)
+++ csw/mgar/pkg/lang-java/389-console/trunk/checksums	2015-05-06 09:37:25 UTC (rev 24940)
@@ -1 +1 @@
-e2c92a908c633fffe79de8add27906c6  389-console-1.1.7.tar.bz2
+4582d568a34ecc73f35ad17942700af3  console-389-console-1.1.9.tar.bz2

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


From cgrzemba at users.sourceforge.net  Wed May  6 12:12:41 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 10:12:41 +0000
Subject: SF.net SVN: gar:[24941] csw/mgar/pkg/lang-java/389-admin-console/trunk
Message-ID: <3lhYdc5J8tz18l@mail.opencsw.org>

Revision: 24941
          http://sourceforge.net/p/gar/code/24941
Author:   cgrzemba
Date:     2015-05-06 10:12:41 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/389-admin-console/trunk: update version 1.1.10

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
    csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2015-05-06 09:37:25 UTC (rev 24940)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2015-05-06 10:12:41 UTC (rev 24941)
@@ -3,7 +3,7 @@
 #
 NAME = 389-admin-console
 SHORTNAME = 389-admin
-VERSION = 1.1.8
+VERSION = 1.1.10
 MAJOR_VERSION = 1.1
 GARTYPE = v2
 CATEGORIES = java
@@ -14,8 +14,9 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389.org/sources
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = https://git.fedorahosted.org/cgit/389/admin-console.git/snapshot/
+DISTNAME = admin-console-$(NAME)-$(VERSION)
+DISTFILES  = $(DISTNAME).tar.xz
 
 BUNDLE = 389-ds
 

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums	2015-05-06 09:37:25 UTC (rev 24940)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums	2015-05-06 10:12:41 UTC (rev 24941)
@@ -1 +1 @@
-7228ce57aa01fb8321a083f676de32f4  389-admin-console-1.1.8.tar.bz2
+e13b0561245d59a7a7598d53e4cd9ef0  admin-console-389-admin-console-1.1.10.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  Wed May  6 15:26:55 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 13:26:55 +0000
Subject: SF.net SVN: gar:[24942] csw/mgar/pkg/librecad/trunk/Makefile
Message-ID: <3lhdxk0kk6z1J3@mail.opencsw.org>

Revision: 24942
          http://sourceforge.net/p/gar/code/24942
Author:   cgrzemba
Date:     2015-05-06 13:26:55 +0000 (Wed, 06 May 2015)
Log Message:
-----------
librecad/trunk: update version 2.0.7

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

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2015-05-06 10:12:41 UTC (rev 24941)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2015-05-06 13:26:55 UTC (rev 24942)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = LibreCAD
-VERSION = 2.0.0rc2
+VERSION = 2.0.7
 GIT_VERSION = $(VERSION)
 GARTYPE = v2
 CATEGORIES = gnome
@@ -57,8 +57,6 @@
 RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2
 # RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4
 # CHECKPKG_OVERRIDES_CSWlibrecad += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad
-OBSOLETED_BY_CSWlibrecad = CSWLibreCAD
-CHECKPKG_OVERRIDES_CSWLibreCAD += catalogname-not-lowercase
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

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


From cgrzemba at users.sourceforge.net  Wed May  6 15:39:49 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 13:39:49 +0000
Subject: SF.net SVN: gar:[24943] csw/mgar/pkg/librecad/trunk/Makefile
Message-ID: <3lhfDg1TK6z1Lm@mail.opencsw.org>

Revision: 24943
          http://sourceforge.net/p/gar/code/24943
Author:   cgrzemba
Date:     2015-05-06 13:39:49 +0000 (Wed, 06 May 2015)
Log Message:
-----------
librecad/trunk: add checkpkg override

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

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2015-05-06 13:26:55 UTC (rev 24942)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2015-05-06 13:39:49 UTC (rev 24943)
@@ -56,7 +56,7 @@
 RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2
 # RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4
-# CHECKPKG_OVERRIDES_CSWlibrecad += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad
+CHECKPKG_OVERRIDES_CSWlibrecad += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

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


From cgrzemba at users.sourceforge.net  Wed May  6 16:55:54 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  6 May 2015 14:55:54 +0000
Subject: SF.net SVN: gar:[24944] csw/mgar/pkg/lang-java/ldapjdk/trunk
Message-ID: <3lhgwQ5HCYz1Px@mail.opencsw.org>

Revision: 24944
          http://sourceforge.net/p/gar/code/24944
Author:   cgrzemba
Date:     2015-05-06 14:55:54 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/ldapjdk/trunk: update 4.18

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
    csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch

Modified: csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2015-05-06 13:39:49 UTC (rev 24943)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2015-05-06 14:55:54 UTC (rev 24944)
@@ -1,10 +1,10 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = ldapsdk_java
-VERSION = 20020819
+NAME = ldapjdk
+VERSION = 4.18
 GARTYPE = v2
-CATEGORIES = java
+# CATEGORIES = java
 
 DESCRIPTION = Mozilla LDAP SDK for Java
 define BLURB
@@ -14,8 +14,10 @@
 endef
 
 # MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk
-MASTER_SITES = http://www-archive.mozilla.org/directory
-DISTFILES  = $(NAME)_$(VERSION).tar.gz
+# MASTER_SITES = http://www-archive.mozilla.org/directory/
+MASTER_SITES = http://pki.fedoraproject.org/pki/sources/ldapjdk/
+DISTNAME = $(NAME)-$(VERSION)
+# DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += COPYING
 
 PACKAGES = CSWldapjdk
@@ -32,8 +34,10 @@
 LICENSE = COPYING
 # LICENSE = $(WORKDIR)/$(DISTDIR)/relnotes.htm
 
-JAVA_HOME = /usr/j2sdk1.4.2_17
+PATCHFILES += 0001-matching-rule-parsing.patch
 
+# JAVA_HOME = /usr/j2sdk1.4.2_17
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
@@ -43,11 +47,12 @@
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
 	@$(MAKECOOKIE)
 
 build-custom:
-	@( cd $(WORKSRC)/$(DISTDIR); \
-	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.4 ; \
+	@( cd $(WORKSRC)/$(DISTNAME)/$(DISTDIR); \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.7 ; \
 	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk basepackage )
 	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums	2015-05-06 13:39:49 UTC (rev 24943)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums	2015-05-06 14:55:54 UTC (rev 24944)
@@ -1 +1 @@
-f0eef8fc5c4961cdebdd9b9188228431  ldapsdk_java_20020819.tar.gz
+5c37162e72acba3a224c5f3e434c7bdc  ldapjdk-4.18.tar.gz

Added: csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch	2015-05-06 14:55:54 UTC (rev 24944)
@@ -0,0 +1,13 @@
+--- ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java	Fri Feb 18 09:02:26 2011 -0700
++++ ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java	Thu Mar 10 13:51:04 2011 -0800
+@@ -544,6 +544,10 @@
+         for( int i = 0; i < names.length; i++ ) {
+             String[] vals = getQualifier( names[i] );
+             if ( (vals != null) && (vals.length > 0) ) {
++                // need a space between elements
++                if (i > 0) {
++                    s += ' ';
++                }
+                 s += names[i] + ' ' + vals[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  Thu May  7 09:19:43 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  7 May 2015 07:19:43 +0000
Subject: SF.net SVN: gar:[24945] csw/mgar/pkg/tmux/trunk
Message-ID: <3lj5lY735hz9y@mail.opencsw.org>

Revision: 24945
          http://sourceforge.net/p/gar/code/24945
Author:   dmichelsen
Date:     2015-05-07 07:19:42 +0000 (Thu, 07 May 2015)
Log Message:
-----------
tmux/trunk: Update to 2.0

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

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2015-05-06 14:55:54 UTC (rev 24944)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2015-05-07 07:19:42 UTC (rev 24945)
@@ -1,5 +1,5 @@
 NAME = tmux
-VERSION = 1.9a
+VERSION = 2.0
 GARTYPE = v2
 
 DESCRIPTION = Terminal Multiplexer

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2015-05-06 14:55:54 UTC (rev 24944)
+++ csw/mgar/pkg/tmux/trunk/checksums	2015-05-07 07:19:42 UTC (rev 24945)
@@ -1 +1 @@
-b07601711f96f1d260b390513b509a2d  tmux-1.9a.tar.gz
+9fb6b443392c3978da5d599f1e814eaa  tmux-2.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 May  7 09:52:27 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu,  7 May 2015 07:52:27 +0000
Subject: SF.net SVN: gar:[24946] csw/mgar/pkg/libevent2/trunk
Message-ID: <3lj6TL6rVjzDd@mail.opencsw.org>

Revision: 24946
          http://sourceforge.net/p/gar/code/24946
Author:   dmichelsen
Date:     2015-05-07 07:52:27 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libevent2/trunk: Update to 2.0.22

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

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2015-05-07 07:19:42 UTC (rev 24945)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2015-05-07 07:52:27 UTC (rev 24946)
@@ -1,5 +1,5 @@
 NAME = libevent
-VERSION = 2.0.21
+VERSION = 2.0.22
 GARTYPE = v2
 
 DESCRIPTION = Event notification library
@@ -10,7 +10,7 @@
   regular timeouts.
 endef
 
-MASTER_SITES = http://github.com/downloads/libevent/libevent/
+MASTER_SITES += https://sourceforge.net/projects/levent/files/libevent/libevent-2.0/
 DISTNAME = $(NAME)-$(VERSION)-stable
 DISTFILES += $(DISTNAME).tar.gz
 
@@ -64,5 +64,10 @@
 
 TEST_TARGET = verify
 
+# There is one assertion failing:
+#   https://sourceforge.net/p/levent/bugs/355/
+# Skip testsuite until this is fixed
+SKIPTEST ?= 1
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/libevent2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libevent2/trunk/checksums	2015-05-07 07:19:42 UTC (rev 24945)
+++ csw/mgar/pkg/libevent2/trunk/checksums	2015-05-07 07:52:27 UTC (rev 24946)
@@ -1 +1 @@
-b2405cc9ebf264aa47ff615d9de527a2  libevent-2.0.21-stable.tar.gz
+c4c56f986aa985677ca1db89630a2e11  libevent-2.0.22-stable.tar.gz

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


From rmottola at users.sourceforge.net  Thu May  7 09:55:39 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu,  7 May 2015 07:55:39 +0000
Subject: SF.net SVN: gar:[24947] csw/mgar/pkg/libpng/branches
Message-ID: <3lj6Y20rP6zH1@mail.opencsw.org>

Revision: 24947
          http://sourceforge.net/p/gar/code/24947
Author:   rmottola
Date:     2015-05-07 07:55:39 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libpng/branches/libpng15: versioned libpng15 branch, removed symlink to pkg-config package

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libpng/branches/libpng15/

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/trunk/Makefile	2015-03-31 20:53:53 UTC (rev 24792)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 07:55:39 UTC (rev 24947)
@@ -27,10 +27,15 @@
 EXTRA_BUILD_ISAS += sparcv8plus+vis2
 EXTRA_BUILD_ISAS += pentium_pro
 
-PACKAGES = CSWlibpng-dev
-SPKG_DESC_CSWlibpng-dev = $(DESCRIPTION), development files
-RUNTIME_DEP_PKGS_CSWlibpng-dev += CSWlibpng15-15
+#we need a versioned developer package, since the pkg-config package is versioned 
+#and has an unversioned symlink
+PACKAGES = CSWlibpng15-dev
+SPKG_DESC_CSWlibpng15-dev = $(DESCRIPTION), development files
+RUNTIME_DEP_PKGS_CSWlibpng15-dev += CSWlibpng15-15
 
+#we obsolete the unversioned developer package
+OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
+
 PACKAGES += CSWlibpng15-15
 CATALOGNAME_CSWlibpng15-15 = libpng15_15
 PKGFILES_CSWlibpng15-15 += $(call baseisadirs,$(libdir),libpng15\.so\.15(\.\d+)*)
@@ -44,3 +49,9 @@
 BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
+
+
+post-install:
+#we remove the symlink for this package only which is now superseded by 16
+	rm -f $(DESTDIR)$(libdir)/libpng.pc
+	@$(MAKECOOKIE)

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


From rmottola at users.sourceforge.net  Thu May  7 10:01:14 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu,  7 May 2015 08:01:14 +0000
Subject: SF.net SVN: gar:[24948] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3lj6gX2F7NzKN@mail.opencsw.org>

Revision: 24948
          http://sourceforge.net/p/gar/code/24948
Author:   rmottola
Date:     2015-05-07 08:01:14 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libpng/branches/libpng15: enable 9 and 10 plaforms

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 07:55:39 UTC (rev 24947)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 08:01:14 UTC (rev 24948)
@@ -27,6 +27,13 @@
 EXTRA_BUILD_ISAS += sparcv8plus+vis2
 EXTRA_BUILD_ISAS += pentium_pro
 
+#where can we build?
+PACKAGING_PLATFORMS += solaris9-sparc
+PACKAGING_PLATFORMS += solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+
 #we need a versioned developer package, since the pkg-config package is versioned 
 #and has an unversioned symlink
 PACKAGES = CSWlibpng15-dev

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


From rmottola at users.sourceforge.net  Thu May  7 10:36:21 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu,  7 May 2015 08:36:21 +0000
Subject: SF.net SVN: gar:[24949] csw/mgar/pkg/libpng/trunk/Makefile
Message-ID: <3lj7S268jzzZ0@mail.opencsw.org>

Revision: 24949
          http://sourceforge.net/p/gar/code/24949
Author:   rmottola
Date:     2015-05-07 08:36:21 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libpng/trunk: add obsoltetion of unversioned package

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

Modified: csw/mgar/pkg/libpng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpng/trunk/Makefile	2015-05-07 08:01:14 UTC (rev 24948)
+++ csw/mgar/pkg/libpng/trunk/Makefile	2015-05-07 08:36:21 UTC (rev 24949)
@@ -38,6 +38,7 @@
 SPKG_DESC_CSWlibpng16-dev += $(DESCRIPTION), development files
 RUNTIME_DEP_PKGS_CSWlibpng16-dev += CSWlibpng16-16
 BUILD_DEP_PKGS_CSWlibpng16-dev += CSWlibz-dev
+OBSOLETED_BY_CSWlibpng16-dev += CSWlibpng-dev
 
 PACKAGES += CSWlibpng-utils
 SPKG_DESC_CSWlibpng-utils += $(DESCRIPTION), binary utilities

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


From rmottola at users.sourceforge.net  Thu May  7 13:15:27 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu,  7 May 2015 11:15:27 +0000
Subject: SF.net SVN: gar:[24950] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3ljBzg67zczvN@mail.opencsw.org>

Revision: 24950
          http://sourceforge.net/p/gar/code/24950
Author:   rmottola
Date:     2015-05-07 11:15:27 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libpng/branches/libpng15: we can have only one obsoletion, so let it be in 16 which is newer

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 08:36:21 UTC (rev 24949)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 11:15:27 UTC (rev 24950)
@@ -41,7 +41,7 @@
 RUNTIME_DEP_PKGS_CSWlibpng15-dev += CSWlibpng15-15
 
 #we obsolete the unversioned developer package
-OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
+#OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
 
 PACKAGES += CSWlibpng15-15
 CATALOGNAME_CSWlibpng15-15 = libpng15_15

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


From cgrzemba at users.sourceforge.net  Thu May  7 15:25:10 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  7 May 2015 13:25:10 +0000
Subject: SF.net SVN: gar:[24951] csw/mgar/pkg/lang-java/389-console/branches/
	older-tests/
Message-ID: <3ljFsD67gJz13K@mail.opencsw.org>

Revision: 24951
          http://sourceforge.net/p/gar/code/24951
Author:   cgrzemba
Date:     2015-05-07 13:25:10 +0000 (Thu, 07 May 2015)
Log Message:
-----------
try older versions

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/branches/older-tests/

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


From cgrzemba at users.sourceforge.net  Thu May  7 15:36:42 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  7 May 2015 13:36:42 +0000
Subject: SF.net SVN: gar:[24952] csw/mgar/pkg/lang-java/389-console/branches/
	older-tests/trunk/
Message-ID: <3ljG6W0Zysz15n@mail.opencsw.org>

Revision: 24952
          http://sourceforge.net/p/gar/code/24952
Author:   cgrzemba
Date:     2015-05-07 13:36:41 +0000 (Thu, 07 May 2015)
Log Message:
-----------
try older versions

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/branches/older-tests/trunk/

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


From cgrzemba at users.sourceforge.net  Thu May  7 15:41:45 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  7 May 2015 13:41:45 +0000
Subject: SF.net SVN: gar:[24953] csw/mgar/pkg/lang-java/389-console/branches/
	older-tests/
Message-ID: <3ljGDL2MgTz18B@mail.opencsw.org>

Revision: 24953
          http://sourceforge.net/p/gar/code/24953
Author:   cgrzemba
Date:     2015-05-07 13:41:45 +0000 (Thu, 07 May 2015)
Log Message:
-----------
back

Removed Paths:
-------------
    csw/mgar/pkg/lang-java/389-console/branches/older-tests/

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


From cgrzemba at users.sourceforge.net  Thu May  7 15:42:13 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  7 May 2015 13:42:13 +0000
Subject: SF.net SVN: gar:[24954] csw/mgar/pkg/lang-java/389-console/branches/
	older-tests/
Message-ID: <3ljGDs4gKzz1BX@mail.opencsw.org>

Revision: 24954
          http://sourceforge.net/p/gar/code/24954
Author:   cgrzemba
Date:     2015-05-07 13:42:12 +0000 (Thu, 07 May 2015)
Log Message:
-----------
try previous version

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/branches/older-tests/

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


From cgrzemba at users.sourceforge.net  Thu May  7 16:52:11 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  7 May 2015 14:52:11 +0000
Subject: SF.net SVN: gar:[24955] csw/mgar/pkg/lang-java/idm-console-base/trunk/
	Makefile
Message-ID: <3ljHnn3b0Xz1FT@mail.opencsw.org>

Revision: 24955
          http://sourceforge.net/p/gar/code/24955
Author:   cgrzemba
Date:     2015-05-07 14:52:10 +0000 (Thu, 07 May 2015)
Log Message:
-----------
lang-java/idm-console-base/trunk: fix sym links

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2015-05-07 13:42:12 UTC (rev 24954)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2015-05-07 14:52:10 UTC (rev 24955)
@@ -40,31 +40,23 @@
 INSTALL_SCRIPTS = custom
 
 CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Framework
-CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-mcc-1.1_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar
-CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-mcc_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-mcc-1.1.9_en.jar
-CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-nmclf-1.1_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar
-CHECKPKG_OVERRIDES_CSWidm-console-base += file-needed-but-no-package-satisfies-it|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar|CSWidm-console-base|contains|symlink|/opt/csw/share/java/idm-console-nmclf_en.jar|which|needs|the|target|file:|/opt/csw/share/java/idm-console-nmclf-1.1.9_en.jar
 
 include gar/category.mk
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-base.jar $(DESTDIR)$(datadir)/java/idm-console-base-$(VERSION).jar
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc.jar $(DESTDIR)$(datadir)/java/idm-console-mcc-$(VERSION).jar
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc_en.jar $(DESTDIR)$(datadir)/java/idm-console-mcc_en-$(VERSION).jar
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf.jar $(DESTDIR)$(datadir)/java/idm-console-nmclf-$(VERSION).jar
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf_en.jar $(DESTDIR)$(datadir)/java/idm-console-nmclf_en-$(VERSION).jar
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-base.jar $(DESTDIR)$(datadir)/java/
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc.jar $(DESTDIR)$(datadir)/java/
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc_en.jar $(DESTDIR)$(datadir)/java/
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf.jar $(DESTDIR)$(datadir)/java/
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf_en.jar $(DESTDIR)$(datadir)/java/
 	@( cd $(DESTDIR)$(datadir)/java ; \
 	   ln -s idm-console-base-$(VERSION).jar idm-console-base-$(MAJOR_VERSION).jar ; \
-	   ln -s idm-console-base-$(VERSION).jar idm-console-base.jar ; \
-	   ln -s idm-console-mcc-$(VERSION).jar idm-console-mcc-$(MAJOR_VERSION).jar ; \
-	   ln -s idm-console-mcc-$(VERSION).jar idm-console-mcc.jar ; \
-	   ln -s idm-console-mcc-$(VERSION)_en.jar idm-console-mcc-$(MAJOR_VERSION)_en.jar ; \
-	   ln -s idm-console-mcc-$(VERSION)_en.jar idm-console-mcc_en.jar ; \
-	   ln -s idm-console-nmclf-$(VERSION).jar idm-console-nmclf-$(MAJOR_VERSION).jar ; \
-	   ln -s idm-console-nmclf-$(VERSION).jar idm-console-nmclf.jar ; \
-	   ln -s idm-console-nmclf-$(VERSION)_en.jar idm-console-nmclf-$(MAJOR_VERSION)_en.jar ; \
-	   ln -s idm-console-nmclf-$(VERSION)_en.jar idm-console-nmclf_en.jar )
+	   ln -s idm-console-base.jar idm-console-base-$(VERSION).jar ; \
+	   ln -s idm-console-mcc.jar idm-console-mcc-$(VERSION).jar ; \
+	   ln -s idm-console-mcc_en.jar idm-console-mcc-$(VERSION)_en.jar ; \
+	   ln -s idm-console-nmclf.jar idm-console-nmclf-$(VERSION).jar ; \
+	   ln -s idm-console-nmclf_en.jar idm-console-nmclf-$(VERSION)_en.jar )
 	@$(MAKECOOKIE)
 
 build-custom:

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


From rmottola at users.sourceforge.net  Thu May  7 20:25:56 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu,  7 May 2015 18:25:56 +0000
Subject: SF.net SVN: gar:[24956] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3ljNXG0f0gz1K5@mail.opencsw.org>

Revision: 24956
          http://sourceforge.net/p/gar/code/24956
Author:   rmottola
Date:     2015-05-07 18:25:55 +0000 (Thu, 07 May 2015)
Log Message:
-----------
libpng/branches/libpng15: try obsoletion anyway... cross fingers

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 14:52:10 UTC (rev 24955)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 18:25:55 UTC (rev 24956)
@@ -41,7 +41,7 @@
 RUNTIME_DEP_PKGS_CSWlibpng15-dev += CSWlibpng15-15
 
 #we obsolete the unversioned developer package
-#OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
+OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
 
 PACKAGES += CSWlibpng15-15
 CATALOGNAME_CSWlibpng15-15 = libpng15_15

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


From rmottola at users.sourceforge.net  Fri May  8 17:26:58 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri,  8 May 2015 15:26:58 +0000
Subject: SF.net SVN: gar:[24957] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3ljwWX24CtzPn@mail.opencsw.org>

Revision: 24957
          http://sourceforge.net/p/gar/code/24957
Author:   rmottola
Date:     2015-05-08 15:26:58 +0000 (Fri, 08 May 2015)
Log Message:
-----------
libpng/branches/libpng15: remove also symlink of .so

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-07 18:25:55 UTC (rev 24956)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-08 15:26:58 UTC (rev 24957)
@@ -61,4 +61,5 @@
 post-install:
 #we remove the symlink for this package only which is now superseded by 16
 	rm -f $(DESTDIR)$(libdir)/libpng.pc
+	rm -f $(DESTDIR)$(libdir)/libpng.so
 	@$(MAKECOOKIE)

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


From rmottola at users.sourceforge.net  Sun May 10 22:26:39 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Sun, 10 May 2015 20:26:39 +0000
Subject: SF.net SVN: gar:[24958] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3llH4H5KYcz1R7@mail.opencsw.org>

Revision: 24958
          http://sourceforge.net/p/gar/code/24958
Author:   rmottola
Date:     2015-05-10 20:26:39 +0000 (Sun, 10 May 2015)
Log Message:
-----------
libpng/branches/libpng15: opposite approach: package in dev only the minimum stuff

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-08 15:26:58 UTC (rev 24957)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-10 20:26:39 UTC (rev 24958)
@@ -40,6 +40,11 @@
 SPKG_DESC_CSWlibpng15-dev = $(DESCRIPTION), development files
 RUNTIME_DEP_PKGS_CSWlibpng15-dev += CSWlibpng15-15
 
+#we package in only certain versioned files
+PKGFILES_CSWlibpng15-dev += $(call baseisadirs,$(libdir),libpng15-config)
+PKGFILES_CSWlibpng15-dev += $(call baseisadirs,$(libdir),pkgconfig/libpng15.pc)
+PKGFILES_CSWlibpng15-dev += $(call baseisadirs,$(libdir),include/libpng16/*)
+
 #we obsolete the unversioned developer package
 OBSOLETED_BY_CSWlibpng15-dev = CSWlibpng-dev
 
@@ -50,16 +55,8 @@
 RUNTIME_DEP_PKGS_CSWlibpng += CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWlibpng15-15 += CSWlibz1
 
-# The CSWpng package must also pull in libpng.so.3 and libpng12.so.0
-OBSOLETED_BY_CSWlibpng15-15 = CSWpng
 
 BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 
-
-post-install:
-#we remove the symlink for this package only which is now superseded by 16
-	rm -f $(DESTDIR)$(libdir)/libpng.pc
-	rm -f $(DESTDIR)$(libdir)/libpng.so
-	@$(MAKECOOKIE)

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


From rmottola at users.sourceforge.net  Sun May 10 22:34:39 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Sun, 10 May 2015 20:34:39 +0000
Subject: SF.net SVN: gar:[24959] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3llHFP0Zg2z1TT@mail.opencsw.org>

Revision: 24959
          http://sourceforge.net/p/gar/code/24959
Author:   rmottola
Date:     2015-05-10 20:34:39 +0000 (Sun, 10 May 2015)
Log Message:
-----------
libpng/branches/libpng15: override, we surely want it, even if we don't symlink to any of its files

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-10 20:26:39 UTC (rev 24958)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-10 20:34:39 UTC (rev 24959)
@@ -58,5 +58,7 @@
 
 BUILD64_LIBS_ONLY = 1
 
+CHECKPKG_OVERRIDES_CSWlibpng15-dev += surplus-dependency|CSWlibpng15-15
+
 include gar/category.mk
 

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


From cgrzemba at users.sourceforge.net  Mon May 11 09:39:58 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 11 May 2015 07:39:58 +0000
Subject: SF.net SVN: gar:[24960] csw/mgar/pkg/nspr/trunk/Makefile
Message-ID: <3llZ143d74z5D@mail.opencsw.org>

Revision: 24960
          http://sourceforge.net/p/gar/code/24960
Author:   cgrzemba
Date:     2015-05-11 07:39:57 +0000 (Mon, 11 May 2015)
Log Message:
-----------
set studio compiler

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2015-05-10 20:34:39 UTC (rev 24959)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2015-05-11 07:39:57 UTC (rev 24960)
@@ -25,7 +25,8 @@
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-GARCOMPILER = GCC4
+# GARCOMPILER = GCC4
+GARCOMPILER = SOS12U4
 GARFLAVOR = DBG
 
 # Library splits

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 May 11 09:47:05 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 11 May 2015 07:47:05 +0000
Subject: SF.net SVN: gar:[24961] csw/mgar/pkg/nspr/trunk/Makefile
Message-ID: <3llZ9G3gJhz7l@mail.opencsw.org>

Revision: 24961
          http://sourceforge.net/p/gar/code/24961
Author:   cgrzemba
Date:     2015-05-11 07:47:05 +0000 (Mon, 11 May 2015)
Log Message:
-----------
nspr/trunk: disable debug

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2015-05-11 07:39:57 UTC (rev 24960)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2015-05-11 07:47:05 UTC (rev 24961)
@@ -27,7 +27,7 @@
 
 # GARCOMPILER = GCC4
 GARCOMPILER = SOS12U4
-GARFLAVOR = DBG
+# GARFLAVOR = DBG
 
 # Library splits
 

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 May 11 10:17:38 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 11 May 2015 08:17:38 +0000
Subject: SF.net SVN: gar:[24962] csw/mgar/pkg/nspr/trunk/Makefile
Message-ID: <3llZrY03wTzBQ@mail.opencsw.org>

Revision: 24962
          http://sourceforge.net/p/gar/code/24962
Author:   cgrzemba
Date:     2015-05-11 08:17:38 +0000 (Mon, 11 May 2015)
Log Message:
-----------
nspr/trunk: fix runtime dependencies

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2015-05-11 07:47:05 UTC (rev 24961)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2015-05-11 08:17:38 UTC (rev 24962)
@@ -35,7 +35,8 @@
 CATALOGNAME_CSWlibnspr4 = libnspr4
 SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime, libnspr4.so
 PKGFILES_CSWlibnspr4 += $(call baseisadirs,$(libdir),libnspr4.so)
-RUNTIME_DEP_PKGS_CSWlibnspr4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibnspr4_GCC4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibnspr4 += $(RUNTIME_DEP_PKGS_CSWlibnspr4_$(GARCOMPILER)) 
 CHECKPKG_OVERRIDES_CSWlibnspr4 += soname-equals-filename
 CHECKPKG_OVERRIDES_CSWlibnspr4 += filename-version-does-not-match-pkginfo-version
 
@@ -44,7 +45,8 @@
 SPKG_DESC_CSWlibplc4 = Netscape Portable Runtime, libplc4.so
 PKGFILES_CSWlibplc4 += $(call baseisadirs,$(libdir),libplc4.so)
 RUNTIME_DEP_PKGS_CSWlibplc4 += CSWlibnspr4
-RUNTIME_DEP_PKGS_CSWlibplc4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibplc4_GCC4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibplc4 += $(RUNTIME_DEP_PKGS_CSWlibplc4_$(GARCOMPILER)) 
 CHECKPKG_OVERRIDES_CSWlibplc4 += soname-equals-filename
 CHECKPKG_OVERRIDES_CSWlibplc4 += filename-version-does-not-match-pkginfo-version
 
@@ -53,7 +55,8 @@
 SPKG_DESC_CSWlibplds4 = Netscape Portable Runtime, libplds4.so
 PKGFILES_CSWlibplds4 += $(call baseisadirs,$(libdir),libplds4.so)
 RUNTIME_DEP_PKGS_CSWlibplds4 += CSWlibnspr4
-RUNTIME_DEP_PKGS_CSWlibplds4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibplds4_GCC4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibplds4 += $(RUNTIME_DEP_PKGS_CSWlibplds4_$(GARCOMPILER)) 
 CHECKPKG_OVERRIDES_CSWlibplds4 += soname-equals-filename
 CHECKPKG_OVERRIDES_CSWlibplds4 += filename-version-does-not-match-pkginfo-version
 

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  Mon May 11 19:27:22 2015
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 11 May 2015 17:27:22 +0000
Subject: SF.net SVN: gar:[24963] csw/mgar/pkg/tor/trunk
Message-ID: <3llq2t0xdlzTy@mail.opencsw.org>

Revision: 24963
          http://sourceforge.net/p/gar/code/24963
Author:   jake_goerzen
Date:     2015-05-11 17:27:21 +0000 (Mon, 11 May 2015)
Log Message:
-----------
tor: update to 0.2.6.7; remove unused patch and clean up recipe

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	2015-05-11 08:17:38 UTC (rev 24962)
+++ csw/mgar/pkg/tor/trunk/Makefile	2015-05-11 17:27:21 UTC (rev 24963)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = tor
-VERSION = 0.2.5.12
+VERSION = 0.2.6.7
 GARTYPE = v2
 
 DESCRIPTION = Secure network traffic router
@@ -8,15 +8,9 @@
 Basically tor provides a distributed network of servers (onion routers). Users bounce their TCP streams (web traffic, ftp, ssh, etc) around the routers, and recipients, observers, and even the routers themselves have difficulty tracking the source of the stream.
 endef
 
-# This is where the source git repo is located but we are building from the
-# official alpha release tar.gz distfile downloaded from MATER_SITES.
-# GIT_REPOS = git://git.torproject.org/tor.git
-
 MASTER_SITES = http://www.torproject.org/dist/
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-add-test-to-detect-we-are-on-Solaris.patch
-
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -54,6 +48,8 @@
 PROTOTYPE_USER_tor = tor
 PROTOTYPE_GROUP_tor = tor
 
+TEST_SCRIPTS =
+
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
 include gar/category.mk

Modified: csw/mgar/pkg/tor/trunk/checksums
===================================================================
--- csw/mgar/pkg/tor/trunk/checksums	2015-05-11 08:17:38 UTC (rev 24962)
+++ csw/mgar/pkg/tor/trunk/checksums	2015-05-11 17:27:21 UTC (rev 24963)
@@ -1 +1 @@
-89745069a7efb7aafd01ae263bd0fe5c  tor-0.2.5.12.tar.gz
+a43b4dc6a95d219927aab0a2bb7ed322  tor-0.2.6.7.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed May 13 13:49:26 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 13 May 2015 11:49:26 +0000
Subject: SF.net SVN: gar:[24964] csw/mgar/pkg
Message-ID: <3lmvSR3W8VzP3@mail.opencsw.org>

Revision: 24964
          http://sourceforge.net/p/gar/code/24964
Author:   dmichelsen
Date:     2015-05-13 11:49:26 +0000 (Wed, 13 May 2015)
Log Message:
-----------
libasr: Initial commit from http://lists.opencsw.org/pipermail/users/2015-May/010057.html

Added Paths:
-----------
    csw/mgar/pkg/libasr/
    csw/mgar/pkg/libasr/Makefile
    csw/mgar/pkg/libasr/branches/
    csw/mgar/pkg/libasr/tags/
    csw/mgar/pkg/libasr/trunk/
    csw/mgar/pkg/libasr/trunk/Makefile
    csw/mgar/pkg/libasr/trunk/checksums
    csw/mgar/pkg/libasr/trunk/files/
    csw/mgar/pkg/libasr/trunk/files/0001-add-openbsd-compat-getifaddrs.c.patch
    csw/mgar/pkg/libasr/trunk/files/0002-fix-possible-MAX-redefinition.patch
    csw/mgar/pkg/libasr/trunk/files/openbsd-compat/
    csw/mgar/pkg/libasr/trunk/files/openbsd-compat/getifaddrs.c
    csw/mgar/pkg/libasr/trunk/files/openbsd-compat/ifaddrs.h

Added: csw/mgar/pkg/libasr/Makefile
===================================================================
--- csw/mgar/pkg/libasr/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libasr/Makefile	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/libasr/trunk
===================================================================
--- csw/mgar/pkg/libasr/trunk	2015-05-11 17:27:21 UTC (rev 24963)
+++ csw/mgar/pkg/libasr/trunk	2015-05-13 11:49:26 UTC (rev 24964)

Property changes on: csw/mgar/pkg/libasr/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/libasr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libasr/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/Makefile	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,59 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libasr
+VERSION = 201505061057
+GARTYPE = v2
+
+DESCRIPTION = libasr is a free, simple and portable asynchronous resolver library.
+define BLURB
+ libasr is a free, simple and portable asynchronous resolver library.
+ 
+ It allows to run dns queries and perform hostname resolutions in a fully asynchronous fashion. The implementation is thread-less, fork-less, and does not make use of signals or other "tricks" that might get in the developer's way. The API was initially developped for the OpenBSD operating system, where it is natively supported.
+ 
+ This library is intended to bring this interface to other systems. It is originally provided as a support library for the portable version of the OpenSMTPD daemon, but it can be used in any other contexts. It is known to work on the following systems:
+ 
+     * Linux
+     * FreeBSD
+     * NetBSD
+     * DragonFly
+     * MacOSX
+ 
+ The primary source of information about libasr is the github repository.
+endef
+
+MASTER_SITES = http://www.opensmtpd.org/archives/
+DISTFILES  = $(DISTNAME).tar.gz
+
+ifneq ($(GAROSREL),11)
+PATCHFILES += 0001-add-openbsd-compat-getifaddrs.c.patch
+endif
+PATCHFILES += 0002-fix-possible-MAX-redefinition.patch
+
+GARCOMPILER = GNU
+
+PACKAGES += CSWlibasr
+CATALOGNAME_CSWlibasr = libasr
+PKGFILES_CSWlibasr += $(call baseisadirs,$(libdir),libasr\.so(\.\d+)*)
+SPKG_DESC_CSWlibasr += $(DESCRIPTION), libasr.so
+
+PACKAGES += CSWlibasr-dev
+CATALOGNAME_CSWlibasr-dev = libasr_dev
+SPKG_DESC_CSWlibasr-dev += $(DESCRIPTION), development files
+RUNTIME_DEP_PKGS_CSWlibasr-dev += CSWlibasr
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-mantype=man
+
+include gar/category.mk
+
+ifneq ($(GAROSREL),11)
+# ifaddrs.h    taken from https://java.net/projects/solaris/sources/on-src/content/usr/src/head/ifaddrs.h?raw=true
+# getifaddrs.c taken from https://java.net/projects/solaris/sources/on-src/content/usr/src/lib/libsocket/inet/getifaddrs.c?raw=true
+# libsocket_priv.h is a gruik hack
+pre-build-modulated:
+	cp $(FILEDIR)/openbsd-compat/ifaddrs.h $(WORKSRC)/openbsd-compat/
+	cp $(FILEDIR)/openbsd-compat/getifaddrs.c $(WORKSRC)/openbsd-compat/
+	cp $(FILEDIR)/openbsd-compat/libsocket_priv.h $(WORKSRC)/openbsd-compat/
+	@$(MAKECOOKIE)
+endif


Property changes on: csw/mgar/pkg/libasr/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/libasr/trunk/checksums
===================================================================
--- csw/mgar/pkg/libasr/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/checksums	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1 @@
+2a4b768b54892465570ef7488e56b737  libasr-201505061057.tar.gz

Added: csw/mgar/pkg/libasr/trunk/files/0001-add-openbsd-compat-getifaddrs.c.patch
===================================================================
--- csw/mgar/pkg/libasr/trunk/files/0001-add-openbsd-compat-getifaddrs.c.patch	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/files/0001-add-openbsd-compat-getifaddrs.c.patch	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,24 @@
+From cf1d038c260ca6fd161174d6c5c42aaee90b1532 Mon Sep 17 00:00:00 2001
+From: Freddy DISSAUX <dsx at bsdsx.fr>
+Date: Thu, 7 May 2015 09:53:12 +0200
+Subject: [PATCH] add openbsd-compat/getifaddrs.c
+
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 286d382..7121b0b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,6 +11,7 @@ libasr_la_SOURCES +=	$(top_srcdir)/openbsd-compat/strlcat.c
+ libasr_la_SOURCES +=	$(top_srcdir)/openbsd-compat/strlcpy.c
+ libasr_la_SOURCES +=	$(top_srcdir)/openbsd-compat/strsep.c
+ libasr_la_SOURCES +=	$(top_srcdir)/openbsd-compat/strtonum.c
++libasr_la_SOURCES +=	$(top_srcdir)/openbsd-compat/getifaddrs.c
+ 
+ include_HEADERS =	asr.h
+ 
+-- 
+2.3.1
+

Added: csw/mgar/pkg/libasr/trunk/files/0002-fix-possible-MAX-redefinition.patch
===================================================================
--- csw/mgar/pkg/libasr/trunk/files/0002-fix-possible-MAX-redefinition.patch	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/files/0002-fix-possible-MAX-redefinition.patch	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,44 @@
+From 104a97a81ae81b29ae5796f9d1e48463b6305635 Mon Sep 17 00:00:00 2001
+From: Freddy DISSAUX <dsx at bsdsx.fr>
+Date: Fri, 8 May 2015 11:01:26 +0200
+Subject: [PATCH] fix possible MAX redefinition
+
+---
+ src/gethostnamadr_async.c | 4 ++++
+ src/getnetnamadr_async.c  | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/gethostnamadr_async.c b/src/gethostnamadr_async.c
+index 2d6ecb7..5d34956 100644
+--- a/src/gethostnamadr_async.c
++++ b/src/gethostnamadr_async.c
+@@ -40,8 +40,12 @@
+ 
+ #include "asr_private.h"
+ 
++#ifndef MAXALIASES
+ #define MAXALIASES	35
++#endif
++#ifndef MAXADDRS
+ #define MAXADDRS	35
++#endif
+ 
+ struct hostent_ext {
+ 	struct hostent	 h;
+diff --git a/src/getnetnamadr_async.c b/src/getnetnamadr_async.c
+index ec14262..cc37ef0 100644
+--- a/src/getnetnamadr_async.c
++++ b/src/getnetnamadr_async.c
+@@ -33,7 +33,9 @@
+ 
+ #include "asr_private.h"
+ 
++#ifndef MAXALIASES
+ #define MAXALIASES	16
++#endif
+ 
+ struct netent_ext {
+ 	struct netent	 n;
+-- 
+2.3.1
+

Added: csw/mgar/pkg/libasr/trunk/files/openbsd-compat/getifaddrs.c
===================================================================
--- csw/mgar/pkg/libasr/trunk/files/openbsd-compat/getifaddrs.c	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/files/openbsd-compat/getifaddrs.c	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,272 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
+#include <netdb.h>
+#include <nss_dbdefs.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/sockio.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+#include <libsocket_priv.h>
+
+/*
+ * Create a linked list of `struct ifaddrs' structures, one for each
+ * address that is UP. If successful, store the list in *ifap and
+ * return 0.  On errors, return -1 and set `errno'.
+ *
+ * The storage returned in *ifap is allocated dynamically and can
+ * only be properly freed by passing it to `freeifaddrs'.
+ */
+int
+getifaddrs(struct ifaddrs **ifap)
+{
+	int		err;
+	char		*cp;
+	struct ifaddrs	*curr;
+
+	if (ifap == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+	*ifap = NULL;
+	err = getallifaddrs(AF_UNSPEC, ifap, LIFC_ENABLED);
+	if (err == 0) {
+		for (curr = *ifap; curr != NULL; curr = curr->ifa_next) {
+			if ((cp = strchr(curr->ifa_name, ':')) != NULL)
+				*cp = '\0';
+		}
+	}
+	return (err);
+}
+
+void
+freeifaddrs(struct ifaddrs *ifa)
+{
+	struct ifaddrs *curr;
+
+	while (ifa != NULL) {
+		curr = ifa;
+		ifa = ifa->ifa_next;
+		free(curr->ifa_name);
+		free(curr->ifa_addr);
+		free(curr->ifa_netmask);
+		free(curr->ifa_dstaddr);
+		free(curr);
+	}
+}
+
+/*
+ * Returns all addresses configured on the system. If flags contain
+ * LIFC_ENABLED, only the addresses that are UP are returned.
+ * Address list that is returned by this function must be freed
+ * using freeifaddrs().
+ */
+int
+getallifaddrs(sa_family_t af, struct ifaddrs **ifap, int64_t flags)
+{
+	struct lifreq *buf = NULL;
+	struct lifreq *lifrp;
+	struct lifreq lifrl;
+	int ret;
+	int s, n, numifs;
+	struct ifaddrs *curr, *prev;
+	sa_family_t lifr_af;
+	int sock4;
+	int sock6;
+	int err;
+
+	if ((sock4 = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+		return (-1);
+	if ((sock6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+		err = errno;
+		close(sock4);
+		errno = err;
+		return (-1);
+	}
+
+retry:
+	/* Get all interfaces from SIOCGLIFCONF */
+	ret = getallifs(sock4, af, &buf, &numifs, (flags & ~LIFC_ENABLED));
+	if (ret != 0)
+		goto fail;
+
+	/*
+	 * Loop through the interfaces obtained from SIOCGLIFCOMF
+	 * and retrieve the addresses, netmask and flags.
+	 */
+	prev = NULL;
+	lifrp = buf;
+	*ifap = NULL;
+	for (n = 0; n < numifs; n++, lifrp++) {
+
+		/* Prepare for the ioctl call */
+		(void) strncpy(lifrl.lifr_name, lifrp->lifr_name,
+		    sizeof (lifrl.lifr_name));
+		lifr_af = lifrp->lifr_addr.ss_family;
+		if (af != AF_UNSPEC && lifr_af != af)
+			continue;
+
+		s = (lifr_af == AF_INET ? sock4 : sock6);
+
+		if (ioctl(s, SIOCGLIFFLAGS, (caddr_t)&lifrl) < 0)
+			goto fail;
+		if ((flags & LIFC_ENABLED) && !(lifrl.lifr_flags & IFF_UP))
+			continue;
+
+		/*
+		 * Allocate the current list node. Each node contains data
+		 * for one ifaddrs structure.
+		 */
+		curr = calloc(1, sizeof (struct ifaddrs));
+		if (curr == NULL)
+			goto fail;
+
+		if (prev != NULL) {
+			prev->ifa_next = curr;
+		} else {
+			/* First node in the linked list */
+			*ifap = curr;
+		}
+		prev = curr;
+
+		curr->ifa_flags = lifrl.lifr_flags;
+		if ((curr->ifa_name = strdup(lifrp->lifr_name)) == NULL)
+			goto fail;
+
+		curr->ifa_addr = malloc(sizeof (struct sockaddr_storage));
+		if (curr->ifa_addr == NULL)
+			goto fail;
+		(void) memcpy(curr->ifa_addr, &lifrp->lifr_addr,
+		    sizeof (struct sockaddr_storage));
+
+		/* Get the netmask */
+		if (ioctl(s, SIOCGLIFNETMASK, (caddr_t)&lifrl) < 0)
+			goto fail;
+		curr->ifa_netmask = malloc(sizeof (struct sockaddr_storage));
+		if (curr->ifa_netmask == NULL)
+			goto fail;
+		(void) memcpy(curr->ifa_netmask, &lifrl.lifr_addr,
+		    sizeof (struct sockaddr_storage));
+
+		/* Get the destination for a pt-pt interface */
+		if (curr->ifa_flags & IFF_POINTOPOINT) {
+			if (ioctl(s, SIOCGLIFDSTADDR, (caddr_t)&lifrl) < 0)
+				goto fail;
+			curr->ifa_dstaddr = malloc(
+			    sizeof (struct sockaddr_storage));
+			if (curr->ifa_dstaddr == NULL)
+				goto fail;
+			(void) memcpy(curr->ifa_dstaddr, &lifrl.lifr_addr,
+			    sizeof (struct sockaddr_storage));
+		} else if (curr->ifa_flags & IFF_BROADCAST) {
+			if (ioctl(s, SIOCGLIFBRDADDR, (caddr_t)&lifrl) < 0)
+				goto fail;
+			curr->ifa_broadaddr = malloc(
+			    sizeof (struct sockaddr_storage));
+			if (curr->ifa_broadaddr == NULL)
+				goto fail;
+			(void) memcpy(curr->ifa_broadaddr, &lifrl.lifr_addr,
+			    sizeof (struct sockaddr_storage));
+		}
+
+	}
+	free(buf);
+	close(sock4);
+	close(sock6);
+	return (0);
+fail:
+	err = errno;
+	free(buf);
+	freeifaddrs(*ifap);
+	*ifap = NULL;
+	if (err == ENXIO)
+		goto retry;
+	close(sock4);
+	close(sock6);
+	errno = err;
+	return (-1);
+}
+
+/*
+ * Do a SIOCGLIFCONF and store all the interfaces in `buf'.
+ */
+int
+getallifs(int s, sa_family_t af, struct lifreq **lifr, int *numifs,
+    int64_t lifc_flags)
+{
+	struct lifnum lifn;
+	struct lifconf lifc;
+	size_t bufsize;
+	char *tmp;
+	caddr_t *buf = (caddr_t *)lifr;
+
+	lifn.lifn_family = af;
+	lifn.lifn_flags = lifc_flags;
+
+	*buf = NULL;
+retry:
+	if (ioctl(s, SIOCGLIFNUM, &lifn) < 0)
+		goto fail;
+
+	/*
+	 * When calculating the buffer size needed, add a small number
+	 * of interfaces to those we counted.  We do this to capture
+	 * the interface status of potential interfaces which may have
+	 * been plumbed between the SIOCGLIFNUM and the SIOCGLIFCONF.
+	 */
+	bufsize = (lifn.lifn_count + 4) * sizeof (struct lifreq);
+
+	if ((tmp = realloc(*buf, bufsize)) == NULL)
+		goto fail;
+
+	*buf = tmp;
+	lifc.lifc_family = af;
+	lifc.lifc_flags = lifc_flags;
+	lifc.lifc_len = bufsize;
+	lifc.lifc_buf = *buf;
+	if (ioctl(s, SIOCGLIFCONF, (char *)&lifc) < 0)
+		goto fail;
+
+	*numifs = lifc.lifc_len / sizeof (struct lifreq);
+	if (*numifs >= (lifn.lifn_count + 4)) {
+		/*
+		 * If every entry was filled, there are probably
+		 * more interfaces than (lifn.lifn_count + 4).
+		 * Redo the ioctls SIOCGLIFNUM and SIOCGLIFCONF to
+		 * get all the interfaces.
+		 */
+		goto retry;
+	}
+	return (0);
+fail:
+	free(*buf);
+	*buf = NULL;
+	return (-1);
+}

Added: csw/mgar/pkg/libasr/trunk/files/openbsd-compat/ifaddrs.h
===================================================================
--- csw/mgar/pkg/libasr/trunk/files/openbsd-compat/ifaddrs.h	                        (rev 0)
+++ csw/mgar/pkg/libasr/trunk/files/openbsd-compat/ifaddrs.h	2015-05-13 11:49:26 UTC (rev 24964)
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+#ifndef _IFADDRS_H
+#define	_IFADDRS_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+/*
+ * The `getifaddrs' function generates a linked list of these structures.
+ * Each element of the list describes one network interface.
+ */
+#if defined(_INT64_TYPE)
+struct ifaddrs {
+	struct ifaddrs	*ifa_next;	/* Pointer to the next structure. */
+	char		*ifa_name;	/* Name of this network interface. */
+	uint64_t	ifa_flags;	/* Flags as from SIOCGLIFFLAGS ioctl. */
+	struct sockaddr	*ifa_addr;	/* Network address of this interface. */
+	struct sockaddr	*ifa_netmask;	/* Netmask of this interface. */
+	union {
+		/*
+		 * At most one of the following two is valid.  If the
+		 * IFF_BROADCAST bit is set in `ifa_flags', then
+		 * `ifa_broadaddr' is valid.  If the IFF_POINTOPOINT bit is
+		 * set, then `ifa_dstaddr' is valid. It is never the case that
+		 * both these bits are set at once.
+		 */
+		struct sockaddr	*ifu_broadaddr;
+		struct sockaddr	*ifu_dstaddr;
+	} ifa_ifu;
+	void		*ifa_data; /* Address-specific data (may be unused). */
+/*
+ * This may have been defined in <net/if.h>.
+ */
+#ifndef ifa_broadaddr
+#define	ifa_broadaddr	ifa_ifu.ifu_broadaddr	/* broadcast address */
+#endif
+#ifndef ifa_dstaddr
+#define	ifa_dstaddr	ifa_ifu.ifu_dstaddr	/* other end of p-to-p link */
+#endif
+};
+#endif
+
+/*
+ * Create a linked list of `struct ifaddrs' structures, one for each
+ * network interface on the host machine.  If successful, store the
+ * list in *ifap and return 0.  On errors, return -1 and set `errno'.
+ *
+ * The storage returned in *ifap is allocated dynamically and can
+ * only be properly freed by passing it to `freeifaddrs'.
+ */
+extern int getifaddrs(struct ifaddrs **);
+
+/* Reclaim the storage allocated by a previous `getifaddrs' call. */
+extern void freeifaddrs(struct ifaddrs *);
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _IFADDRS_H */

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


From rmottola at users.sourceforge.net  Wed May 13 17:26:03 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Wed, 13 May 2015 15:26:03 +0000
Subject: SF.net SVN: gar:[24965] csw/mgar/pkg/quilt/trunk/Makefile
Message-ID: <3ln0Fx0jLMzsh@mail.opencsw.org>

Revision: 24965
          http://sourceforge.net/p/gar/code/24965
Author:   rmottola
Date:     2015-05-13 15:26:03 +0000 (Wed, 13 May 2015)
Log Message:
-----------
quilt/trunk: enable solaris 9

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

Modified: csw/mgar/pkg/quilt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/quilt/trunk/Makefile	2015-05-13 11:49:26 UTC (rev 24964)
+++ csw/mgar/pkg/quilt/trunk/Makefile	2015-05-13 15:26:03 UTC (rev 24965)
@@ -37,6 +37,13 @@
 OBSOLETED_BY_CSWquilt += CSWquilt-el
 OBSOLETED_BY_CSWquilt += CSWquilt-completion
 
+#where can we build?
+PACKAGING_PLATFORMS += solaris9-sparc
+PACKAGING_PLATFORMS += solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+
 CONFIGURE_ARGS =  $(DIRPATHS)
 CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash
 CONFIGURE_ARGS += --with-cp=/opt/csw/bin/gcp

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


From rmottola at users.sourceforge.net  Wed May 13 18:02:57 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Wed, 13 May 2015 16:02:57 +0000
Subject: SF.net SVN: gar:[24966] csw/mgar/pkg/quilt/trunk
Message-ID: <3ln14X2JxczyN@mail.opencsw.org>

Revision: 24966
          http://sourceforge.net/p/gar/code/24966
Author:   rmottola
Date:     2015-05-13 16:02:56 +0000 (Wed, 13 May 2015)
Log Message:
-----------
quilt/trunk: update version to 0.64

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

Modified: csw/mgar/pkg/quilt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/quilt/trunk/Makefile	2015-05-13 15:26:03 UTC (rev 24965)
+++ csw/mgar/pkg/quilt/trunk/Makefile	2015-05-13 16:02:56 UTC (rev 24966)
@@ -1,5 +1,5 @@
 NAME = quilt
-VERSION = 0.63
+VERSION = 0.64
 GARTYPE = v2
 
 DESCRIPTION = A patch management tool

Modified: csw/mgar/pkg/quilt/trunk/checksums
===================================================================
--- csw/mgar/pkg/quilt/trunk/checksums	2015-05-13 15:26:03 UTC (rev 24965)
+++ csw/mgar/pkg/quilt/trunk/checksums	2015-05-13 16:02:56 UTC (rev 24966)
@@ -1 +1 @@
-c0ef4beb58a6fa72563b955e70624b6e  quilt-0.63.tar.gz
+fc0310db5868a0873d602d4332a76d43  quilt-0.64.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  Thu May 14 20:14:59 2015
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 14 May 2015 18:14:59 +0000
Subject: SF.net SVN: gar:[24967] csw/mgar/pkg/tor/branches/alpha
Message-ID: <3lngyW2fHYz1Pw@mail.opencsw.org>

Revision: 24967
          http://sourceforge.net/p/gar/code/24967
Author:   jake_goerzen
Date:     2015-05-14 18:14:58 +0000 (Thu, 14 May 2015)
Log Message:
-----------
tor-alpha: update to 0.2.7.1-alpha release

Modified Paths:
--------------
    csw/mgar/pkg/tor/branches/alpha/Makefile
    csw/mgar/pkg/tor/branches/alpha/checksums

Modified: csw/mgar/pkg/tor/branches/alpha/Makefile
===================================================================
--- csw/mgar/pkg/tor/branches/alpha/Makefile	2015-05-13 16:02:56 UTC (rev 24966)
+++ csw/mgar/pkg/tor/branches/alpha/Makefile	2015-05-14 18:14:58 UTC (rev 24967)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = tor
-VERSION = 0.2.6.7
+VERSION = 0.2.7.1-alpha
 GARTYPE = v2
 
 DESCRIPTION = Secure network traffic router

Modified: csw/mgar/pkg/tor/branches/alpha/checksums
===================================================================
--- csw/mgar/pkg/tor/branches/alpha/checksums	2015-05-13 16:02:56 UTC (rev 24966)
+++ csw/mgar/pkg/tor/branches/alpha/checksums	2015-05-14 18:14:58 UTC (rev 24967)
@@ -1 +1 @@
-a43b4dc6a95d219927aab0a2bb7ed322  tor-0.2.6.7.tar.gz
+8102765bb06467623c5170392674b76b  tor-0.2.7.1-alpha.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  Thu May 14 21:35:14 2015
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 14 May 2015 19:35:14 +0000
Subject: SF.net SVN: gar:[24968] csw/mgar/pkg/dovecot/trunk
Message-ID: <3lnjl03y0Yz1TS@mail.opencsw.org>

Revision: 24968
          http://sourceforge.net/p/gar/code/24968
Author:   jake_goerzen
Date:     2015-05-14 19:35:13 +0000 (Thu, 14 May 2015)
Log Message:
-----------
dovecot: update to 2.2.17

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2015-05-14 18:14:58 UTC (rev 24967)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2015-05-14 19:35:13 UTC (rev 24968)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.16
+VERSION = 2.2.17
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server
@@ -40,6 +40,8 @@
 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWdovecot += CSWliblzma5
 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWdovecot += CSWlibicui18n54
+RUNTIME_DEP_PKGS_CSWdovecot += CSWlibicuuc54
 
 PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL)
 

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2015-05-14 18:14:58 UTC (rev 24967)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2015-05-14 19:35:13 UTC (rev 24968)
@@ -1 +1 @@
-8dba21e817b4239e462d98a925233418  dovecot-2.2.16.tar.gz
+eecca5bea8d175357ab7a2bde39e70d0  dovecot-2.2.17.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 May 15 11:03:17 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 09:03:17 +0000
Subject: SF.net SVN: gar:[24969] csw/mgar/pkg
Message-ID: <3lp3gT3Nxtz8T@mail.opencsw.org>

Revision: 24969
          http://sourceforge.net/p/gar/code/24969
Author:   dmichelsen
Date:     2015-05-15 09:03:16 +0000 (Fri, 15 May 2015)
Log Message:
-----------
yajl: Initial commit

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

Added: csw/mgar/pkg/yajl/Makefile
===================================================================
--- csw/mgar/pkg/yajl/Makefile	                        (rev 0)
+++ csw/mgar/pkg/yajl/Makefile	2015-05-15 09:03:16 UTC (rev 24969)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/yajl/trunk
===================================================================
--- csw/mgar/pkg/yajl/trunk	2015-05-14 19:35:13 UTC (rev 24968)
+++ csw/mgar/pkg/yajl/trunk	2015-05-15 09:03:16 UTC (rev 24969)

Property changes on: csw/mgar/pkg/yajl/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/yajl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yajl/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/yajl/trunk/Makefile	2015-05-15 09:03:16 UTC (rev 24969)
@@ -0,0 +1,48 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = yajl
+VERSION = 2.1.0
+GARTYPE = v2
+
+DESCRIPTION = Yet Another JSON Library
+
+MASTER_SITES = http://github.com/lloyd/yajl/tarball/
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+
+DISTNAME = lloyd-yajl-66cb08c
+
+GARCOMPILER = GNU
+
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = /bin/sh
+REINPLACE_WITH_bash = /bin/bash
+REINPLACE_FILES_bash += test/parsing/run_tests.sh
+
+PACKAGES += CSWlibyajl2
+SPKG_DESC_CSWlibyajl2 = Yet Another JSON Library, libyajl.so.2
+PKGFILES_CSWlibyajl2 += $(call pkgfiles_lib,libyajl.so.2)
+RUNTIME_DEP_PKGS_CSWlibyajl2 += CSWlibgcc-s1
+
+PACKAGES += CSWlibyajl-dev
+SPKG_DESC_CSWlibyajl-dev = Development files for libyajl.so.2
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibyajl-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibyajl-dev += CSWlibyajl2
+
+# CMake installs the 64 bit executables and libraries to /opt/csw/lib instead of /opt/csw/lib/64
+# The next two lines take care that the files are taken from the correct directory.
+bindir = $(bindir_install)
+libdir = $(libdir_install)
+
+BUILD64 = 1
+ISAEXEC = 1
+CONFIGURE_ARGS += -p $(prefix)
+
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+# This is already done during build
+TEST_SCRIPTS =
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/yajl/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/yajl/trunk/checksums
===================================================================
--- csw/mgar/pkg/yajl/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/yajl/trunk/checksums	2015-05-15 09:03:16 UTC (rev 24969)
@@ -0,0 +1 @@
+8df8a92a2799bc949577e8e7a9f43670  yajl-2.1.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  Fri May 15 11:55:27 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 09:55:27 +0000
Subject: SF.net SVN: gar:[24970] csw/mgar/pkg/yajl/trunk/Makefile
Message-ID: <3lp4qX5xJWzCx@mail.opencsw.org>

Revision: 24970
          http://sourceforge.net/p/gar/code/24970
Author:   dmichelsen
Date:     2015-05-15 09:55:26 +0000 (Fri, 15 May 2015)
Log Message:
-----------
yajl/trunk: Fix pkgconfig

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

Modified: csw/mgar/pkg/yajl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yajl/trunk/Makefile	2015-05-15 09:03:16 UTC (rev 24969)
+++ csw/mgar/pkg/yajl/trunk/Makefile	2015-05-15 09:55:26 UTC (rev 24970)
@@ -46,3 +46,14 @@
 
 include gar/category.mk
 
+post-install-isa-sparcv8plus post-install-isa-pentium_pro:
+	mv $(DESTDIR)$(sharedstatedir)/pkgconfig $(DESTDIR)$(libdir)
+	rmdir $(DESTDIR)$(sharedstatedir)
+	@$(MAKECOOKIE)
+
+post-install-isa-sparcv9 post-install-isa-amd64:
+	mv $(DESTDIR)$(sharedstatedir)/pkgconfig $(DESTDIR)$(libdir)
+	rmdir $(DESTDIR)$(sharedstatedir)
+	perl -i -npe 's!/lib!/lib/64!' $(DESTDIR)$(libdir)/pkgconfig/yajl.pc
+	@$(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  Fri May 15 13:57:33 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 11:57:33 +0000
Subject: SF.net SVN: gar:[24971] csw/mgar/pkg/collectd/trunk/Makefile
Message-ID: <3lp7XS2TLtzHy@mail.opencsw.org>

Revision: 24971
          http://sourceforge.net/p/gar/code/24971
Author:   dmichelsen
Date:     2015-05-15 11:57:33 +0000 (Fri, 15 May 2015)
Log Message:
-----------
collectd/trunk: Add yajl support

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

Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile	2015-05-15 09:55:26 UTC (rev 24970)
+++ csw/mgar/pkg/collectd/trunk/Makefile	2015-05-15 11:57:33 UTC (rev 24971)
@@ -15,6 +15,7 @@
 # Lots of others missing
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWnetsnmp-dev
+BUILD_DEP_PKGS += CSWlibyajl-dev
 BUILD_DEP_PKGS += CSWjdk7
 
 EXTRA_CPPFLAGS = -D__EXTENSIONS__
@@ -81,6 +82,7 @@
 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWcollectd += CSWperl
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibyajl2
 # These are pulled in because of a linker anomaly
 RUNTIME_DEP_PKGS_CSWcollectd-sparc += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibmemcached8
@@ -104,6 +106,7 @@
 PACKAGES += CSWcollectd-plugin-java
 SPKG_DESC_CSWcollectd-plugin-java = CollectD Plugin for Java
 PKGFILES_CSWcollectd-plugin-java += $(call pkgfiles_lib,collectd/java.so)
+PKGFILES_CSWcollectd-plugin-java += $(sharedstatedir)/java/.*
 RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7
 # There are some symlinks that confuse checkpkg

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 May 15 14:56:47 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 12:56:47 +0000
Subject: SF.net SVN: gar:[24972] csw/mgar/pkg/cmake/trunk
Message-ID: <3lp8rm60q9zMK@mail.opencsw.org>

Revision: 24972
          http://sourceforge.net/p/gar/code/24972
Author:   dmichelsen
Date:     2015-05-15 12:56:47 +0000 (Fri, 15 May 2015)
Log Message:
-----------
cmake/trunk: Update to 3.2.2

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

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2015-05-15 11:57:33 UTC (rev 24971)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2015-05-15 12:56:47 UTC (rev 24972)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = cmake
-VERSION = 3.2.1
+VERSION = 3.2.2
 GARTYPE = v2
 
 DESCRIPTION = Cross-platform make

Modified: csw/mgar/pkg/cmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/cmake/trunk/checksums	2015-05-15 11:57:33 UTC (rev 24971)
+++ csw/mgar/pkg/cmake/trunk/checksums	2015-05-15 12:56:47 UTC (rev 24972)
@@ -1 +1 @@
-63f436aa19b5efc37017759c8d3953ca  cmake-3.2.1.tar.gz
+2da57308071ea98b10253a87d2419281  cmake-3.2.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  Fri May 15 15:58:44 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 13:58:44 +0000
Subject: SF.net SVN: gar:[24973] csw/mgar/pkg/redis/trunk
Message-ID: <3lpBDM57SLzQJ@mail.opencsw.org>

Revision: 24973
          http://sourceforge.net/p/gar/code/24973
Author:   dmichelsen
Date:     2015-05-15 13:58:44 +0000 (Fri, 15 May 2015)
Log Message:
-----------
redis/trunk: Update to 3.0.1

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

Added Paths:
-----------
    csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch
    csw/mgar/pkg/redis/trunk/files/cswredis.xml

Removed Paths:
-------------
    csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 13:58:44 UTC (rev 24973)
@@ -2,13 +2,16 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = redis
-VERSION = 2.8.3
+VERSION = 3.0.1
 
 DESCRIPTION = An advanced key-value store
 
 MASTER_SITES = http://download.redis.io/releases/
 DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswredis.xml
 
+VENDOR_URL = http://redis.io
+
 PACKAGES += CSWredis
 SPKG_DESC_CSWredis = An advanced key-value store
 
@@ -18,11 +21,11 @@
 GARCOMPILER = GNU
 
 PATCHFILES += 0001-Fix-tclsh-finding.patch
+PATCHFILES += 0001-Use-substitute-for-flock.patch
 
-PATCHFILES += 0001-Solaris-needs-lrt-for-nanosleep.patch
-
 # These are set in the Makefile and are not inherited when we force our CFLAGS in
 EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
+EXTRA_CFLAGS += -Du_int32_t=uint32_t
 
 # There is no configure
 CONFIGURE_SCRIPTS =
@@ -32,7 +35,7 @@
 TEST_TARGET = test
 
 # Some tests fail
-SKIPTEST ?= 1
+#SKIPTEST ?= 1
 
 INSTALL_OVERRIDE_VARS += PREFIX
 INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix)
@@ -42,5 +45,16 @@
 # This is for tail taking -n namely gtail for us
 TEST_ENV_PATH = $(prefix)/gnu:$(PATH)
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswredis.xml
+PROTOTYPE_CLASS_smf = manifest
+
+PRESERVECONF += $(sysconfdir)/redis.conf
+
 include gar/category.mk
 
+post-install:
+	ginstall -D -m 0644 $(WORKSRC)/redis.conf $(DESTDIR)$(sysconfdir)/redis.conf
+	ginstall -D -m 0644 $(WORKDIR)/cswredis.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswredis.xml
+	ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/redis/data
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/redis/trunk/checksums
===================================================================
--- csw/mgar/pkg/redis/trunk/checksums	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/checksums	2015-05-15 13:58:44 UTC (rev 24973)
@@ -1 +1 @@
-6327e6786130b556b048beef0edbdfa7  redis-2.8.3.tar.gz
+dd2bf1f65d75ed518313158086d4219b  redis-3.0.1.tar.gz

Deleted: csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	2015-05-15 13:58:44 UTC (rev 24973)
@@ -1,25 +0,0 @@
-From 754f0d38b843f84f01d3617257f8ec1fe82cf1c7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 16 Dec 2013 09:37:56 +0100
-Subject: [PATCH] Solaris needs -lrt for nanosleep
-
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c37549d..eadd6b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -57,7 +57,7 @@ DEBUG=-g -ggdb
- ifeq ($(uname_S),SunOS)
- 	INSTALL=cp -pf
- 	FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
--	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
-+	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread -lrt
- else ifeq ($(uname_S),Darwin)
- 	
- else
--- 
-1.8.4.1
-

Added: csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch	                        (rev 0)
+++ csw/mgar/pkg/redis/trunk/files/0001-Use-substitute-for-flock.patch	2015-05-15 13:58:44 UTC (rev 24973)
@@ -0,0 +1,31 @@
+From 2d10804706837925345730592fdda0c550494953 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 15 May 2015 13:20:15 +0200
+Subject: [PATCH] Use substitute for flock
+
+---
+ src/cluster.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/cluster.c b/src/cluster.c
+index 916a4be..17490b3 100644
+--- a/src/cluster.c
++++ b/src/cluster.c
+@@ -369,8 +369,14 @@ int clusterLockConfig(char *filename) {
+         return REDIS_ERR;
+     }
+ 
++#ifdef __sun
++    struct flock lock;
++    if (fcntl(fd, F_SETLK, &lock) == -1) {
++        if (errno == EAGAIN) {
++#else
+     if (flock(fd,LOCK_EX|LOCK_NB) == -1) {
+         if (errno == EWOULDBLOCK) {
++#endif
+             redisLog(REDIS_WARNING,
+                  "Sorry, the cluster configuration file %s is already used "
+                  "by a different Redis Cluster node. Please make sure that "
+-- 
+2.3.3
+

Added: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
--- csw/mgar/pkg/redis/trunk/files/cswredis.xml	2015-05-15 12:56:47 UTC (rev 24972)
+++ csw/mgar/pkg/redis/trunk/files/cswredis.xml	2015-05-15 13:58:44 UTC (rev 24973)

Property changes on: csw/mgar/pkg/redis/trunk/files/cswredis.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ 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  Fri May 15 16:44:03 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 14:44:03 +0000
Subject: SF.net SVN: gar:[24974] csw/mgar/pkg/rsync/trunk
Message-ID: <3lpCDb6dmpzT9@mail.opencsw.org>

Revision: 24974
          http://sourceforge.net/p/gar/code/24974
Author:   dmichelsen
Date:     2015-05-15 14:44:02 +0000 (Fri, 15 May 2015)
Log Message:
-----------
rsync/trunk: Switch to native SMF manifest

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

Added Paths:
-----------
    csw/mgar/pkg/rsync/trunk/cswrsync.xml
    csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml

Removed Paths:
-------------
    csw/mgar/pkg/rsync/trunk/files/cswrsyncd

Modified: csw/mgar/pkg/rsync/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsync/trunk/Makefile	2015-05-15 13:58:44 UTC (rev 24973)
+++ csw/mgar/pkg/rsync/trunk/Makefile	2015-05-15 14:44:02 UTC (rev 24974)
@@ -16,7 +16,7 @@
 
 MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/
 DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswrsyncd
+DISTFILES += cswrsyncd.xml
 DISTFILES += rsyncd.conf.CSW
 
 VENDOR_URL = http://rsync.samba.org/
@@ -27,14 +27,15 @@
 RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWrsync += CSWlibiconv2
 
-INITSMF += /etc/opt/csw/init.d/cswrsyncd
-
 PACKAGES += CSWrsyncd
 SPKG_DESC_CSWrsyncd = Daemon for rsyncd server
 PKGFILES_CSWrsyncd += $(sysconfdir)/rsyncd.conf.CSW
 PKGFILES_CSWrsyncd += $(mandir)/man5/rsyncd.conf.5
-PKGFILES_CSWrsyncd += $(INITSMF)
+PKGFILES_CSWrsyncd += /var/opt/csw/svc/manifest/cswrsyncd.xml
 
+# This the URL of the DTD
+CHECKPKG_OVERRIDES_CSWrsyncd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswrsyncd.xml
+
 # rsyncd is in fact rsync --daemon
 RUNTIME_DEP_PKGS_CSWrsyncd += CSWrsync
 CHECKPKG_OVERRIDES_CSWrsyncd += surplus-dependency|CSWrsync
@@ -58,14 +59,17 @@
 REINPLACE_FILES_conf += $(mandir)/man5/rsyncd.conf.5
 REINPLACE_WHEN_conf = postinstall
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswrsyncd.xml
+PROTOTYPE_CLASS_smf = manifest
+
 # There is one ACL-test on NFSv4 failling
 SKIPTEST ?= 1
 
 include gar/category.mk
 
 post-install:
-	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	ginstall -m 0755 $(WORKDIR)/cswrsyncd $(DESTDIR)/etc/opt/csw/init.d/cswrsyncd
+	ginstall -D -m 0644 $(WORKDIR)/cswrsyncd.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswrsyncd.xml
 	ginstall -d $(DESTDIR)$(sysconfdir)
 	ginstall -m 0644 $(WORKDIR)/rsyncd.conf.CSW $(DESTDIR)$(sysconfdir)
 	ginstall -d $(DESTDIR)$(sharedstatedir)/rsync/support/

Copied: csw/mgar/pkg/rsync/trunk/cswrsync.xml (from rev 24973, csw/mgar/pkg/redis/trunk/files/cswredis.xml)
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/rsync/trunk/files/cswrsyncd
===================================================================
--- csw/mgar/pkg/rsync/trunk/files/cswrsyncd	2015-05-15 13:58:44 UTC (rev 24973)
+++ csw/mgar/pkg/rsync/trunk/files/cswrsyncd	2015-05-15 14:44:02 UTC (rev 24974)
@@ -1,23 +0,0 @@
-#!/sbin/sh
-
-CONF_FILE=/etc/opt/csw/rsyncd.conf
-
-if [ ! -f ${CONF_FILE} ]; then
-  exit 0
-fi
-
-cmd="$1"
-
-case "$cmd" in
-  start)
-    /opt/csw/bin/rsync --daemon -v
-    ;;
-  stop)
-    /usr/bin/pkill -x -u 0 rsync
-    ;;
-  *)
-    echo "Usage: $0 {start|stop}"
-    exit 1
-    ;;
-esac
-

Copied: csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml (from rev 24973, csw/mgar/pkg/redis/trunk/files/cswredis.xml)
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Fri May 15 17:06:10 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 15:06:10 +0000
Subject: SF.net SVN: gar:[24975] csw/mgar/pkg/redis/trunk/Makefile
Message-ID: <3lpCk43LFKzWt@mail.opencsw.org>

Revision: 24975
          http://sourceforge.net/p/gar/code/24975
Author:   dmichelsen
Date:     2015-05-15 15:06:10 +0000 (Fri, 15 May 2015)
Log Message:
-----------
redis/trunk: Add override to the DTD

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

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 14:44:02 UTC (rev 24974)
+++ csw/mgar/pkg/redis/trunk/Makefile	2015-05-15 15:06:10 UTC (rev 24975)
@@ -23,6 +23,9 @@
 PATCHFILES += 0001-Fix-tclsh-finding.patch
 PATCHFILES += 0001-Use-substitute-for-flock.patch
 
+# This is the path to the SMF DTD
+CHECKPKG_OVERRIDES_CSWredis += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswredis.xml
+
 # These are set in the Makefile and are not inherited when we force our CFLAGS in
 EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
 EXTRA_CFLAGS += -Du_int32_t=uint32_t

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 May 15 18:28:55 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 16:28:55 +0000
Subject: SF.net SVN: gar:[24976] csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml
Message-ID: <3lpFYX53YyzbH@mail.opencsw.org>

Revision: 24976
          http://sourceforge.net/p/gar/code/24976
Author:   dmichelsen
Date:     2015-05-15 16:28:54 +0000 (Fri, 15 May 2015)
Log Message:
-----------
rsync/trunk: Adjust manifest

Modified Paths:
--------------
    csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml

Modified: csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Fri May 15 18:50:26 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 16:50:26 +0000
Subject: SF.net SVN: gar:[24977] csw/mgar/pkg/redis/trunk/files/cswredis.xml
Message-ID: <3lpG2M3ZySzf0@mail.opencsw.org>

Revision: 24977
          http://sourceforge.net/p/gar/code/24977
Author:   dmichelsen
Date:     2015-05-15 16:50:26 +0000 (Fri, 15 May 2015)
Log Message:
-----------
redis/trunk: Adjust SMF name

Modified Paths:
--------------
    csw/mgar/pkg/redis/trunk/files/cswredis.xml

Modified: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Fri May 15 21:06:44 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 19:06:44 +0000
Subject: SF.net SVN: gar:[24978] csw/mgar/pkg
Message-ID: <3lpK3q4C5fzwf@mail.opencsw.org>

Revision: 24978
          http://sourceforge.net/p/gar/code/24978
Author:   dmichelsen
Date:     2015-05-15 19:06:43 +0000 (Fri, 15 May 2015)
Log Message:
-----------
logstash: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/logstash/
    csw/mgar/pkg/logstash/Makefile
    csw/mgar/pkg/logstash/branches/
    csw/mgar/pkg/logstash/tags/
    csw/mgar/pkg/logstash/trunk/
    csw/mgar/pkg/logstash/trunk/Makefile
    csw/mgar/pkg/logstash/trunk/checksums
    csw/mgar/pkg/logstash/trunk/files/
    csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch
    csw/mgar/pkg/logstash/trunk/files/logstash

Added: csw/mgar/pkg/logstash/Makefile
===================================================================
--- csw/mgar/pkg/logstash/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logstash/Makefile	2015-05-15 19:06:43 UTC (rev 24978)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/logstash/trunk
===================================================================
--- csw/mgar/pkg/logstash/trunk	2015-05-15 16:50:26 UTC (rev 24977)
+++ csw/mgar/pkg/logstash/trunk	2015-05-15 19:06:43 UTC (rev 24978)

Property changes on: csw/mgar/pkg/logstash/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/logstash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logstash/trunk/Makefile	2015-05-15 19:06:43 UTC (rev 24978)
@@ -0,0 +1,48 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = logstash
+VERSION = 1.4.2
+GARTYPE = v2
+
+DESCRIPTION = A tool for managing events and logs
+
+MASTER_SITES = https://download.elasticsearch.org/logstash/logstash/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += logstash
+
+PATCHFILES += 0001-Use-correct-grep.patch
+
+NOGITPATCH = 1
+
+VENDOR_URL = http://www.logstash.net
+
+PACKAGES += CSWlogstash
+SPKG_DESC_CSWlogstash = A tool for managing events and logs
+# PKGFILES is catchall
+ARCHALL_CSWlogstash = 1
+RUNTIME_DEP_PKGS_CSWlogstash += CSWjre8
+
+# Reorganizing is difficult, delay for now
+CHECKPKG_OVERRIDES_CSWlogstash += discouraged-path-in-pkgmap
+
+# We use JRuby, so this is ok
+CHECKPKG_OVERRIDES_CSWlogstash += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+
+# This can not be tracked with checkpkg
+CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
+
+LICENSE = LICENSE
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -D -m 0755 $(WORKDIR)/logstash $(DESTDIR)$(bindir)/logstash
+	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/logstash
+	cd $(WORKSRC) && tar cf - . | (cd $(DESTDIR)$(sharedstatedir)/logstash; tar xf -)
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/logstash/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/logstash/trunk/checksums
===================================================================
--- csw/mgar/pkg/logstash/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/logstash/trunk/checksums	2015-05-15 19:06:43 UTC (rev 24978)
@@ -0,0 +1 @@
+6e6be734392e8c7d6d55e23d0bd8d2b3  logstash-1.4.2.tar.gz

Added: csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch	                        (rev 0)
+++ csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch	2015-05-15 19:06:43 UTC (rev 24978)
@@ -0,0 +1,32 @@
+From 1fbc72d8acbe47f7958470cc5e70a319f5b2b821 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 4 May 2015 11:46:02 +0200
+Subject: [PATCH] Use correct grep
+
+---
+ bin/logstash | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/bin/logstash b/bin/logstash
+index b4b2801..89b450f 100755
+--- a/bin/logstash
++++ b/bin/logstash
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Run logstash from source
+ #
+ # This is most useful when done from a git checkout.
+@@ -18,6 +18,9 @@
+ # Defaults you can override with environment variables
+ LS_HEAP_SIZE="${LS_HEAP_SIZE:=500m}"
+ 
++# We need GNU grep as 'grep'
++PATH=/opt/csw/gnu:$PATH
++
+ unset CDPATH
+ basedir=$(cd `dirname $0`/..; pwd)
+ . "${basedir}/bin/logstash.lib.sh"
+-- 
+2.3.3
+

Added: csw/mgar/pkg/logstash/trunk/files/logstash
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/logstash	                        (rev 0)
+++ csw/mgar/pkg/logstash/trunk/files/logstash	2015-05-15 19:06:43 UTC (rev 24978)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+JAVA_HOME=/opt/csw/java/jre/jre8
+export JAVA_HOME
+
+cd /opt/csw/share/logstash
+exec bin/logstash "$@"

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 May 15 23:06:17 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 21:06:17 +0000
Subject: SF.net SVN: gar:[24979] csw/mgar/pkg/elasticsearch/trunk
Message-ID: <3lpMjg5QStz12B@mail.opencsw.org>

Revision: 24979
          http://sourceforge.net/p/gar/code/24979
Author:   dmichelsen
Date:     2015-05-15 21:06:17 +0000 (Fri, 15 May 2015)
Log Message:
-----------
elasticsearch/trunk: Configuration fixes

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

Added Paths:
-----------
    csw/mgar/pkg/elasticsearch/trunk/files/cswelasticsearch.xml

Modified: csw/mgar/pkg/elasticsearch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/elasticsearch/trunk/Makefile	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/elasticsearch/trunk/Makefile	2015-05-15 21:06:17 UTC (rev 24979)
@@ -2,13 +2,14 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = elasticsearch
-VERSION = 1.5.1
+VERSION = 1.5.2
 GARTYPE = v2
 
 DESCRIPTION = Search & Analyze Data in Real Time
 
 MASTER_SITES += https://download.elastic.co/elasticsearch/elasticsearch/
 DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswelasticsearch.xml
 
 VENDOR_URL = https://www.elastic.co/products/elasticsearch
 LICENSE = LICENSE.txt
@@ -17,6 +18,9 @@
 SPKG_DESC_CSWelasticsearch =
 # PKGFILES is catchall
 
+# This is for the SMF DTD
+CHECKPKG_OVERRIDES_CSWelasticsearch += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswelasticsearch.xml
+
 CHECKPKG_OVERRIDES_CSWelasticsearch-sparc += binary-architecture-does-not-match-placement|file=opt/csw/lib/elasticsearch/sigar/libsigar-sparc64-solaris.so|arch_id=43|arch_name=sparcv9
 CHECKPKG_OVERRIDES_CSWelasticsearch-i386 += binary-architecture-does-not-match-placement|file=opt/csw/lib/elasticsearch/sigar/libsigar-amd64-solaris.so|arch_id=62|arch_name=amd64
 
@@ -30,6 +34,31 @@
 
 CHECKPKG_OVERRIDES_CSWelasticsearch += $(CHECKPKG_OVERRIDES_CSWelasticsearch-$(GARCH))
 
+REINPLACEMENTS += esconfig1
+REINPLACE_MATCH_esconfig1 = /usr/share/elasticsearch/elasticsearch.in.sh
+REINPLACE_WITH_esconfig1 =
+REINPLACE_FILES_esconfig1 += bin/elasticsearch
+
+REINPLACEMENTS += esconfig2
+REINPLACE_MATCH_esconfig2 = /usr/local/share/elasticsearch/elasticsearch.in.sh
+REINPLACE_WITH_esconfig2 =
+REINPLACE_FILES_esconfig2 += bin/elasticsearch
+
+REINPLACEMENTS += esconfig3
+REINPLACE_MATCH_esconfig3 = /opt/elasticsearch/elasticsearch.in.sh
+REINPLACE_WITH_esconfig3 = $(bindir)/elasticsearch.in.sh
+REINPLACE_FILES_esconfig3 += bin/elasticsearch
+
+REINPLACEMENTS += esconfigin
+REINPLACE_MATCH_esconfigin = ES_CLASSPATH=.*
+REINPLACE_WITH_esconfigin = ES_CLASSPATH=\$$ES_CLASSPATH:\$$ES_HOME/lib/elasticsearch/elasticsearch-1.5.2.jar:\$$ES_HOME/lib/elasticsearch/*:\$$ES_HOME/lib/elasticsearch/sigar/*
+REINPLACE_FILES_esconfigin += bin/elasticsearch.in.sh
+
+REINPLACEMENTS += conf
+REINPLACE_MATCH_conf = ARGV=""
+REINPLACE_WITH_conf = properties=-Des.default.path.conf=/etc/opt/csw/elasticsearch\nARGV=""
+REINPLACE_FILES_conf += bin/elasticsearch
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
@@ -41,10 +70,15 @@
 SIGAR_sparc += libsigar-sparc-solaris.so
 SIGAR_sparc += libsigar-sparc64-solaris.so
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswelasticsearch.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
 install-custom:
 	ginstall -D -m 0755 $(WORKSRC)/bin/elasticsearch $(DESTDIR)$(bindir)/elasticsearch
+	ginstall -D -m 0755 $(WORKSRC)/bin/elasticsearch.in.sh $(DESTDIR)$(bindir)/elasticsearch.in.sh
 	ginstall -D -m 0755 $(WORKSRC)/config/elasticsearch.yml $(DESTDIR)$(sysconfdir)/elasticsearch/elasticsearch.yml
 	ginstall -D -m 0755 $(WORKSRC)/config/logging.yml $(DESTDIR)$(sysconfdir)/elasticsearch/logging.yml
 	ginstall -D -m 0755 $(WORKSRC)/README.textile $(DESTDIR)$(docdir)/elasticsearch/README.textile
@@ -52,4 +86,5 @@
 	cp -rp $(WORKSRC)/lib/* $(DESTDIR)$(libdir)/elasticsearch/
 	cd $(DESTDIR)$(libdir)/elasticsearch/sigar && rm -f *freebsd* *linux* *macosx* *winnt* \
 	  $(filter-out $(SIGAR_$(GARCH)),$(SIGAR_sparc) $(SIGAR_i386))
+	ginstall -D -m 0644 $(WORKDIR)/cswelasticsearch.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswelasticsearch.xml
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/elasticsearch/trunk/checksums
===================================================================
--- csw/mgar/pkg/elasticsearch/trunk/checksums	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/elasticsearch/trunk/checksums	2015-05-15 21:06:17 UTC (rev 24979)
@@ -1 +1 @@
-897f5c820bda7317ca19ca790b99074e  elasticsearch-1.5.1.tar.gz
+b5cecb01d455f516d6c3aaff3af4149f  elasticsearch-1.5.2.tar.gz

Copied: csw/mgar/pkg/elasticsearch/trunk/files/cswelasticsearch.xml (from rev 24976, csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml)
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Fri May 15 23:13:34 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 15 May 2015 21:13:34 +0000
Subject: SF.net SVN: gar:[24980] csw/mgar/pkg/elasticsearch/trunk/Makefile
Message-ID: <3lpMv96mgSz14Y@mail.opencsw.org>

Revision: 24980
          http://sourceforge.net/p/gar/code/24980
Author:   dmichelsen
Date:     2015-05-15 21:13:34 +0000 (Fri, 15 May 2015)
Log Message:
-----------
elasticsearch/trunk: Preserve configuration

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

Modified: csw/mgar/pkg/elasticsearch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/elasticsearch/trunk/Makefile	2015-05-15 21:06:17 UTC (rev 24979)
+++ csw/mgar/pkg/elasticsearch/trunk/Makefile	2015-05-15 21:13:34 UTC (rev 24980)
@@ -64,7 +64,9 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-PRESERVECONF += $(sysconfdir)/elasticsearch.yml
+PRESERVECONF += $(sysconfdir)/elasticsearch/elasticsearch.yml
+PRESERVECONF += $(sysconfdir)/elasticsearch/logging.yml
+
 SIGAR_i386 += libsigar-x86-solaris.so
 SIGAR_i386 += libsigar-amd64-solaris.so
 SIGAR_sparc += libsigar-sparc-solaris.so

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


From dmichelsen at users.sourceforge.net  Sat May 16 12:55:21 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 16 May 2015 10:55:21 +0000
Subject: SF.net SVN: gar:[24981] csw/mgar/pkg
Message-ID: <3lpk6H0Y6Tz1JS@mail.opencsw.org>

Revision: 24981
          http://sourceforge.net/p/gar/code/24981
Author:   dmichelsen
Date:     2015-05-16 10:55:21 +0000 (Sat, 16 May 2015)
Log Message:
-----------
logstash-contrib: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/logstash-contrib/
    csw/mgar/pkg/logstash-contrib/Makefile
    csw/mgar/pkg/logstash-contrib/branches/
    csw/mgar/pkg/logstash-contrib/tags/
    csw/mgar/pkg/logstash-contrib/trunk/
    csw/mgar/pkg/logstash-contrib/trunk/Makefile
    csw/mgar/pkg/logstash-contrib/trunk/checksums
    csw/mgar/pkg/logstash-contrib/trunk/files/
    csw/mgar/pkg/logstash-contrib/trunk/files/LICENSE
    csw/mgar/pkg/logstash-contrib/trunk/files/logstash

Added: csw/mgar/pkg/logstash-contrib/Makefile
===================================================================
--- csw/mgar/pkg/logstash-contrib/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logstash-contrib/Makefile	2015-05-16 10:55:21 UTC (rev 24981)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/logstash-contrib/trunk
===================================================================
--- csw/mgar/pkg/logstash-contrib/trunk	2015-05-15 21:13:34 UTC (rev 24980)
+++ csw/mgar/pkg/logstash-contrib/trunk	2015-05-16 10:55:21 UTC (rev 24981)

Property changes on: csw/mgar/pkg/logstash-contrib/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/logstash-contrib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash-contrib/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/logstash-contrib/trunk/Makefile	2015-05-16 10:55:21 UTC (rev 24981)
@@ -0,0 +1,45 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = logstash-contrib
+VERSION = 1.4.2
+GARTYPE = v2
+
+DESCRIPTION = A tool for managing events and logs
+
+MASTER_SITES = https://download.elasticsearch.org/logstash/logstash/
+DISTFILES += $(DISTNAME).tar.gz
+# Taken from logstash
+DISTFILES += LICENSE
+
+NOGITPATCH = 1
+
+VENDOR_URL = http://www.logstash.net
+
+PACKAGES += CSWlogstash-contrib
+SPKG_DESC_CSWlogstash = A tool for managing events and logs, contributed plugins
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlogstash-contrib += CSWlogstash
+
+# Reorganizing is difficult, delay for now
+CHECKPKG_OVERRIDES_CSWlogstash-contrib += discouraged-path-in-pkgmap
+
+# We use JRuby, so this is ok
+CHECKPKG_OVERRIDES_CSWlogstash-contrib += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+
+# This can not be tracked with checkpkg
+CHECKPKG_OVERRIDES_CSWlogstash-contrib += surplus-dependency|CSWlogstash
+
+LICENSE = LICENSE
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/logstash
+	cd $(WORKSRC) && tar cf - . | (cd $(DESTDIR)$(sharedstatedir)/logstash; tar xf -)
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/logstash-contrib/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/logstash-contrib/trunk/checksums
===================================================================
--- csw/mgar/pkg/logstash-contrib/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/logstash-contrib/trunk/checksums	2015-05-16 10:55:21 UTC (rev 24981)
@@ -0,0 +1 @@
+712b1a6286a9e8c2bc24a2734137e42c  logstash-contrib-1.4.2.tar.gz

Added: csw/mgar/pkg/logstash-contrib/trunk/files/LICENSE
===================================================================
--- csw/mgar/pkg/logstash-contrib/trunk/files/LICENSE	                        (rev 0)
+++ csw/mgar/pkg/logstash-contrib/trunk/files/LICENSE	2015-05-16 10:55:21 UTC (rev 24981)
@@ -0,0 +1,14 @@
+Copyright 2009-2013 Jordan Sissel, Pete Fritchman, and contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

Added: csw/mgar/pkg/logstash-contrib/trunk/files/logstash
===================================================================
--- csw/mgar/pkg/logstash-contrib/trunk/files/logstash	                        (rev 0)
+++ csw/mgar/pkg/logstash-contrib/trunk/files/logstash	2015-05-16 10:55:21 UTC (rev 24981)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+JAVA_HOME=/opt/csw/java/jre/jre8
+export JAVA_HOME
+
+cd /opt/csw/share/logstash
+exec bin/logstash "$@"

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 May 16 17:53:32 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 16 May 2015 15:53:32 +0000
Subject: SF.net SVN: gar:[24982] csw/mgar/pkg
Message-ID: <3lprkM53THz1RB@mail.opencsw.org>

Revision: 24982
          http://sourceforge.net/p/gar/code/24982
Author:   dmichelsen
Date:     2015-05-16 15:53:32 +0000 (Sat, 16 May 2015)
Log Message:
-----------
logstash-forwarder: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/logstash-forwarder/trunk/Makefile
    csw/mgar/pkg/logstash-forwarder/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/logstash-forwarder/
    csw/mgar/pkg/logstash-forwarder/trunk/files/logstash-forwarder.xml

Removed Paths:
-------------
    csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch
    csw/mgar/pkg/logstash-forwarder/trunk/files/logstash

Modified: csw/mgar/pkg/logstash-forwarder/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,48 +1,52 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = logstash
-VERSION = 1.4.2
+NAME = logstash-forwarder
+VERSION = 0.4.0
 GARTYPE = v2
 
-DESCRIPTION = A tool for managing events and logs
+DESCRIPTION = Forward Logs for Logstash
 
-MASTER_SITES = https://download.elasticsearch.org/logstash/logstash/
+MASTER_SITES = https://github.com/elastic/logstash-forwarder/
 DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += logstash
+DISTFILES += logstash-forwarder.xml
 
-PATCHFILES += 0001-Use-correct-grep.patch
+VENDOR_URL = https://github.com/elastic/logstash-forwarder
 
-NOGITPATCH = 1
-
-VENDOR_URL = http://www.logstash.net
-
-PACKAGES += CSWlogstash
-SPKG_DESC_CSWlogstash = A tool for managing events and logs
+PACKAGES += CSWlogstash-forwarder
+SPKG_DESC_CSWlogstash-forwarder = Forward Logs for Logstash
 # PKGFILES is catchall
-ARCHALL_CSWlogstash = 1
-RUNTIME_DEP_PKGS_CSWlogstash += CSWjre8
+RUNTIME_DEP_PKGS_CSWlogstash-forwarder += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlogstash-forwarder += CSWlibgo5
 
-# Reorganizing is difficult, delay for now
-CHECKPKG_OVERRIDES_CSWlogstash += discouraged-path-in-pkgmap
+# Due to the way the headers work only 64 bits is supported
+CHECKPKG_OVERRIDES_CSWlogstash-forwarder += binary-architecture-does-not-match-placement|file=opt/csw/bin/logstash-forwarder|arch_id=43|arch_name=sparcv9
 
-# We use JRuby, so this is ok
-CHECKPKG_OVERRIDES_CSWlogstash += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+# This is the DTD for SMF
+CHECKPKG_OVERRIDES_CSWlogstash-forwarder += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/logstash-forwarder.xml
 
-# This can not be tracked with checkpkg
-CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
-
 LICENSE = LICENSE
 
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF += $(sysconfdir)/logstash-forwarder/logstash-forwarder.conf
+
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/logstash-forwarder.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
+build-custom:
+	cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" gccgo -o logstash-forwarder -m64 \
+		version.go syslog.go config.go prospector.go harvester.go filestate_linux.go filecompare.go \
+		event.go spooler.go publisher1.go registrar.go fileinfo_linux.go registrar_other.go logstash-forwarder.go
+
 install-custom:
-	ginstall -D -m 0755 $(WORKDIR)/logstash $(DESTDIR)$(bindir)/logstash
-	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/logstash
-	cd $(WORKSRC) && tar cf - . | (cd $(DESTDIR)$(sharedstatedir)/logstash; tar xf -)
+	ginstall -D -m 0755 $(WORKSRC)/logstash-forwarder $(DESTDIR)$(bindir)/logstash-forwarder
+	ginstall -D -m 0644 $(WORKSRC)/logstash-forwarder.conf.example $(DESTDIR)$(sysconfdir)/logstash-forwarder/logstash-forwarder.conf
+	ginstall -D -m 0644 $(WORKDIR)/logstash-forwarder.xml $(DESTDIR)/var/opt/csw/svc/manifest/logstash-forwarder.xml
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/logstash-forwarder/trunk/checksums
===================================================================
--- csw/mgar/pkg/logstash/trunk/checksums	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/checksums	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1 +1 @@
-6e6be734392e8c7d6d55e23d0bd8d2b3  logstash-1.4.2.tar.gz
+0831817d12bf3a8cdf86b9a303b964ea  logstash-forwarder-0.4.0.tar.gz

Deleted: csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,32 +0,0 @@
-From 1fbc72d8acbe47f7958470cc5e70a319f5b2b821 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 4 May 2015 11:46:02 +0200
-Subject: [PATCH] Use correct grep
-
----
- bin/logstash | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/bin/logstash b/bin/logstash
-index b4b2801..89b450f 100755
---- a/bin/logstash
-+++ b/bin/logstash
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Run logstash from source
- #
- # This is most useful when done from a git checkout.
-@@ -18,6 +18,9 @@
- # Defaults you can override with environment variables
- LS_HEAP_SIZE="${LS_HEAP_SIZE:=500m}"
- 
-+# We need GNU grep as 'grep'
-+PATH=/opt/csw/gnu:$PATH
-+
- unset CDPATH
- basedir=$(cd `dirname $0`/..; pwd)
- . "${basedir}/bin/logstash.lib.sh"
--- 
-2.3.3
-

Deleted: csw/mgar/pkg/logstash-forwarder/trunk/files/logstash
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/logstash	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/files/logstash	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-JAVA_HOME=/opt/csw/java/jre/jre8
-export JAVA_HOME
-
-cd /opt/csw/share/logstash
-exec bin/logstash "$@"

Copied: csw/mgar/pkg/logstash-forwarder/trunk/files/logstash-forwarder.xml (from rev 24979, csw/mgar/pkg/elasticsearch/trunk/files/cswelasticsearch.xml)
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Sat May 16 17:56:07 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 16 May 2015 15:56:07 +0000
Subject: SF.net SVN: gar:[24983] csw/mgar/pkg/logstash-forwarder/trunk/Makefile
Message-ID: <3lprnF2ymlz1TY@mail.opencsw.org>

Revision: 24983
          http://sourceforge.net/p/gar/code/24983
Author:   dmichelsen
Date:     2015-05-16 15:56:07 +0000 (Sat, 16 May 2015)
Log Message:
-----------
logstash-forwarder/trunk: Add override for amd64

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

Modified: csw/mgar/pkg/logstash-forwarder/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-16 15:53:32 UTC (rev 24982)
+++ csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-16 15:56:07 UTC (rev 24983)
@@ -21,6 +21,7 @@
 
 # Due to the way the headers work only 64 bits is supported
 CHECKPKG_OVERRIDES_CSWlogstash-forwarder += binary-architecture-does-not-match-placement|file=opt/csw/bin/logstash-forwarder|arch_id=43|arch_name=sparcv9
+CHECKPKG_OVERRIDES_CSWlogstash-forwarder += binary-architecture-does-not-match-placement|file=opt/csw/bin/logstash-forwarder|arch_id=62|arch_name=amd64
 
 # This is the DTD for SMF
 CHECKPKG_OVERRIDES_CSWlogstash-forwarder += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/logstash-forwarder.xml

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 May 17 22:54:30 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 17 May 2015 20:54:30 +0000
Subject: SF.net SVN: gar:[24984] csw/mgar/gar/v2/gar.mk
Message-ID: <3lqbM96YxNzVT@mail.opencsw.org>

Revision: 24984
          http://sourceforge.net/p/gar/code/24984
Author:   dmichelsen
Date:     2015-05-17 20:54:30 +0000 (Sun, 17 May 2015)
Log Message:
-----------
mGAR v2: Allow not stripping binaries

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2015-05-16 15:56:07 UTC (rev 24983)
+++ csw/mgar/gar/v2/gar.mk	2015-05-17 20:54:30 UTC (rev 24984)
@@ -675,7 +675,7 @@
 
 # strip - Strip executables
 ifneq ($(GARFLAVOR),DBG)
-POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS)
+POST_INSTALL_TARGETS := $(if $(NOSTRIP),,strip) $(POST_INSTALL_TARGETS)
 endif
 
 strip:

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 May 17 22:55:31 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 17 May 2015 20:55:31 +0000
Subject: SF.net SVN: gar:[24985] csw/mgar/pkg/logstash-forwarder/trunk/Makefile
Message-ID: <3lqbND61LJzXq@mail.opencsw.org>

Revision: 24985
          http://sourceforge.net/p/gar/code/24985
Author:   dmichelsen
Date:     2015-05-17 20:55:31 +0000 (Sun, 17 May 2015)
Log Message:
-----------
logstash-forwarder/trunk: Stripping GO binaries breaks them

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

Modified: csw/mgar/pkg/logstash-forwarder/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-17 20:54:30 UTC (rev 24984)
+++ csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-17 20:55:31 UTC (rev 24985)
@@ -33,6 +33,10 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+# Stripping destroys GO binaries
+#   http://lists.opencsw.org/pipermail/maintainers/2015-May/020001.html
+NOSTRIP = 1
+
 PRESERVECONF += $(sysconfdir)/logstash-forwarder/logstash-forwarder.conf
 
 PROTOTYPE_MODIFIERS += smf

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 May 18 09:27:58 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 18 May 2015 07:27:58 +0000
Subject: SF.net SVN: gar:[24986] csw/mgar/pkg/nspr/trunk/Makefile
Message-ID: <3lqsQ02rj1zjS@mail.opencsw.org>

Revision: 24986
          http://sourceforge.net/p/gar/code/24986
Author:   cgrzemba
Date:     2015-05-18 07:27:57 +0000 (Mon, 18 May 2015)
Log Message:
-----------
nspr/trunk: add some runtime dependencies for the dev package

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2015-05-17 20:55:31 UTC (rev 24985)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2015-05-18 07:27:57 UTC (rev 24986)
@@ -72,7 +72,9 @@
 PACKAGES += CSWnspr-dev
 CATALOGNAME_CSWnspr-dev = nspr_dev
 SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
-RUNTIME_DEP_PKGS_CSWnspr-dev  = CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWnspr-dev += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWnspr-dev += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWnspr-dev += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl
 # OBSOLETED_BY_CSWnspr-dev = CSWlibnspr-flt4 
 

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 May 18 11:45:00 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 18 May 2015 09:45:00 +0000
Subject: SF.net SVN: gar:[24987] csw/mgar/pkg/lang-python/six/trunk
Message-ID: <3lqwS55Vn0zmt@mail.opencsw.org>

Revision: 24987
          http://sourceforge.net/p/gar/code/24987
Author:   cgrzemba
Date:     2015-05-18 09:44:59 +0000 (Mon, 18 May 2015)
Log Message:
-----------
lang-python/six/trunk: update version 1.9.0

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

Modified: csw/mgar/pkg/lang-python/six/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/six/trunk/Makefile	2015-05-18 07:27:57 UTC (rev 24986)
+++ csw/mgar/pkg/lang-python/six/trunk/Makefile	2015-05-18 09:44:59 UTC (rev 24987)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = six
-VERSION = 1.4.1
+VERSION = 1.9.0
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/lang-python/six/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/six/trunk/checksums	2015-05-18 07:27:57 UTC (rev 24986)
+++ csw/mgar/pkg/lang-python/six/trunk/checksums	2015-05-18 09:44:59 UTC (rev 24987)
@@ -1 +1 @@
-bdbb9e12d3336c198695aa4cf3a61d62  six-1.4.1.tar.gz
+476881ef4012262dfc8adc645ee786c4  six-1.9.0.tar.gz

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


From cgrzemba at users.sourceforge.net  Mon May 18 12:03:51 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 18 May 2015 10:03:51 +0000
Subject: SF.net SVN: gar:[24988] csw/mgar/pkg/lang-python
Message-ID: <3lqwsw17Spzqk@mail.opencsw.org>

Revision: 24988
          http://sourceforge.net/p/gar/code/24988
Author:   cgrzemba
Date:     2015-05-18 10:03:51 +0000 (Mon, 18 May 2015)
Log Message:
-----------
lang-python/oauth2client/trunk: initial commit v1.4.9

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

Added: csw/mgar/pkg/lang-python/oauth2client/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/oauth2client/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/oauth2client/Makefile	2015-05-18 10:03:51 UTC (rev 24988)
@@ -0,0 +1,25 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id: Makefile 24024 2014-08-19 14:12:11Z cgrzemba $
+
+NAME = oauth2client
+VERSION = 1.4.9
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Google OAuth2Client
+define BLURB
+endef
+# UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz
+
+
+GIT_REPOS = http://github.com/google/$(NAME).git
+# GIT_USE_PROXY = 1
+# git at github.com:google/oauth2client.git
+GIT_TREEISH_oauth2client.git = $(VERSION)
+
+
+PACKAGES = CSWpy-oauth2client
+
+include gar/category.mk
+

Index: csw/mgar/pkg/lang-python/oauth2client/trunk
===================================================================
--- csw/mgar/pkg/lang-python/oauth2client/trunk	2015-05-18 09:44:59 UTC (rev 24987)
+++ csw/mgar/pkg/lang-python/oauth2client/trunk	2015-05-18 10:03:51 UTC (rev 24988)

Property changes on: csw/mgar/pkg/lang-python/oauth2client/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/oauth2client/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/oauth2client/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/oauth2client/trunk/Makefile	2015-05-18 10:03:51 UTC (rev 24988)
@@ -0,0 +1,29 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+NAME = oauth2client
+VERSION = v1.4.9
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Google OAuth2Client
+define BLURB
+endef
+# UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz
+
+
+GIT_REPOS = https//github.com/google/$(NAME).git
+# GIT_USE_PROXY = 1
+# git at github.com:google/oauth2client.git
+GIT_TREEISH_oauth2client.git = $(VERSION)
+
+LICENSE = LICENSE
+
+PACKAGES = CSWpy-oauth2client
+ARCHALL = 1
+
+SKIPTEST = 1
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/lang-python/oauth2client/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/oauth2client/trunk/checksums
===================================================================
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 May 18 18:05:00 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2015 16:05:00 +0000
Subject: SF.net SVN: gar:[24989] csw/mgar/pkg/libasr/trunk
Message-ID: <3lr4wS3NnZz110@mail.opencsw.org>

Revision: 24989
          http://sourceforge.net/p/gar/code/24989
Author:   dmichelsen
Date:     2015-05-18 16:05:00 +0000 (Mon, 18 May 2015)
Log Message:
-----------
libasr/trunk: Some updates

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

Added Paths:
-----------
    csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz

Removed Paths:
-------------
    csw/mgar/pkg/libasr/trunk/files/openbsd-compat/

Modified: csw/mgar/pkg/libasr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libasr/trunk/Makefile	2015-05-18 10:03:51 UTC (rev 24988)
+++ csw/mgar/pkg/libasr/trunk/Makefile	2015-05-18 16:05:00 UTC (rev 24989)
@@ -5,7 +5,7 @@
 VERSION = 201505061057
 GARTYPE = v2
 
-DESCRIPTION = libasr is a free, simple and portable asynchronous resolver library.
+DESCRIPTION = A free, simple and portable asynchronous resolver library
 define BLURB
  libasr is a free, simple and portable asynchronous resolver library.
  
@@ -23,37 +23,35 @@
 endef
 
 MASTER_SITES = http://www.opensmtpd.org/archives/
-DISTFILES  = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += openbsd-compat.tgz
 
-ifneq ($(GAROSREL),11)
-PATCHFILES += 0001-add-openbsd-compat-getifaddrs.c.patch
-endif
+PATCHFILES-5.10 += 0001-add-openbsd-compat-getifaddrs.c.patch
 PATCHFILES += 0002-fix-possible-MAX-redefinition.patch
+PATCHFILES += $(PATHFILES-$(GAROSREL))
 
-GARCOMPILER = GNU
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
 
-PACKAGES += CSWlibasr
-CATALOGNAME_CSWlibasr = libasr
-PKGFILES_CSWlibasr += $(call baseisadirs,$(libdir),libasr\.so(\.\d+)*)
-SPKG_DESC_CSWlibasr += $(DESCRIPTION), libasr.so
+BUILD64 = 1
 
+PACKAGES += CSWlibasr0
+PKGFILES_CSWlibasr0 += $(call pkgfiles_lib,libasr.so.0)
+SPKG_DESC_CSWlibasr0 += $(DESCRIPTION), libasr.so.0
+
 PACKAGES += CSWlibasr-dev
-CATALOGNAME_CSWlibasr-dev = libasr_dev
-SPKG_DESC_CSWlibasr-dev += $(DESCRIPTION), development files
-RUNTIME_DEP_PKGS_CSWlibasr-dev += CSWlibasr
+SPKG_DESC_CSWlibasr-dev += Development files for libasr.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibasr-dev += CSWlibasr0
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-mantype=man
 
 include gar/category.mk
 
-ifneq ($(GAROSREL),11)
 # ifaddrs.h    taken from https://java.net/projects/solaris/sources/on-src/content/usr/src/head/ifaddrs.h?raw=true
 # getifaddrs.c taken from https://java.net/projects/solaris/sources/on-src/content/usr/src/lib/libsocket/inet/getifaddrs.c?raw=true
 # libsocket_priv.h is a gruik hack
-pre-build-modulated:
-	cp $(FILEDIR)/openbsd-compat/ifaddrs.h $(WORKSRC)/openbsd-compat/
-	cp $(FILEDIR)/openbsd-compat/getifaddrs.c $(WORKSRC)/openbsd-compat/
-	cp $(FILEDIR)/openbsd-compat/libsocket_priv.h $(WORKSRC)/openbsd-compat/
+pre-build:
+	$(if $(filter 5.10,$(GAROSREL)),cp -rp $(WORKDIR)/openbsd-compat/* $(WORKSRC)/openbsd-compat)
 	@$(MAKECOOKIE)
-endif

Modified: csw/mgar/pkg/libasr/trunk/checksums
===================================================================
--- csw/mgar/pkg/libasr/trunk/checksums	2015-05-18 10:03:51 UTC (rev 24988)
+++ csw/mgar/pkg/libasr/trunk/checksums	2015-05-18 16:05:00 UTC (rev 24989)
@@ -1 +1 @@
-2a4b768b54892465570ef7488e56b737  libasr-201505061057.tar.gz
+2a4b768b54892465570ef7488e56b737  libasr-201505061057.tar.gz

Added: csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz
===================================================================
(Binary files differ)

Index: csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz
===================================================================
--- csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz	2015-05-18 10:03:51 UTC (rev 24988)
+++ csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz	2015-05-18 16:05:00 UTC (rev 24989)

Property changes on: csw/mgar/pkg/libasr/trunk/files/openbsd-compat.tgz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-gzip
\ 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 jake_goerzen at users.sourceforge.net  Mon May 18 18:55:23 2015
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 18 May 2015 16:55:23 +0000
Subject: SF.net SVN: gar:[24990] csw/mgar/pkg/dovecot/trunk
Message-ID: <3lr60j2Qxnz1FB@mail.opencsw.org>

Revision: 24990
          http://sourceforge.net/p/gar/code/24990
Author:   jake_goerzen
Date:     2015-05-18 16:55:22 +0000 (Mon, 18 May 2015)
Log Message:
-----------
dovecot: update to 2.2.18

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2015-05-18 16:05:00 UTC (rev 24989)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2015-05-18 16:55:22 UTC (rev 24990)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.17
+VERSION = 2.2.18
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2015-05-18 16:05:00 UTC (rev 24989)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2015-05-18 16:55:22 UTC (rev 24990)
@@ -1 +1 @@
-eecca5bea8d175357ab7a2bde39e70d0  dovecot-2.2.17.tar.gz
+1e42eb3b69544c447ad882d7858f3630  dovecot-2.2.18.tar.gz

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


From dmichelsen at users.sourceforge.net  Mon May 18 19:30:41 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2015 17:30:41 +0000
Subject: SF.net SVN: gar:[24991] csw/mgar/pkg/libpng/branches/libpng15/Makefile
Message-ID: <3lr6nR6DSJz1Hn@mail.opencsw.org>

Revision: 24991
          http://sourceforge.net/p/gar/code/24991
Author:   dmichelsen
Date:     2015-05-18 17:30:41 +0000 (Mon, 18 May 2015)
Log Message:
-----------
libpng/branches/libpng15: Cleanup, get rid of extra ISA pentium_pro as it is already the default

Modified Paths:
--------------
    csw/mgar/pkg/libpng/branches/libpng15/Makefile

Modified: csw/mgar/pkg/libpng/branches/libpng15/Makefile
===================================================================
--- csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-18 16:55:22 UTC (rev 24990)
+++ csw/mgar/pkg/libpng/branches/libpng15/Makefile	2015-05-18 17:30:41 UTC (rev 24991)
@@ -13,19 +13,16 @@
 VERSION = 1.5.13
 GARTYPE = v2
 DESCRIPTION = The official library for Portable Network Graphics format (PNG)
-define BLURB
-endef
+
+MASTER_SITES += $(SF_MIRROR)
+MASTER_SITES += ftp://ftp.simplesystems.org/pub/libpng/png/src/
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+
 VENDOR_URL = http://www.libpng.org/pub/png/libpng.html
-MASTER_SITES = $(SF_MIRROR)
-MASTER_SITES += ftp://ftp.simplesystems.org/pub/libpng/png/src/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
 LICENSE = LICENSE
 
-CONFIGURE_ARGS = $(DIRPATHS)
-
-EXTRA_BUILD_ISAS = sparcv8plus+vis
+EXTRA_BUILD_ISAS += sparcv8plus+vis
 EXTRA_BUILD_ISAS += sparcv8plus+vis2
-EXTRA_BUILD_ISAS += pentium_pro
 
 #where can we build?
 PACKAGING_PLATFORMS += solaris9-sparc

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 May 19 10:34:01 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 19 May 2015 08:34:01 +0000
Subject: SF.net SVN: gar:[24992] csw/mgar/pkg/lang-python/httplib2/trunk
Message-ID: <3lrVqs6lsNz51@mail.opencsw.org>

Revision: 24992
          http://sourceforge.net/p/gar/code/24992
Author:   cgrzemba
Date:     2015-05-19 08:34:00 +0000 (Tue, 19 May 2015)
Log Message:
-----------
lang-python/httplib2/trunk: update minor version, make cacerts.txt readable

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

Modified: csw/mgar/pkg/lang-python/httplib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/httplib2/trunk/Makefile	2015-05-18 17:30:41 UTC (rev 24991)
+++ csw/mgar/pkg/lang-python/httplib2/trunk/Makefile	2015-05-19 08:34:00 UTC (rev 24992)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = httplib2
-VERSION = 0.9
+VERSION = 0.9.1
 CATEGORIES = python
 GARTYPE = v2
 
@@ -20,3 +20,7 @@
 TEST_SCRIPTS =
 
 include gar/category.mk
+
+post-install:
+	(cd $(DESTDIR)/$(SITE_PACKAGES)/$(NAME) && chmod +r cacerts.txt)
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/lang-python/httplib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/httplib2/trunk/checksums	2015-05-18 17:30:41 UTC (rev 24991)
+++ csw/mgar/pkg/lang-python/httplib2/trunk/checksums	2015-05-19 08:34:00 UTC (rev 24992)
@@ -1 +1 @@
-09d8e8016911fc40e2e4c58f1aa3ec24  httplib2-0.9.tar.gz
+c49590437e4c5729505d034cd34a8528  httplib2-0.9.1.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed May 20 09:59:56 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 07:59:56 +0000
Subject: SF.net SVN: gar:[24993] csw/mgar/pkg
Message-ID: <3ls62101m4zfd@mail.opencsw.org>

Revision: 24993
          http://sourceforge.net/p/gar/code/24993
Author:   dmichelsen
Date:     2015-05-20 07:59:55 +0000 (Wed, 20 May 2015)
Log Message:
-----------
libestr/trunk: Initial commit

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

Added: csw/mgar/pkg/libestr/Makefile
===================================================================
--- csw/mgar/pkg/libestr/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libestr/Makefile	2015-05-20 07:59:55 UTC (rev 24993)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/libestr/trunk
===================================================================
--- csw/mgar/pkg/libestr/trunk	2015-05-19 08:34:00 UTC (rev 24992)
+++ csw/mgar/pkg/libestr/trunk	2015-05-20 07:59:55 UTC (rev 24993)

Property changes on: csw/mgar/pkg/libestr/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/libestr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libestr/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libestr/trunk/Makefile	2015-05-20 07:59:55 UTC (rev 24993)
@@ -0,0 +1,28 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libestr
+VERSION = 0.1.10
+GARTYPE = v2
+
+DESCRIPTION = Some essentials for string handling
+
+MASTER_SITES = http://libestr.adiscon.com/files/download/
+DISTFILES  = $(DISTNAME).tar.gz
+
+VENDOR_URL = http://libestr.adiscon.com
+
+PACKAGES += CSWlibestr0
+SPKG_DESC_CSWlibestr0 = Some essentials for string handling, libestr.so.0
+PKGFILES_CSWlibestr0 += $(call pkgfiles_lib,libestr.so.0)
+
+PACKAGES += CSWlibestr-dev
+SPKG_DESC_CSWlibestr-dev = Development files for libestr.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibestr-dev += CSWlibestr0
+
+BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/libestr/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/libestr/trunk/checksums
===================================================================
--- csw/mgar/pkg/libestr/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libestr/trunk/checksums	2015-05-20 07:59:55 UTC (rev 24993)
@@ -0,0 +1 @@
+f4c9165a23587e77f7efe65d676d5e8e  libestr-0.1.10.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 May 20 11:57:21 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 09:57:21 +0000
Subject: SF.net SVN: gar:[24994] csw/mgar/pkg/json-c/trunk
Message-ID: <3ls8dh5qgmzpP@mail.opencsw.org>

Revision: 24994
          http://sourceforge.net/p/gar/code/24994
Author:   dmichelsen
Date:     2015-05-20 09:57:20 +0000 (Wed, 20 May 2015)
Log Message:
-----------
json-c/trunk: Update to 0.12

Modified Paths:
--------------
    csw/mgar/pkg/json-c/trunk/Makefile
    csw/mgar/pkg/json-c/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/json-c/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch
    csw/mgar/pkg/json-c/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch

Modified: csw/mgar/pkg/json-c/trunk/Makefile
===================================================================
--- csw/mgar/pkg/json-c/trunk/Makefile	2015-05-20 07:59:55 UTC (rev 24993)
+++ csw/mgar/pkg/json-c/trunk/Makefile	2015-05-20 09:57:20 UTC (rev 24994)
@@ -2,45 +2,42 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = json-c
-VERSION = 0.10
+VERSION = 0.12
 GARTYPE = v2
 
 DESCRIPTION = JSON objects in C
 define BLURB
-	JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.
+  JSON-C implements a reference counting object model that allows you to easily construct JSON
+  objects in C, output them as JSON formatted strings and parse JSON formatted strings back
+  into the C representation of JSON objects.
 endef
 
-MASTER_SITES = https://s3.amazonaws.com/json-c_releases/releases/
-# GIT_REPOS = git://github.com/json-c/json-c.git
+MASTER_SITES += https://s3.amazonaws.com/json-c_releases/releases/
+#DISTFILES += $(DISTNAME).tar.gz
+DISTNAME = json-c-solaris
+DISTFILES += $(DISTNAME)-branch.zip
 
-DISTFILES  = $(DISTNAME).tar.gz
+# PATCHFILES = 0001-allow-to-use-public-vasprintf-symbol.patch
 
-GARCOMPILER = GCC4
+# Use these patches until this is merged:
+#   https://github.com/json-c/json-c/pull/184
+#PATCHFILES += 0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch
+#PATCHFILES += 0002-Use-GCC-flags-only-when-compiling-with-GCC.patch
 
-PATCHFILES = 0001-allow-to-use-public-vasprintf-symbol.patch
+PACKAGES += CSWlibjson-c3
+PKGFILES_CSWlibjson-c3 += $(call pkgfiles_lib,libjson-c.so.3)
+SPKG_DESC_CSWlibjson-c3 += $(DESCRIPTION), libjson-c.so.3
 
-PACKAGES += CSWlibjson0
-CATALOGNAME_CSWlibjson0 = libjson0
-PKGFILES_CSWlibjson0 += $(call baseisadirs,$(libdir),libjson\.so\.0\.1\.0)
-PKGFILES_CSWlibjson0 += $(call baseisadirs,$(libdir),libjson\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibjson0 += $(DESCRIPTION), libjson.so.0
-RUNTIME_DEP_PKGS_CSWlibjson0 += CSWlibgcc-s1
-
 PACKAGES += CSWjson-c-dev
-CATALOGNAME_CSWjson-c-dev = json_c_dev
 SPKG_DESC_CSWjson-c-dev += $(DESCRIPTION), development files
-PKGFILES_CSWjson-c-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWjson-c-dev += CSWlibjson0
+# PKGFILES_CSWjson-c-dev += $(PKGFILES_DEVEL)
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWjson-c-dev += CSWlibjson-c3
 
-# vasprintf test failes with: 
-# symbol belongs to unavailable version /lib/libc.so (SUNW_1.22.7)
-# EXTRA_CONFIGURE_ENV = LD_OPTIONS=
+BUILD64 = 1
 
-# EXTRA_CFLAGS = -xnorunpath
-
-SKIPTEST = 1
-
-CONFIGURE_ARGS = $(DIRPATHS)
-
 include gar/category.mk
 
+post-patch:
+	cd $(WORKSRC) && ./autogen.sh
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/json-c/trunk/checksums
===================================================================
--- csw/mgar/pkg/json-c/trunk/checksums	2015-05-20 07:59:55 UTC (rev 24993)
+++ csw/mgar/pkg/json-c/trunk/checksums	2015-05-20 09:57:20 UTC (rev 24994)
@@ -1 +1 @@
-a4edc79410eb894f08d7d52ca9f88732  json-c-0.10.tar.gz
+ed4454c1288495a1bc88c4854759a44f  json-c-solaris-branch.zip

Added: csw/mgar/pkg/json-c/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch
===================================================================
--- csw/mgar/pkg/json-c/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch	                        (rev 0)
+++ csw/mgar/pkg/json-c/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch	2015-05-20 09:57:20 UTC (rev 24994)
@@ -0,0 +1,34 @@
+From f569cf434198371211f411659f828c5d06c71e4d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 20 May 2015 11:08:48 +0200
+Subject: [PATCH 1/2] Solaris does not allow POSIX-compliant evaluation in sh
+
+---
+ tests/test-defs.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-defs.sh b/tests/test-defs.sh
+index 658a75d..09368ae 100755
+--- a/tests/test-defs.sh
++++ b/tests/test-defs.sh
+@@ -41,7 +41,7 @@ esac
+ 
+ rm -rf "$testsubdir" > /dev/null 2>&1
+ mkdir -p "$testsubdir"
+-CURDIR=$(pwd)
++CURDIR=`pwd`
+ cd "$testsubdir" \
+    || { echo "Cannot make or change into $testsubdir"; exit 1; }
+ 
+@@ -50,7 +50,7 @@ echo "=== Running test $progname"
+ CMP="${CMP-cmp}"
+ 
+ use_valgrind=${USE_VALGRIND-1}
+-valgrind_path=$(which valgrind 2> /dev/null)
++valgrind_path=`which valgrind 2> /dev/null`
+ if [ -z "${valgrind_path}" -o ! -x "${valgrind_path}" ] ; then
+ 	use_valgrind=0
+ fi
+-- 
+2.3.3
+

Added: csw/mgar/pkg/json-c/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch
===================================================================
--- csw/mgar/pkg/json-c/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch	                        (rev 0)
+++ csw/mgar/pkg/json-c/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch	2015-05-20 09:57:20 UTC (rev 24994)
@@ -0,0 +1,118 @@
+From 3f0a36362d8b429dcb6795e7b80db6a8f78ee0ca Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 20 May 2015 11:22:42 +0200
+Subject: [PATCH 2/2] Use GCC flags only when compiling with GCC
+
+---
+ Makefile.am       |  2 --
+ Makefile.am.inc   |  2 --
+ config.h.in       |  6 +-----
+ configure.ac      | 32 +++++++++++++++++++++++++++-----
+ tests/Makefile.am |  2 --
+ 5 files changed, 28 insertions(+), 16 deletions(-)
+ delete mode 100644 Makefile.am.inc
+
+diff --git a/Makefile.am b/Makefile.am
+index 63781c0..451cb08 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,3 @@
+-include Makefile.am.inc
+-
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+ SUBDIRS = . tests
+ 
+diff --git a/Makefile.am.inc b/Makefile.am.inc
+deleted file mode 100644
+index fec591b..0000000
+--- a/Makefile.am.inc
++++ /dev/null
+@@ -1,2 +0,0 @@
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+-
+diff --git a/config.h.in b/config.h.in
+index af2e5fc..933594f 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -130,13 +130,9 @@
+ /* Public define for json_inttypes.h */
+ #undef JSON_C_HAVE_INTTYPES_H
+ 
+-/* Define to the sub-directory in which libtool stores uninstalled libraries.
+-   */
++/* Define to the sub-directory where libtool stores uninstalled libraries. */
+ #undef LT_OBJDIR
+ 
+-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+-#undef NO_MINUS_C_MINUS_O
+-
+ /* Name of package */
+ #undef PACKAGE
+ 
+diff --git a/configure.ac b/configure.ac
+index 37f9657..77bf4be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,22 +24,44 @@ fi
+ # enable silent build by default
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes]]))
+ 
++# Checks for typedefs, structures, and compiler characteristics.
++AC_PROG_CC
++AM_PROG_CC_C_O
++
++dnl Try to detect/use GNU features
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++
++dnl which flags does the compiler support?
++if test "x$GCC" = "xyes"; then
++  for flag in -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -Werror; do
++    oCFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $flag"
++    cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[[^A-Za-z]]/_/g'`
++    AC_CACHE_CHECK([if gcc likes the $flag flag], $cachename,
++       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0 ]])],[eval $cachename=yes],[eval $cachename=no])])
++    if eval test \$$cachename = no; then
++         CFLAGS="$oCFLAGS"
++    fi
++  done
++fi
++
++dnl We need the definition, probably detect by testing the required function
++CFLAGS="$CFLAGS -D_REENTRANT"
++
++AC_C_CONST
++AC_TYPE_SIZE_T
++
+ # Checks for programs.
+ 
+ # Checks for libraries.
+ 
+ # Checks for header files.
+-AM_PROG_CC_C_O
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_HEADER(json_config.h)
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h endian.h)
+ AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])])
+ 
+-# Checks for typedefs, structures, and compiler characteristics.
+-AC_C_CONST
+-AC_TYPE_SIZE_T
+-
+ # Checks for library functions.
+ AC_FUNC_VPRINTF
+ AC_FUNC_MEMCMP
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index a388eeb..aef7c29 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,3 @@
+-
+-include ../Makefile.am.inc
+ LDADD= $(LIBJSON_LA)
+ 
+ LIBJSON_LA=$(top_builddir)/libjson-c.la
+-- 
+2.3.3
+

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


From dmichelsen at users.sourceforge.net  Wed May 20 12:04:49 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 10:04:49 +0000
Subject: SF.net SVN: gar:[24995] csw/mgar/pkg/json-c/trunk/Makefile
Message-ID: <3ls8p25wPzzrx@mail.opencsw.org>

Revision: 24995
          http://sourceforge.net/p/gar/code/24995
Author:   dmichelsen
Date:     2015-05-20 10:04:49 +0000 (Wed, 20 May 2015)
Log Message:
-----------
json-c/trunk: Adjust name of development package

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

Modified: csw/mgar/pkg/json-c/trunk/Makefile
===================================================================
--- csw/mgar/pkg/json-c/trunk/Makefile	2015-05-20 09:57:20 UTC (rev 24994)
+++ csw/mgar/pkg/json-c/trunk/Makefile	2015-05-20 10:04:49 UTC (rev 24995)
@@ -28,11 +28,11 @@
 PKGFILES_CSWlibjson-c3 += $(call pkgfiles_lib,libjson-c.so.3)
 SPKG_DESC_CSWlibjson-c3 += $(DESCRIPTION), libjson-c.so.3
 
-PACKAGES += CSWjson-c-dev
-SPKG_DESC_CSWjson-c-dev += $(DESCRIPTION), development files
-# PKGFILES_CSWjson-c-dev += $(PKGFILES_DEVEL)
+PACKAGES += CSWlibjson-c-dev
+SPKG_DESC_CSWlibjson-c-dev += $(DESCRIPTION), development files
+# PKGFILES_CSWlibjson-c-dev += $(PKGFILES_DEVEL)
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWjson-c-dev += CSWlibjson-c3
+RUNTIME_DEP_PKGS_CSWlibjson-c-dev += CSWlibjson-c3
 
 BUILD64 = 1
 

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


From dmichelsen at users.sourceforge.net  Wed May 20 12:32:36 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 10:32:36 +0000
Subject: SF.net SVN: gar:[24996] csw/mgar/pkg
Message-ID: <3ls9Q80MGKzvT@mail.opencsw.org>

Revision: 24996
          http://sourceforge.net/p/gar/code/24996
Author:   dmichelsen
Date:     2015-05-20 10:32:36 +0000 (Wed, 20 May 2015)
Log Message:
-----------
liblogging/trunk: Initial commit

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

Added: csw/mgar/pkg/liblogging/Makefile
===================================================================
--- csw/mgar/pkg/liblogging/Makefile	                        (rev 0)
+++ csw/mgar/pkg/liblogging/Makefile	2015-05-20 10:32:36 UTC (rev 24996)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/liblogging/trunk
===================================================================
--- csw/mgar/pkg/liblogging/trunk	2015-05-20 10:04:49 UTC (rev 24995)
+++ csw/mgar/pkg/liblogging/trunk	2015-05-20 10:32:36 UTC (rev 24996)

Property changes on: csw/mgar/pkg/liblogging/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/liblogging/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblogging/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/liblogging/trunk/Makefile	2015-05-20 10:32:36 UTC (rev 24996)
@@ -0,0 +1,33 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = liblogging
+VERSION = 1.0.5
+GARTYPE = v2
+
+DESCRIPTION = An easy to use logging library
+
+MASTER_SITES = http://download.rsyslog.com/liblogging/
+DISTFILES += $(DISTNAME).tar.gz
+
+VENDOR_URL = http://www.liblogging.org
+
+PACKAGES += CSWliblogging-stdlog0
+SPKG_DESC_CSWliblogging-stdlog0 =  An easy to use logging library
+PKGFILES_CSWliblogging-stdlog0 += $(call pkgfiles_lib,liblogging-stdlog.so.0)
+
+PACKAGES += CSWliblogging-stdlog-dev
+SPKG_DESC_CSWliblogging-stdlog-dev = Development files for liblogging-stdlog.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWliblogging-stdlog-dev += CSWliblogging-stdlog0
+
+CONFIGURE_ARGS += $(DIRPATHS)
+# This is SystemD, why does it not detect that there is no SystemD?
+CONFIGURE_ARGS += --disable-journal
+# This is disabled by default and does not compile out-of-the-box, leave it off for now
+# CONFIGURE_ARGS += --enable-rfc3195
+
+BUILD64 = 1
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/liblogging/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/liblogging/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblogging/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/liblogging/trunk/checksums	2015-05-20 10:32:36 UTC (rev 24996)
@@ -0,0 +1 @@
+44b8ce2daa1bfb84c9feaf42f9925fd7  liblogging-1.0.5.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed May 20 14:49:21 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 12:49:21 +0000
Subject: SF.net SVN: gar:[24997] csw/mgar/pkg
Message-ID: <3lsDRy3nC1z11f@mail.opencsw.org>

Revision: 24997
          http://sourceforge.net/p/gar/code/24997
Author:   dmichelsen
Date:     2015-05-20 12:49:20 +0000 (Wed, 20 May 2015)
Log Message:
-----------
cowsay/trunk: Initial commit

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

Added: csw/mgar/pkg/cowsay/Makefile
===================================================================
--- csw/mgar/pkg/cowsay/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cowsay/Makefile	2015-05-20 12:49:20 UTC (rev 24997)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/cowsay/trunk
===================================================================
--- csw/mgar/pkg/cowsay/trunk	2015-05-20 10:32:36 UTC (rev 24996)
+++ csw/mgar/pkg/cowsay/trunk	2015-05-20 12:49:20 UTC (rev 24997)

Property changes on: csw/mgar/pkg/cowsay/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/cowsay/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cowsay/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cowsay/trunk/Makefile	2015-05-20 12:49:20 UTC (rev 24997)
@@ -0,0 +1,41 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = cowsay
+VERSION = 3.03
+GARTYPE = v2
+
+DESCRIPTION = Generates ASCII pictures of a cow with a message
+
+MASTER_SITES = ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/
+DISTFILES  = $(DISTNAME).tar.gz
+
+VENDOR_URL = http://www.nog.net/~tony/wareza
+
+PACKAGES += CSWcowsay
+SPKG_DESC_CSWcowsay = Generates ASCII pictures of a cow with a message
+# PKGFILES is catchall
+ARCHALL_CSWcowsay = 1
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d -m 0755 $(DESTDIR)$(bindir)
+	cat $(WORKSRC)/cowsay | \
+		sed -e 's,%BANGPERL%,!/usr/bin/perl,' -e 's,%PREFIX%/share,$(sharedstatedir),' \
+		> $(DESTDIR)$(bindir)/cowsay
+	chmod 755 $(DESTDIR)$(bindir)/cowsay
+	ln -s cowsay $(DESTDIR)$(bindir)/cowthink
+	ginstall -d -m 0755 $(DESTDIR)$(mandir)/man1
+	cat $(WORKSRC)/cowsay.1 | \
+		sed -e 's,%BANGPERL%,!/usr/bin/perl,' -e 's,%PREFIX%/share,$(sharedtatedir),' \
+		> $(DESTDIR)$(mandir)/man1/cowsay.1
+	ln -s cowsay.1 $(DESTDIR)$(mandir)/man1/cowthink.1
+	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/cows
+	ginstall -m 0644 $(WORKSRC)/cows/* $(DESTDIR)$(sharedstatedir)/cows
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/cowsay/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/cowsay/trunk/checksums
===================================================================
--- csw/mgar/pkg/cowsay/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cowsay/trunk/checksums	2015-05-20 12:49:20 UTC (rev 24997)
@@ -0,0 +1 @@
+b29169797359420dadb998079021a494  cowsay-3.03.tar.gz

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


From cgrzemba at users.sourceforge.net  Wed May 20 16:15:44 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 20 May 2015 14:15:44 +0000
Subject: SF.net SVN: gar:[24998] csw/mgar/pkg/lang-java/jss/branches/fromfedora
Message-ID: <3lsGMd3sqsz16W@mail.opencsw.org>

Revision: 24998
          http://sourceforge.net/p/gar/code/24998
Author:   cgrzemba
Date:     2015-05-20 14:15:44 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: redefine map file path

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-20 12:49:20 UTC (rev 24997)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-20 14:15:44 UTC (rev 24998)
@@ -85,8 +85,15 @@
 DISTDIR = mozilla/security/jss
 LICENSE = COPYING
 
-OBJ_PATH_32 = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_$(GARFLAVOR).OBJ
-OBJ_PATH_64 = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_64_$(GARFLAVOR).OBJ
+OS_TEST := $(shell uname -m)
+ifeq ($(OS_TEST),i86pc)
+    OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+else
+    OS_RELEASE := $(shell uname -r)
+endif
+
+OBJ_PATH_32 = $(shell uname -s)$(OS_RELEASE)_$(GARFLAVOR).OBJ
+OBJ_PATH_64 = $(shell uname -s)$(OS_RELEASE)_64_$(GARFLAVOR).OBJ
 OBJ_PATH = $(OBJ_PATH_$(MEMORYMODEL_$(ISA)))
 
 CONFIGURE_ARGS_OPT += BUILD_OPT=1
@@ -100,6 +107,7 @@
 CONFIGURE_ARGS_64 += USE_64=1
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(ISA)))
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+EXTRA_DSO_LDOPTS = $(LINKER_MAPS) -B direct
 	
 CONFIGURE_SCRIPTS = 
 BUILD_SCRIPTS = jss
@@ -114,7 +122,7 @@
 build-jss:
 	(cd $(WORKSRC) && \
 	gmake -C mozilla/security/coreconf $(CONFIGURE_ARGS) && \
-	gmake -C mozilla/security/jss $(CONFIGURE_ARGS) && \
+	gmake -C mozilla/security/jss $(CONFIGURE_ARGS) EXTRA_DSO_LDOPTS="$(EXTRA_DSO_LDOPTS)" && \
 	gmake -C mozilla/security/jss javadoc $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch	2015-05-20 12:49:20 UTC (rev 24997)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch	2015-05-20 14:15:44 UTC (rev 24998)
@@ -5,7 +5,7 @@
  	DSO_LDOPTS += -G -h $(notdir $@)
  endif
 -DSO_LDOPTS += -z combreloc -z defs -z ignore
-+DSO_LDOPTS += -R'/opt/csw/lib/$$ISALIST' -M /home/grzemba/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z combreloc -z defs -z ignore
++DSO_LDOPTS += -R'/opt/csw/lib/$$ISALIST' $(EXTRA_DSO_LDOPTS) -z combreloc -z defs -z ignore
  
  # -KPIC generates position independent code for use in shared libraries.
  # (Similarly for -fPIC in case of gcc.)

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


From cgrzemba at users.sourceforge.net  Wed May 20 16:24:07 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 20 May 2015 14:24:07 +0000
Subject: SF.net SVN: gar:[24999]
	csw/mgar/pkg/lang-java/jss/branches/fromfedora/ Makefile
Message-ID: <3lsGYK2Lq3z18v@mail.opencsw.org>

Revision: 24999
          http://sourceforge.net/p/gar/code/24999
Author:   cgrzemba
Date:     2015-05-20 14:24:06 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: add overrides

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile

Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-20 14:15:44 UTC (rev 24998)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile	2015-05-20 14:24:06 UTC (rev 24999)
@@ -72,9 +72,12 @@
 RUNTIME_DEP_PKGS_CSWjss4 += CSWlibnspr4
 CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename|file=/opt/csw/lib/amd64/libjss4.so
 CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename|file=/opt/csw/lib/libjss4.so
+CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libjss4.so
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
+CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
 
+
 PACKAGES += CSWjss4-doc
 CATALOGNAME_CSWjss4-doc = jss4_doc
 PKGFILES_CSWjss4-doc = $(call baseisadirs,$(datadir)/jssdoc,.*)

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 May 20 16:49:56 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 20 May 2015 14:49:56 +0000
Subject: SF.net SVN: gar:[25000] csw/mgar/pkg/ansible/trunk/Makefile
Message-ID: <3lsH7224bcz1CY@mail.opencsw.org>

Revision: 25000
          http://sourceforge.net/p/gar/code/25000
Author:   dmichelsen
Date:     2015-05-20 14:49:56 +0000 (Wed, 20 May 2015)
Log Message:
-----------
ansible/trunk: Add plugins

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

Modified: csw/mgar/pkg/ansible/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ansible/trunk/Makefile	2015-05-20 14:24:06 UTC (rev 24999)
+++ csw/mgar/pkg/ansible/trunk/Makefile	2015-05-20 14:49:56 UTC (rev 25000)
@@ -89,4 +89,6 @@
 post-install:
 	ginstall -D -m 0644 $(WORKDIR)/hosts.CSW $(DESTDIR)$(sysconfdir)/ansible/hosts.CSW
 	ginstall -D -m 0644 $(WORKSRC)/examples/ansible.cfg $(DESTDIR)/$(sysconfdir)/ansible/ansible.cfg.CSW
+	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/ansible
+	cp -rp $(WORKSRC)/plugins $(DESTDIR)$(sharedstatedir)/ansible/plugins
 	@$(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  Wed May 20 17:02:07 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 20 May 2015 15:02:07 +0000
Subject: SF.net SVN: gar:[25001] csw/mgar/pkg/lang-python/pdfminer/trunk
Message-ID: <3lsHPC2BCgz1G5@mail.opencsw.org>

Revision: 25001
          http://sourceforge.net/p/gar/code/25001
Author:   cgrzemba
Date:     2015-05-20 15:02:07 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-python/pdfminer/trunk: update, use github

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

Modified: csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 14:49:56 UTC (rev 25000)
+++ csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 15:02:07 UTC (rev 25001)
@@ -2,7 +2,8 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = pdfminer
-VERSION = 20140328
+# VERSION = 
+GIT_VERSION = HEAD
 GARTYPE = v2
 CATEGORIES = python
 
@@ -11,13 +12,19 @@
   Long description
 endef
 
-MASTER_SITES = https://pypi.python.org/packages/source/p/$(NAME)/
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES =
+GIT_REPOS = http://github.com/euske/$(NAME).git
+GIT_TREEISH_pdfminer.git = $(GIT_VERSION)
 
+LICENSE = README.md
+
+# MASTER_SITES = https://pypi.python.org/packages/source/p/$(NAME)/
+
 PACKAGES = CSWpy-pdfminer
 ARCHALL_CSWpy-pdfminer = 1
+CHECKPKG_OVERRIDES_CSWpy-pdfminer += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/pdfminer/cmapdb.py
+CHECKPKG_OVERRIDES_CSWpy-pdfminer += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/pdfminer/cmapdb.py
 
-MODULATIONS_PYTHON_VERSION = 2_6
 
 SKIPTEST = 1
 

Modified: csw/mgar/pkg/lang-python/pdfminer/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pdfminer/trunk/checksums	2015-05-20 14:49:56 UTC (rev 25000)
+++ csw/mgar/pkg/lang-python/pdfminer/trunk/checksums	2015-05-20 15:02:07 UTC (rev 25001)
@@ -1 +0,0 @@
-dfe3eb1b7b7017ab514aad6751a7c2ea  pdfminer-20140328.tar.gz

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


From cgrzemba at users.sourceforge.net  Wed May 20 17:05:35 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 20 May 2015 15:05:35 +0000
Subject: SF.net SVN: gar:[25002]
	csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile
Message-ID: <3lsHT438pKz1JS@mail.opencsw.org>

Revision: 25002
          http://sourceforge.net/p/gar/code/25002
Author:   cgrzemba
Date:     2015-05-20 15:05:34 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-python/pdfminer/trunk: add vendor_url

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

Modified: csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 15:02:07 UTC (rev 25001)
+++ csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 15:05:34 UTC (rev 25002)
@@ -12,6 +12,9 @@
   Long description
 endef
 
+
+
+VENDOR_URL = https://github.com/euske/pdfminer
 MASTER_SITES =
 GIT_REPOS = http://github.com/euske/$(NAME).git
 GIT_TREEISH_pdfminer.git = $(GIT_VERSION)

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


From cgrzemba at users.sourceforge.net  Wed May 20 17:09:39 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 20 May 2015 15:09:39 +0000
Subject: SF.net SVN: gar:[25003]
	csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile
Message-ID: <3lsHYn4pfDz1Lp@mail.opencsw.org>

Revision: 25003
          http://sourceforge.net/p/gar/code/25003
Author:   cgrzemba
Date:     2015-05-20 15:09:39 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-python/pdfminer/trunk: set version

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

Modified: csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 15:05:34 UTC (rev 25002)
+++ csw/mgar/pkg/lang-python/pdfminer/trunk/Makefile	2015-05-20 15:09:39 UTC (rev 25003)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = pdfminer
-# VERSION = 
+VERSION =  HEAD
 GIT_VERSION = HEAD
 GARTYPE = v2
 CATEGORIES = python

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 May 21 11:00:52 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 09:00:52 +0000
Subject: SF.net SVN: gar:[25004] csw/mgar/pkg/logstash/trunk/files/logstash
Message-ID: <3lslKt4WT4zhQ@mail.opencsw.org>

Revision: 25004
          http://sourceforge.net/p/gar/code/25004
Author:   dmichelsen
Date:     2015-05-21 09:00:52 +0000 (Thu, 21 May 2015)
Log Message:
-----------
logstash/trunk: Do not change current directory as it is not necessary and harmful

Modified Paths:
--------------
    csw/mgar/pkg/logstash/trunk/files/logstash

Modified: csw/mgar/pkg/logstash/trunk/files/logstash
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/logstash	2015-05-20 15:09:39 UTC (rev 25003)
+++ csw/mgar/pkg/logstash/trunk/files/logstash	2015-05-21 09:00:52 UTC (rev 25004)
@@ -3,5 +3,4 @@
 JAVA_HOME=/opt/csw/java/jre/jre8
 export JAVA_HOME
 
-cd /opt/csw/share/logstash
-exec bin/logstash "$@"
+exec /opt/csw/share/logstash/bin/logstash "$@"

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 May 21 11:12:02 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 09:12:02 +0000
Subject: SF.net SVN: gar:[25005] csw/mgar/pkg/redis/trunk
Message-ID: <3lslZj704lzlK@mail.opencsw.org>

Revision: 25005
          http://sourceforge.net/p/gar/code/25005
Author:   dmichelsen
Date:     2015-05-21 09:12:02 +0000 (Thu, 21 May 2015)
Log Message:
-----------
redis/trunk: Add sentinel.conf and move config to /etc/opt/csw/redis/

Modified Paths:
--------------
    csw/mgar/pkg/redis/trunk/Makefile
    csw/mgar/pkg/redis/trunk/files/cswredis.xml

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2015-05-21 09:00:52 UTC (rev 25004)
+++ csw/mgar/pkg/redis/trunk/Makefile	2015-05-21 09:12:02 UTC (rev 25005)
@@ -52,12 +52,14 @@
 PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswredis.xml
 PROTOTYPE_CLASS_smf = manifest
 
-PRESERVECONF += $(sysconfdir)/redis.conf
+PRESERVECONF += $(sysconfdir)/redis/redis.conf
+PRESERVECONF += $(sysconfdir)/redis/sentinel.conf
 
 include gar/category.mk
 
 post-install:
-	ginstall -D -m 0644 $(WORKSRC)/redis.conf $(DESTDIR)$(sysconfdir)/redis.conf
+	ginstall -D -m 0644 $(WORKSRC)/redis.conf $(DESTDIR)$(sysconfdir)/redis/redis.conf
+	ginstall -D -m 0644 $(WORKSRC)/sentinel.conf $(DESTDIR)$(sysconfdir)/redis/sentinel.conf
 	ginstall -D -m 0644 $(WORKDIR)/cswredis.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswredis.xml
 	ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/redis/data
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Thu May 21 11:18:43 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 09:18:43 +0000
Subject: SF.net SVN: gar:[25006] csw/mgar/pkg/redis/trunk/files/cswredis.xml
Message-ID: <3lslkP6VtJzng@mail.opencsw.org>

Revision: 25006
          http://sourceforge.net/p/gar/code/25006
Author:   dmichelsen
Date:     2015-05-21 09:18:43 +0000 (Thu, 21 May 2015)
Log Message:
-----------
redis/trunk: redis-server runs in foreground

Modified Paths:
--------------
    csw/mgar/pkg/redis/trunk/files/cswredis.xml

Modified: csw/mgar/pkg/redis/trunk/files/cswredis.xml
===================================================================
(Binary files differ)

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


From rmottola at users.sourceforge.net  Thu May 21 12:10:28 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu, 21 May 2015 10:10:28 +0000
Subject: SF.net SVN: gar:[25007] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3lsmtD110Lz10Q@mail.opencsw.org>

Revision: 25007
          http://sourceforge.net/p/gar/code/25007
Author:   rmottola
Date:     2015-05-21 10:10:27 +0000 (Thu, 21 May 2015)
Log Message:
-----------
binutils/trunk: comment out dependency reported as sururplus

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-21 09:18:43 UTC (rev 25006)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-21 10:10:27 UTC (rev 25007)
@@ -51,7 +51,7 @@
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1
-RUNTIME_DEP_PKGS_CSWbinutils-i386 += CSWlibfl2
+#RUNTIME_DEP_PKGS_CSWbinutils-i386 += CSWlibfl2
 RUNTIME_DEP_PKGS_CSWbinutils += $(RUNTIME_DEP_PKGS_CSWbinutils-$(GARCH))
 
 CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content

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 May 21 16:03:34 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 14:03:34 +0000
Subject: SF.net SVN: gar:[25008] csw/mgar/pkg/logstash/trunk
Message-ID: <3lst3G3GNQz18F@mail.opencsw.org>

Revision: 25008
          http://sourceforge.net/p/gar/code/25008
Author:   dmichelsen
Date:     2015-05-21 14:03:33 +0000 (Thu, 21 May 2015)
Log Message:
-----------
logstash/trunk: Add SMF service

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

Added Paths:
-----------
    csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml

Modified: csw/mgar/pkg/logstash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	2015-05-21 10:10:27 UTC (rev 25007)
+++ csw/mgar/pkg/logstash/trunk/Makefile	2015-05-21 14:03:33 UTC (rev 25008)
@@ -10,6 +10,7 @@
 MASTER_SITES = https://download.elasticsearch.org/logstash/logstash/
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += logstash
+DISTFILES += cswlogstash.xml
 
 PATCHFILES += 0001-Use-correct-grep.patch
 
@@ -39,10 +40,16 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswlogstash.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
 install-custom:
 	ginstall -D -m 0755 $(WORKDIR)/logstash $(DESTDIR)$(bindir)/logstash
 	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/logstash
 	cd $(WORKSRC) && tar cf - . | (cd $(DESTDIR)$(sharedstatedir)/logstash; tar xf -)
+	ginstall -d -m 0755 $(DESTDIR)$(sysconfdir)/logstash/conf.d
+	ginstall -D -m 0644 $(WORKDIR)/cswlogstash.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswlogstash.xml
 	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml (from rev 24979, csw/mgar/pkg/elasticsearch/trunk/files/cswelasticsearch.xml)
===================================================================
(Binary files differ)

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


From rmottola at users.sourceforge.net  Thu May 21 16:49:18 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Thu, 21 May 2015 14:49:18 +0000
Subject: SF.net SVN: gar:[25009] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3lsv3v1Bfqz1Bn@mail.opencsw.org>

Revision: 25009
          http://sourceforge.net/p/gar/code/25009
Author:   rmottola
Date:     2015-05-21 14:49:18 +0000 (Thu, 21 May 2015)
Log Message:
-----------
binutils/trunk: put dependency in again, but override it for 5.9-x86 where it is not needed

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-21 14:03:33 UTC (rev 25008)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-21 14:49:18 UTC (rev 25009)
@@ -51,13 +51,16 @@
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1
-#RUNTIME_DEP_PKGS_CSWbinutils-i386 += CSWlibfl2
+RUNTIME_DEP_PKGS_CSWbinutils-i386 += CSWlibfl2
 RUNTIME_DEP_PKGS_CSWbinutils += $(RUNTIME_DEP_PKGS_CSWbinutils-$(GARCH))
 
 CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content
 #Until removed from GDB:
 CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo|CSWbinutils|CSWgdb
 CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/it/LC_MESSAGES/opcodes.mo|CSWbinutils|CSWgdb
+CHECKPKG_OVERRIDES_CSWbinutils_i386_5.9 += surplus-dependency|CSWlibfl2
+CHECKPKG_OVERRIDES_CSWbinutils_i386_5.9 += dependency-on-nonexistent-package|CSWlibfl2
+CHECKPKG_OVERRIDES_CSWbinutils += $(CHECKPKG_OVERRIDES_CSWbinutils_$(GARCH)_$(GAROSREL))
 
 include gar/category.mk
 

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


From dmichelsen at users.sourceforge.net  Thu May 21 16:59:31 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 14:59:31 +0000
Subject: SF.net SVN: gar:[25010] csw/mgar/pkg/logstash/trunk/Makefile
Message-ID: <3lsvHd2qW7z1FK@mail.opencsw.org>

Revision: 25010
          http://sourceforge.net/p/gar/code/25010
Author:   dmichelsen
Date:     2015-05-21 14:59:31 +0000 (Thu, 21 May 2015)
Log Message:
-----------
logstash/trunk: Add override

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

Modified: csw/mgar/pkg/logstash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	2015-05-21 14:49:18 UTC (rev 25009)
+++ csw/mgar/pkg/logstash/trunk/Makefile	2015-05-21 14:59:31 UTC (rev 25010)
@@ -33,6 +33,9 @@
 # This can not be tracked with checkpkg
 CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
 
+# This is the DTD for SMF
+CHECKPKG_OVERRIDES_CSWlogstash += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswlogstash.xml
+
 LICENSE = LICENSE
 
 CONFIGURE_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  Thu May 21 17:32:44 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 15:32:44 +0000
Subject: SF.net SVN: gar:[25011]
	csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml
Message-ID: <3lsw1z1p9pz1M9@mail.opencsw.org>

Revision: 25011
          http://sourceforge.net/p/gar/code/25011
Author:   dmichelsen
Date:     2015-05-21 15:32:44 +0000 (Thu, 21 May 2015)
Log Message:
-----------
logstash/trunk: Fix typo in SMF manifest

Modified Paths:
--------------
    csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml

Modified: csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Thu May 21 17:50:55 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 21 May 2015 15:50:55 +0000
Subject: SF.net SVN: gar:[25012]
	csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml
Message-ID: <3lswQx3KBhz1Ph@mail.opencsw.org>

Revision: 25012
          http://sourceforge.net/p/gar/code/25012
Author:   dmichelsen
Date:     2015-05-21 15:50:55 +0000 (Thu, 21 May 2015)
Log Message:
-----------
logstash/trunk: Fix typo in SMF manifest

Modified Paths:
--------------
    csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml

Modified: csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml
===================================================================
(Binary files differ)

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  Thu May 21 18:18:06 2015
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 21 May 2015 16:18:06 +0000
Subject: SF.net SVN: gar:[25013] csw/mgar/pkg/tor/trunk
Message-ID: <3lsx2K0Lslz1SG@mail.opencsw.org>

Revision: 25013
          http://sourceforge.net/p/gar/code/25013
Author:   jake_goerzen
Date:     2015-05-21 16:18:05 +0000 (Thu, 21 May 2015)
Log Message:
-----------
tor: update to 0.2.6.8

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	2015-05-21 15:50:55 UTC (rev 25012)
+++ csw/mgar/pkg/tor/trunk/Makefile	2015-05-21 16:18:05 UTC (rev 25013)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = tor
-VERSION = 0.2.6.7
+VERSION = 0.2.6.8
 GARTYPE = v2
 
 DESCRIPTION = Secure network traffic router

Modified: csw/mgar/pkg/tor/trunk/checksums
===================================================================
--- csw/mgar/pkg/tor/trunk/checksums	2015-05-21 15:50:55 UTC (rev 25012)
+++ csw/mgar/pkg/tor/trunk/checksums	2015-05-21 16:18:05 UTC (rev 25013)
@@ -1 +1 @@
-a43b4dc6a95d219927aab0a2bb7ed322  tor-0.2.6.7.tar.gz
+20a8c1f8cd7e8c912c4f3f0b67740fa5  tor-0.2.6.8.tar.gz

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


From rmottola at users.sourceforge.net  Fri May 22 13:17:38 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 22 May 2015 11:17:38 +0000
Subject: SF.net SVN: gar:[25014] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3ltQKH3g5HzNP@mail.opencsw.org>

Revision: 25014
          http://sourceforge.net/p/gar/code/25014
Author:   rmottola
Date:     2015-05-22 11:17:38 +0000 (Fri, 22 May 2015)
Log Message:
-----------
binutils/trunk: make dependency Arch/OSRel conditional

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-21 16:18:05 UTC (rev 25013)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-22 11:17:38 UTC (rev 25014)
@@ -51,16 +51,14 @@
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1
-RUNTIME_DEP_PKGS_CSWbinutils-i386 += CSWlibfl2
-RUNTIME_DEP_PKGS_CSWbinutils += $(RUNTIME_DEP_PKGS_CSWbinutils-$(GARCH))
+RUNTIME_DEP_PKGS_CSWbinutils-i386_5.10 += CSWlibfl2
+RUNTIME_DEP_PKGS_CSWbinutils-i386_5.11 += CSWlibfl2
+RUNTIME_DEP_PKGS_CSWbinutils += $(RUNTIME_DEP_PKGS_CSWbinutils-$(GARCH)_$(GAROSREL))
 
 CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content
 #Until removed from GDB:
 CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo|CSWbinutils|CSWgdb
 CHECKPKG_OVERRIDES_CSWbinutils += file-collision|/opt/csw/share/locale/it/LC_MESSAGES/opcodes.mo|CSWbinutils|CSWgdb
-CHECKPKG_OVERRIDES_CSWbinutils_i386_5.9 += surplus-dependency|CSWlibfl2
-CHECKPKG_OVERRIDES_CSWbinutils_i386_5.9 += dependency-on-nonexistent-package|CSWlibfl2
-CHECKPKG_OVERRIDES_CSWbinutils += $(CHECKPKG_OVERRIDES_CSWbinutils_$(GARCH)_$(GAROSREL))
 
 include gar/category.mk
 

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


From dmichelsen at users.sourceforge.net  Fri May 22 15:43:35 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 22 May 2015 13:43:35 +0000
Subject: SF.net SVN: gar:[25015] csw/mgar/pkg
Message-ID: <3ltTYb3Qk1zk7@mail.opencsw.org>

Revision: 25015
          http://sourceforge.net/p/gar/code/25015
Author:   dmichelsen
Date:     2015-05-22 13:43:35 +0000 (Fri, 22 May 2015)
Log Message:
-----------
clojure/trunk: Initial commit

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

Added: csw/mgar/pkg/clojure/Makefile
===================================================================
--- csw/mgar/pkg/clojure/Makefile	                        (rev 0)
+++ csw/mgar/pkg/clojure/Makefile	2015-05-22 13:43:35 UTC (rev 25015)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/clojure/trunk
===================================================================
--- csw/mgar/pkg/clojure/trunk	2015-05-22 11:17:38 UTC (rev 25014)
+++ csw/mgar/pkg/clojure/trunk	2015-05-22 13:43:35 UTC (rev 25015)

Property changes on: csw/mgar/pkg/clojure/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/clojure/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clojure/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/clojure/trunk/Makefile	2015-05-22 13:43:35 UTC (rev 25015)
@@ -0,0 +1,31 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = clojure
+VERSION = 1.6.0
+GARTYPE = v2
+
+DESCRIPTION = A dynamic programming language that targets the Java Virtual Machine
+
+MASTER_SITES = http://repo1.maven.org/maven2/org/clojure/clojure/1.6.0/
+DISTFILES += $(DISTNAME).zip
+
+VENDOR_URL = http://clojure.org
+LICENSE = readme.txt
+
+PACKAGES += CSWclojure
+SPKG_DESC_CSWclojure = A dynamic programming language that targets the Java Virtual Machine
+# PKGFILES is catchall
+ARCHALL_CSWclojure = 1
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -D -m 0644 $(WORKSRC)/clojure-$(VERSION).jar $(DESTDIR)$(sharedstatedir)/java/clojure-$(VERSION).jar
+	ln -s clojure-$(VERSION).jar $(DESTDIR)$(sharedstatedir)/java/clojure.jar
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/clojure/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/clojure/trunk/checksums
===================================================================
--- csw/mgar/pkg/clojure/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/clojure/trunk/checksums	2015-05-22 13:43:35 UTC (rev 25015)
@@ -0,0 +1 @@
+c102956589a49ebc9e3d488b6aeb29cd  clojure-1.6.0.zip

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


From dmichelsen at users.sourceforge.net  Fri May 22 16:00:58 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 22 May 2015 14:00:58 +0000
Subject: SF.net SVN: gar:[25016] csw/mgar/pkg/clojure/trunk
Message-ID: <3ltTxf0FrYzmj@mail.opencsw.org>

Revision: 25016
          http://sourceforge.net/p/gar/code/25016
Author:   dmichelsen
Date:     2015-05-22 14:00:57 +0000 (Fri, 22 May 2015)
Log Message:
-----------
clojure/trunk: Add exec wrapper

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

Added Paths:
-----------
    csw/mgar/pkg/clojure/trunk/files/clojure

Modified: csw/mgar/pkg/clojure/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clojure/trunk/Makefile	2015-05-22 13:43:35 UTC (rev 25015)
+++ csw/mgar/pkg/clojure/trunk/Makefile	2015-05-22 14:00:57 UTC (rev 25016)
@@ -9,6 +9,8 @@
 
 MASTER_SITES = http://repo1.maven.org/maven2/org/clojure/clojure/1.6.0/
 DISTFILES += $(DISTNAME).zip
+DISTFILES += clojure
+EXPANDVARS += clojure
 
 VENDOR_URL = http://clojure.org
 LICENSE = readme.txt
@@ -17,6 +19,9 @@
 SPKG_DESC_CSWclojure = A dynamic programming language that targets the Java Virtual Machine
 # PKGFILES is catchall
 ARCHALL_CSWclojure = 1
+RUNTIME_DEP_PKGS_CSWclojure += CSWjre8
+# checkpkg cannot trace this dependency
+CHECKPKG_OVERRIDES_CSWclojure += surplus-dependency|CSWjre8
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -28,4 +33,5 @@
 install-custom:
 	ginstall -D -m 0644 $(WORKSRC)/clojure-$(VERSION).jar $(DESTDIR)$(sharedstatedir)/java/clojure-$(VERSION).jar
 	ln -s clojure-$(VERSION).jar $(DESTDIR)$(sharedstatedir)/java/clojure.jar
+	ginstall -D -m 0755 $(WORKDIR)/clojure $(DESTDIR)$(bindir)/clojure
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/clojure/trunk/files/clojure
===================================================================
--- csw/mgar/pkg/clojure/trunk/files/clojure	                        (rev 0)
+++ csw/mgar/pkg/clojure/trunk/files/clojure	2015-05-22 14:00:57 UTC (rev 25016)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /opt/csw/java/jre/jre8/bin/java -cp @sharedstatedir@/java/clojure- at VERSION@.jar clojure.main "$@"

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


From rmottola at users.sourceforge.net  Fri May 22 19:28:59 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 22 May 2015 17:28:59 +0000
Subject: SF.net SVN: gar:[25017] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3ltZYf4xmczsm@mail.opencsw.org>

Revision: 25017
          http://sourceforge.net/p/gar/code/25017
Author:   rmottola
Date:     2015-05-22 17:28:59 +0000 (Fri, 22 May 2015)
Log Message:
-----------
pull all registers to get gnu grep and hope

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-22 14:00:57 UTC (rev 25016)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-22 17:28:59 UTC (rev 25017)
@@ -23,7 +23,9 @@
 
 # EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__
 
-CONFIGURE_ARGS = $(DIRPATHS) GREP=/opt/csw/bin/ggrep
+GREP=ggrep
+EXTRA_EXPORTS=GREP
+
 CONFIGURE_ARGS += --program-prefix=g
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12265
 CONFIGURE_ARGS += --disable-werror
@@ -63,7 +65,7 @@
 include gar/category.mk
 
 # We need GNU grep 
-#PATH := /opt/csw/gnu:$(PATH)
+PATH := /opt/csw/gnu:$(PATH)
 
 post-install-modulated:
 	@# Every package carries his own links in /opt/csw/gnu

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


From rmottola at users.sourceforge.net  Sat May 23 14:36:27 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Sat, 23 May 2015 12:36:27 +0000
Subject: SF.net SVN: gar:[25018] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3lv41l6nPJz1L@mail.opencsw.org>

Revision: 25018
          http://sourceforge.net/p/gar/code/25018
Author:   rmottola
Date:     2015-05-23 12:36:26 +0000 (Sat, 23 May 2015)
Log Message:
-----------
binutils/trunk: cleaner way to set grep, suggested by Dago

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-22 17:28:59 UTC (rev 25017)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-23 12:36:26 UTC (rev 25018)
@@ -23,9 +23,11 @@
 
 # EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__
 
-GREP=ggrep
-EXTRA_EXPORTS=GREP
+# We need GNU grep
+EXTRA_CONFIGURE_EXPORTS += GREP
+CONFIGURE_ENV_GREP = /opt/csw/bin/ggrep
 
+
 CONFIGURE_ARGS += --program-prefix=g
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12265
 CONFIGURE_ARGS += --disable-werror
@@ -64,8 +66,6 @@
 
 include gar/category.mk
 
-# We need GNU grep 
-PATH := /opt/csw/gnu:$(PATH)
 
 post-install-modulated:
 	@# Every package carries his own links in /opt/csw/gnu

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


From rmottola at users.sourceforge.net  Sat May 23 22:50:00 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Sat, 23 May 2015 20:50:00 +0000
Subject: SF.net SVN: gar:[25019] csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: <3lvGz71TVNzD5@mail.opencsw.org>

Revision: 25019
          http://sourceforge.net/p/gar/code/25019
Author:   rmottola
Date:     2015-05-23 20:49:59 +0000 (Sat, 23 May 2015)
Log Message:
-----------
re-add DIRPATHS which I removed accidentally

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2015-05-23 12:36:26 UTC (rev 25018)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2015-05-23 20:49:59 UTC (rev 25019)
@@ -28,6 +28,7 @@
 CONFIGURE_ENV_GREP = /opt/csw/bin/ggrep
 
 
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12265
 CONFIGURE_ARGS += --disable-werror

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 May 26 11:23:09 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2015 09:23:09 +0000
Subject: SF.net SVN: gar:[25020] csw/mgar/pkg
Message-ID: <3lwqbM6Yfzz17H@mail.opencsw.org>

Revision: 25020
          http://sourceforge.net/p/gar/code/25020
Author:   dmichelsen
Date:     2015-05-26 09:23:08 +0000 (Tue, 26 May 2015)
Log Message:
-----------
svc-graphite/trunk: Initial commit

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

Added: csw/mgar/pkg/svc-graphite/Makefile
===================================================================
--- csw/mgar/pkg/svc-graphite/Makefile	                        (rev 0)
+++ csw/mgar/pkg/svc-graphite/Makefile	2015-05-26 09:23:08 UTC (rev 25020)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/svc-graphite/trunk
===================================================================
--- csw/mgar/pkg/svc-graphite/trunk	2015-05-23 20:49:59 UTC (rev 25019)
+++ csw/mgar/pkg/svc-graphite/trunk	2015-05-26 09:23:08 UTC (rev 25020)

Property changes on: csw/mgar/pkg/svc-graphite/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/svc-graphite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/svc-graphite/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/svc-graphite/trunk/Makefile	2015-05-26 09:23:08 UTC (rev 25020)
@@ -0,0 +1,34 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = svc-graphite
+VERSION = 0.1.0
+GARTYPE = v2
+
+DESCRIPTION = A program to send performance data of IBM SVC to Graphite
+
+MASTER_SITES = https://github.com/ivoronin/svc-graphite/releases/download/v$(VERSION)/
+DISTFILES += $(DISTNAME)-standalone.jar
+DISTFILES += svc-graphite
+
+VENDOR_URL = https://github.com/ivoronin/svc-graphite
+
+PACKAGES += CSWsvc-graphite
+SPKG_DESC_CSWsvc-graphite = A program to send performance data of IBM SVC to Graphite
+# PKGFILES is catchall
+ARCHALL_CSWsvc-graphite = 1
+RUNTIME_DEP_PKGS_CSWsvc-graphite += CSWjre8
+CHECKPKG_OVERRIDES_CSWsvc-graphite += surplus-dependency|CSWjre8
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -D -m 0644 $(WORKDIR)/$(DISTNAME)-standalone.jar $(DESTDIR)$(sharedstatedir)/java/$(DISTNAME).jar
+	ln -s $(DISTNAME).jar $(DESTDIR)$(sharedstatedir)/java/$(NAME).jar
+	ginstall -D -m 0755 $(WORKDIR)/svc-graphite $(DESTDIR)$(bindir)/svc-graphite
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/svc-graphite/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/svc-graphite/trunk/checksums
===================================================================
--- csw/mgar/pkg/svc-graphite/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/svc-graphite/trunk/checksums	2015-05-26 09:23:08 UTC (rev 25020)
@@ -0,0 +1 @@
+de7b92e3a568302137d4acb6aa623838  svc-graphite-0.1.0-standalone.jar

Added: csw/mgar/pkg/svc-graphite/trunk/files/svc-graphite
===================================================================
--- csw/mgar/pkg/svc-graphite/trunk/files/svc-graphite	                        (rev 0)
+++ csw/mgar/pkg/svc-graphite/trunk/files/svc-graphite	2015-05-26 09:23:08 UTC (rev 25020)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /opt/csw/java/jre/jre8/bin/java -jar /opt/csw/share/java/svc-graphite.jar "$@"

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


From aironskin at users.sourceforge.net  Tue May 26 14:15:34 2015
From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net)
Date: Tue, 26 May 2015 12:15:34 +0000
Subject: SF.net SVN: gar:[25021] csw/mgar/pkg/iozone/trunk
Message-ID: <3lwvQG3L7fz1C6@mail.opencsw.org>

Revision: 25021
          http://sourceforge.net/p/gar/code/25021
Author:   aironskin
Date:     2015-05-26 12:15:34 +0000 (Tue, 26 May 2015)
Log Message:
-----------
Minor version update

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

Modified: csw/mgar/pkg/iozone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iozone/trunk/Makefile	2015-05-26 09:23:08 UTC (rev 25020)
+++ csw/mgar/pkg/iozone/trunk/Makefile	2015-05-26 12:15:34 UTC (rev 25021)
@@ -1,5 +1,5 @@
 NAME = iozone
-VERSION = 3.429
+VERSION = 3.430
 DISTVERSION = $(subst .,_,$(VERSION))
 GARTYPE = v2
 
@@ -36,7 +36,7 @@
 PATCHFILES  += patch_vxioctl.diff
 
 # Dependency for contributed scripts
-RUNTIME_DEP_PKGS = CSWgnuplot
+RUNTIME_DEP_PKGS_CSWiozone += CSWperl
 
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
@@ -68,9 +68,6 @@
 
 BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile
 
-CHECKPKG_OVERRIDES_CSWiozone += surplus-dependency|CSWgnuplot
-CHECKPKG_OVERRIDES_CSWiozone += missing-dependency|CSWperl
-
 # There is no test suite
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/iozone/trunk/checksums
===================================================================
--- csw/mgar/pkg/iozone/trunk/checksums	2015-05-26 09:23:08 UTC (rev 25020)
+++ csw/mgar/pkg/iozone/trunk/checksums	2015-05-26 12:15:34 UTC (rev 25021)
@@ -1 +1 @@
-d673e21c4a69588eac7d2b085088f83b  iozone3_429.tar
+bc8031b184467150a8eae59dcadb6376  iozone3_430.tar

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 May 26 15:07:09 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 26 May 2015 13:07:09 +0000
Subject: SF.net SVN: gar:[25022] csw/mgar/pkg/apache24/trunk
Message-ID: <3lwwYl09x9z1GH@mail.opencsw.org>

Revision: 25022
          http://sourceforge.net/p/gar/code/25022
Author:   cgrzemba
Date:     2015-05-26 13:07:09 +0000 (Tue, 26 May 2015)
Log Message:
-----------
apache24/trunk: add 64bit module config

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

Added Paths:
-----------
    csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-05-26 12:15:34 UTC (rev 25021)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-26 13:07:09 UTC (rev 25022)
@@ -43,6 +43,9 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
+EXTRA_MERGE_DIRS_isa-amd64 += /etc/opt/csw/64/apache2/extra
 
 # This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
 CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
@@ -98,8 +101,15 @@
 
 BUILD64 = 1
 
+# ifeq ($(MEMORYMODEL),64)
+# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/64/apache2/extra/module.load
+# else
+# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/apache2/extra/module.load
+# endif
+MODULE_CONF=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/apache2/extra/module.load
+
 # Build Configuration
-CONFIGURE_ARGS  = --with-apr=$(prefix)
+CONFIGURE_ARGS += --with-apr=$(prefix)
 CONFIGURE_ARGS += --with-pcre=$(bindir)/pcre-config
 CONFIGURE_ARGS += --with-libxml2=$(includedir)/libxml2
 CONFIGURE_ARGS-32 += --with-lua=$(prefix)
@@ -115,7 +125,6 @@
 CONFIGURE_ARGS += --with-ssl
 # As requested in https://www.opencsw.org/mantis/view.php?id=5152
 CONFIGURE_ARGS += --enable-proxy-html
-
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
 EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE
@@ -144,6 +153,16 @@
 	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(sysconfdir)/apache2/httpd.conf
 	perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man1/*
 	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man8/*
+	ginstall -d $(dir $(MODULE_CONF))
+	(cd $(DESTDIR)$(sysconfdir)/apache2 && \
+		grep LoadModule httpd.conf > $(MODULE_CONF) && \
+		gsed -e '/^#LoadModule/d' -i httpd.conf; \
+		gsed -e '/^LoadModule/d' -i httpd.conf; \
+		gsed -e '/# LoadModule/a <IfDefine 64bit>\n\Include $(sysconfdir)/64/apache2/extra/modules.load\n\</IfDefine>\n\<IfDefine !64bit>\n\Include $(sysconfdir)/apache2/extra/modules.load\n\</IfDefine>' -i httpd.conf; \
+	)
 	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/#FMRI/a [ \$${ENABLE64} = "true" ] && MM=/64' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/#FMRI/a ENABLE64=\$$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall	                        (rev 0)
+++ csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall	2015-05-26 13:07:09 UTC (rev 25022)
@@ -0,0 +1 @@
+[ -x /usr/sbin/svccfg ] && /usr/sbin/svccfg -s cswapache24 'setprop config/enable_64bit = :boolean false'

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 May 26 16:02:54 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 26 May 2015 14:02:54 +0000
Subject: SF.net SVN: gar:[25023] csw/mgar/pkg/apache24/trunk
Message-ID: <3lwxpG5mG2z1KK@mail.opencsw.org>

Revision: 25023
          http://sourceforge.net/p/gar/code/25023
Author:   cgrzemba
Date:     2015-05-26 14:02:54 +0000 (Tue, 26 May 2015)
Log Message:
-----------
add 64bit config

Added Paths:
-----------
    csw/mgar/pkg/apache24/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/apache24/trunk/Makefile

Deleted: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-05-26 13:07:09 UTC (rev 25022)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-26 14:02:54 UTC (rev 25023)
@@ -1,168 +0,0 @@
-# $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $
-
-NAME = httpd
-VERSION = 2.4.12
-GARTYPE = v2
-
-PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
-
-DESCRIPTION = A high performance HTTP server.
-define BLURB
-  Apache is the world\'s most popular HTTP server, being quite possibly the
-  best around in terms of functionality, efficiency, security and speed.
-endef
-
-MASTER_SITES  = http://www.eu.apache.org/dist/httpd/
-DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswapache24
-EXPANDVARS += cswapache24
-
-PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
-PATCHFILES += 0003-fix-43561-apxs.patch
-
-#PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
-DISTFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
-
-EXPANDVARS += 0001-Add-an-OpenCSW-option-to-config.layout.patch
-
-# SKIP_MODULATIONS += isa-sparcv8plus
-
-VENDOR_URL = http://httpd.apache.org/
-LICENSE = LICENSE
-
-GARCOMPILER = SOS12U4
-
-PACKAGES = CSWapache24
-SPKG_DESC_CSWapache24 = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
-RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
-EXTRA_MERGE_DIRS_isa-amd64 += /etc/opt/csw/64/apache2/extra
-
-# This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
-CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
-
-PACKAGES += CSWapache24-manual
-ARCHALL_CSWapache24-manual = 1
-SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual
-PKGFILES_CSWapache24-manual = /var/opt/csw/apache2/manual.*
-RUNTIME_DEPS_CSWapache24-manual = CSWapache24
-CHECKPKG_OVERRIDES_CSWapache24-manual += file-with-bad-content
-
-PACKAGES += CSWapache24-dev
-SPKG_DESC_CSWapache24-dev = The Apache 2.4 Development Files
-PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL)
-
-# This is a fallback
-CHECKPKG_OVERRIDES_CSWapache24-dev += file-with-bad-content|/usr/local|root/opt/csw/include/apache2/httpd.h
-
-BUILD_DEP_PKGS += CSWlibaprutil-dev
-
-INITSMF = /etc/opt/csw/init.d/cswapache24
-
-PRESERVECONF += $(sysconfdir)/apache2/envvars
-PRESERVECONF += $(sysconfdir)/apache2/mime.types
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-manual.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-userdir.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-languages.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-vhosts.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-info.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/proxy-html.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-dav.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-multilang-errordoc.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-autoindex.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-mpm.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-default.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-ssl.conf
-PRESERVECONF += $(sysconfdir)/apache2/envvars-std
-PRESERVECONF += $(sysconfdir)/apache2/magic
-PRESERVECONF += $(sysconfdir)/apache2/httpd.conf
-
-# These two are link destinations and put in place via PRESERVECONF
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/sparcv9/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/sparcv9/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/amd64/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
-CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/amd64/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
-
-SSLCERT = /etc/opt/csw/apache2/server
-
-# We need this to get bdb48/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb48/lib
-
-BUILD64 = 1
-
-# ifeq ($(MEMORYMODEL),64)
-# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/64/apache2/extra/module.load
-# else
-# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/apache2/extra/module.load
-# endif
-MODULE_CONF=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/apache2/extra/module.load
-
-# Build Configuration
-CONFIGURE_ARGS += --with-apr=$(prefix)
-CONFIGURE_ARGS += --with-pcre=$(bindir)/pcre-config
-CONFIGURE_ARGS += --with-libxml2=$(includedir)/libxml2
-CONFIGURE_ARGS-32 += --with-lua=$(prefix)
-#CONFIGURE_ARGS-64 += --without-lua
-CONFIGURE_ARGS += --enable-mpms-shared=all
-# CONFIGURE_ARGS += --with-mpm=prefork
-CONFIGURE_ARGS += --enable-layout=OpenCSW
-CONFIGURE_ARGS += --enable-mods-shared=all
-CONFIGURE_ARGS += --enable-cgi
-CONFIGURE_ARGS += --enable-privileges
-CONFIGURE_ARGS += --enable-vhost-alias
-#CONFIGURE_ARGS += --with-ssl=$(prefix)
-CONFIGURE_ARGS += --with-ssl
-# As requested in https://www.opencsw.org/mantis/view.php?id=5152
-CONFIGURE_ARGS += --enable-proxy-html
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
-
-EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE
-
-# Fixup target variables
-APACHE_ROOT   = $(DESTDIR)$(prefix)
-LIBTOOL_LADIR = $(APACHE_ROOT)/lib
-STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
-
-TEST_TARGET = test
-
-include gar/category.mk
-
-# We need this special construct because the patch should have expandvars
-post-patch:
-	cd $(WORKSRC) && gpatch -p1 <$(abspath $(WORKDIR)/0001-Add-an-OpenCSW-option-to-config.layout.patch)
-	@$(MAKECOOKIE)
-
-post-install:
-	(cd $(DESTDIR)$(sbindir); \
-	   for f in envvars*; do \
-		mv $$f $(DESTDIR)$(sysconfdir)/apache2/; \
-		ln -s $(sysconfdir)/apache2/$$f $$f; \
-	   done )
-	rm -rf $(DESTDIR)$(sysconfdir)/apache2/original
-	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(sysconfdir)/apache2/httpd.conf
-	perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man1/*
-	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man8/*
-	ginstall -d $(dir $(MODULE_CONF))
-	(cd $(DESTDIR)$(sysconfdir)/apache2 && \
-		grep LoadModule httpd.conf > $(MODULE_CONF) && \
-		gsed -e '/^#LoadModule/d' -i httpd.conf; \
-		gsed -e '/^LoadModule/d' -i httpd.conf; \
-		gsed -e '/# LoadModule/a <IfDefine 64bit>\n\Include $(sysconfdir)/64/apache2/extra/modules.load\n\</IfDefine>\n\<IfDefine !64bit>\n\Include $(sysconfdir)/apache2/extra/modules.load\n\</IfDefine>' -i httpd.conf; \
-	)
-	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a [ \$${ENABLE64} = "true" ] && MM=/64' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a ENABLE64=\$$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
-	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/apache24/trunk/Makefile (from rev 25022, csw/mgar/pkg/apache24/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-26 14:02:54 UTC (rev 25023)
@@ -0,0 +1,168 @@
+# $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $
+
+NAME = httpd
+VERSION = 2.4.12
+GARTYPE = v2
+
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
+
+DESCRIPTION = A high performance HTTP server.
+define BLURB
+  Apache is the world\'s most popular HTTP server, being quite possibly the
+  best around in terms of functionality, efficiency, security and speed.
+endef
+
+MASTER_SITES  = http://www.eu.apache.org/dist/httpd/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswapache24
+EXPANDVARS += cswapache24
+
+PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+PATCHFILES += 0003-fix-43561-apxs.patch
+
+#PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+DISTFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+
+EXPANDVARS += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+
+# SKIP_MODULATIONS += isa-sparcv8plus
+
+VENDOR_URL = http://httpd.apache.org/
+LICENSE = LICENSE
+
+GARCOMPILER = SOS12U4
+
+PACKAGES = CSWapache24
+SPKG_DESC_CSWapache24 = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
+EXTRA_MERGE_DIRS_isa-amd64 += /etc/opt/csw/64/apache2/extra
+
+# This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
+CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
+
+PACKAGES += CSWapache24-manual
+ARCHALL_CSWapache24-manual = 1
+SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual
+PKGFILES_CSWapache24-manual = /var/opt/csw/apache2/manual.*
+RUNTIME_DEPS_CSWapache24-manual = CSWapache24
+CHECKPKG_OVERRIDES_CSWapache24-manual += file-with-bad-content
+
+PACKAGES += CSWapache24-dev
+SPKG_DESC_CSWapache24-dev = The Apache 2.4 Development Files
+PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL)
+
+# This is a fallback
+CHECKPKG_OVERRIDES_CSWapache24-dev += file-with-bad-content|/usr/local|root/opt/csw/include/apache2/httpd.h
+
+BUILD_DEP_PKGS += CSWlibaprutil-dev
+
+INITSMF = /etc/opt/csw/init.d/cswapache24
+
+PRESERVECONF += $(sysconfdir)/apache2/envvars
+PRESERVECONF += $(sysconfdir)/apache2/mime.types
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-manual.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-userdir.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-languages.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-vhosts.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-info.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/proxy-html.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-dav.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-multilang-errordoc.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-autoindex.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-mpm.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-default.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-ssl.conf
+PRESERVECONF += $(sysconfdir)/apache2/envvars-std
+PRESERVECONF += $(sysconfdir)/apache2/magic
+PRESERVECONF += $(sysconfdir)/apache2/httpd.conf
+
+# These two are link destinations and put in place via PRESERVECONF
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/sparcv9/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/sparcv9/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars|CSWapache24|contains|symlink|/opt/csw/sbin/amd64/envvars|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars
+CHECKPKG_OVERRIDES_CSWapache24 += file-needed-but-no-package-satisfies-it|/etc/opt/csw/apache2/envvars-std|CSWapache24|contains|symlink|/opt/csw/sbin/amd64/envvars-std|which|needs|the|target|file:|/etc/opt/csw/apache2/envvars-std
+
+SSLCERT = /etc/opt/csw/apache2/server
+
+# We need this to get bdb48/lib into the runpath
+EXTRA_LIB = $(prefix)/bdb48/lib
+
+BUILD64 = 1
+
+# ifeq ($(MEMORYMODEL),64)
+# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/64/apache2/extra/module.load
+# else
+# 	MODULE_CONF=$(DESTDIR)$(sysconfdir)/apache2/extra/module.load
+# endif
+MODULE_CONF=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/apache2/extra/module.load
+
+# Build Configuration
+CONFIGURE_ARGS += --with-apr=$(prefix)
+CONFIGURE_ARGS += --with-pcre=$(bindir)/pcre-config
+CONFIGURE_ARGS += --with-libxml2=$(includedir)/libxml2
+CONFIGURE_ARGS-32 += --with-lua=$(prefix)
+#CONFIGURE_ARGS-64 += --without-lua
+CONFIGURE_ARGS += --enable-mpms-shared=all
+# CONFIGURE_ARGS += --with-mpm=prefork
+CONFIGURE_ARGS += --enable-layout=OpenCSW
+CONFIGURE_ARGS += --enable-mods-shared=all
+CONFIGURE_ARGS += --enable-cgi
+CONFIGURE_ARGS += --enable-privileges
+CONFIGURE_ARGS += --enable-vhost-alias
+#CONFIGURE_ARGS += --with-ssl=$(prefix)
+CONFIGURE_ARGS += --with-ssl
+# As requested in https://www.opencsw.org/mantis/view.php?id=5152
+CONFIGURE_ARGS += --enable-proxy-html
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
+EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE
+
+# Fixup target variables
+APACHE_ROOT   = $(DESTDIR)$(prefix)
+LIBTOOL_LADIR = $(APACHE_ROOT)/lib
+STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
+
+TEST_TARGET = test
+
+include gar/category.mk
+
+# We need this special construct because the patch should have expandvars
+post-patch:
+	cd $(WORKSRC) && gpatch -p1 <$(abspath $(WORKDIR)/0001-Add-an-OpenCSW-option-to-config.layout.patch)
+	@$(MAKECOOKIE)
+
+post-install:
+	(cd $(DESTDIR)$(sbindir); \
+	   for f in envvars*; do \
+		mv $$f $(DESTDIR)$(sysconfdir)/apache2/; \
+		ln -s $(sysconfdir)/apache2/$$f $$f; \
+	   done )
+	rm -rf $(DESTDIR)$(sysconfdir)/apache2/original
+	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(sysconfdir)/apache2/httpd.conf
+	perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man1/*
+	perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man8/*
+	ginstall -d $(dir $(MODULE_CONF))
+	(cd $(DESTDIR)$(sysconfdir)/apache2 && \
+		grep LoadModule httpd.conf > $(MODULE_CONF) && \
+		gsed -e '/^#LoadModule/d' -i httpd.conf; \
+		gsed -e '/^LoadModule/d' -i httpd.conf; \
+		gsed -e '/# LoadModule/a <IfDefine 64bit>\n\Include $(sysconfdir)/64/apache2/extra/modules.load\n\</IfDefine>\n\<IfDefine !64bit>\n\Include $(sysconfdir)/apache2/extra/modules.load\n\</IfDefine>' -i httpd.conf; \
+	)
+	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/#FMRI/a [ \$${ENABLE64} = "true" ] && MM=/64' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/#FMRI/a ENABLE64=\$$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
+	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
+	@$(MAKECOOKIE)

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


From dmichelsen at users.sourceforge.net  Wed May 27 13:41:48 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2015 11:41:48 +0000
Subject: SF.net SVN: gar:[25024] csw/mgar/pkg/lang-python/carbon/trunk
Message-ID: <3lxVct4q3Xz7C@mail.opencsw.org>

Revision: 25024
          http://sourceforge.net/p/gar/code/25024
Author:   dmichelsen
Date:     2015-05-27 11:41:47 +0000 (Wed, 27 May 2015)
Log Message:
-----------
lang-python/carbon/trunk: Add SMF manifest for carbon-cache

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

Added Paths:
-----------
    csw/mgar/pkg/lang-python/carbon/trunk/files/cswcarbon-cache.xml

Modified: csw/mgar/pkg/lang-python/carbon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/carbon/trunk/Makefile	2015-05-26 14:02:54 UTC (rev 25023)
+++ csw/mgar/pkg/lang-python/carbon/trunk/Makefile	2015-05-27 11:41:47 UTC (rev 25024)
@@ -8,7 +8,8 @@
 DESCRIPTION = Backend data caching and persistence daemon for Graphite
 
 MASTER_SITES = $(PYPI_MIRROR)
-DISTFILES  = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswcarbon-cache.xml
 
 PACKAGES += CSWpy-carbon
 SPKG_DESC_CSWpy-carbon = Backend data caching and persistence daemon for Graphite
@@ -23,6 +24,9 @@
 CHECKPKG_OVERRIDES_CSWpy-carbon += surplus-dependency|CSWpy-twisted
 CHECKPKG_OVERRIDES_CSWpy-carbon += surplus-dependency|CSWpy-txamqp
 
+# This is for the SMF DTD
+CHECKPKG_OVERRIDES_CSWpy-carbon += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswcarbon-cache.xml
+
 CONFDIR = $(sysconfdir)/graphite
 STORAGEDIR = $(localstatedir)/graphite
 
@@ -81,6 +85,10 @@
 REINPLACE_WITH_stor = "$(STORAGEDIR)"
 REINPLACE_FILES_stor += lib/carbon/conf.py
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswcarbon-cache.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
 post-extract:
@@ -93,4 +101,5 @@
 	ginstall -d -m 0755 $(DESTDIR)$(STORAGEDIR)
 	mv $(DESTDIR)$(CONFDIR)/storage/* $(DESTDIR)$(STORAGEDIR)
 	rmdir $(DESTDIR)$(CONFDIR)/storage
+	ginstall -D -m 0644 $(WORKDIR)/cswcarbon-cache.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswcarbon-cache.xml
 	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/lang-python/carbon/trunk/files/cswcarbon-cache.xml (from rev 25012, csw/mgar/pkg/logstash/trunk/files/cswlogstash.xml)
===================================================================
(Binary files differ)

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


From cgrzemba at users.sourceforge.net  Wed May 27 14:02:46 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 27 May 2015 12:02:46 +0000
Subject: SF.net SVN: gar:[25025] csw/mgar/pkg/apache24/trunk
Message-ID: <3lxW521XQzzB1@mail.opencsw.org>

Revision: 25025
          http://sourceforge.net/p/gar/code/25025
Author:   cgrzemba
Date:     2015-05-27 12:02:45 +0000 (Wed, 27 May 2015)
Log Message:
-----------
apache24/trunk: redefine EXTRA_MERGE_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/apache24/trunk/Makefile
    csw/mgar/pkg/apache24/trunk/files/cswapache24

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 11:41:47 UTC (rev 25024)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 12:02:45 UTC (rev 25025)
@@ -45,7 +45,7 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
-EXTRA_MERGE_DIRS_isa-amd64 += /etc/opt/csw/64/apache2/extra
+EXTRA_MERGE_DIRS_isa-extra += /etc/opt/csw/64/apache2/extra
 
 # This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
 CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
@@ -161,8 +161,6 @@
 		gsed -e '/# LoadModule/a <IfDefine 64bit>\n\Include $(sysconfdir)/64/apache2/extra/modules.load\n\</IfDefine>\n\<IfDefine !64bit>\n\Include $(sysconfdir)/apache2/extra/modules.load\n\</IfDefine>' -i httpd.conf; \
 	)
 	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a [ \$${ENABLE64} = "true" ] && MM=/64' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a ENABLE64=\$$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/apache24/trunk/files/cswapache24
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/cswapache24	2015-05-27 11:41:47 UTC (rev 25024)
+++ csw/mgar/pkg/apache24/trunk/files/cswapache24	2015-05-27 12:02:45 UTC (rev 25025)
@@ -1,4 +1,4 @@
-#!/sbin/sh
+#!/sbin/ksh
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -11,6 +11,8 @@
 #RC_KLEV 0,1,2,S
 #RC_SLEV 3
 #FMRI network
+ENABLE64=$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})
+[ ${ENABLE64} = "true" ] && MM=/64
 
 APACHE_HOME=@prefix@
 CONF_FILE=@sysconfdir@/apache2/httpd.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  Wed May 27 14:32:14 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2015 12:32:14 +0000
Subject: SF.net SVN: gar:[25026] csw/mgar/pkg/lang-python/carbon/trunk/files/
	cswcarbon-cache.xml
Message-ID: <3lxWkx3YGjzDT@mail.opencsw.org>

Revision: 25026
          http://sourceforge.net/p/gar/code/25026
Author:   dmichelsen
Date:     2015-05-27 12:32:14 +0000 (Wed, 27 May 2015)
Log Message:
-----------
lang-python/carbon/trunk: Add contract to SMF

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/carbon/trunk/files/cswcarbon-cache.xml

Modified: csw/mgar/pkg/lang-python/carbon/trunk/files/cswcarbon-cache.xml
===================================================================
(Binary files differ)

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


From dmichelsen at users.sourceforge.net  Wed May 27 15:22:20 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2015 13:22:20 +0000
Subject: SF.net SVN: gar:[25027] csw/mgar/pkg/lang-python/graphite-web/trunk
Message-ID: <3lxXrq2vC7zHH@mail.opencsw.org>

Revision: 25027
          http://sourceforge.net/p/gar/code/25027
Author:   dmichelsen
Date:     2015-05-27 13:22:20 +0000 (Wed, 27 May 2015)
Log Message:
-----------
lang-python/graphite-web/trunk: Adjust name of vhost

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile
    csw/mgar/pkg/lang-python/graphite-web/trunk/files/README.OPENCSW

Modified: csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile	2015-05-27 12:32:14 UTC (rev 25026)
+++ csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile	2015-05-27 13:22:20 UTC (rev 25027)
@@ -123,7 +123,7 @@
 # There is no testsuite
 TEST_SCRIPTS =
 
-PRESERVECONF += $(prefix)/apache2/etc/extra/graphite-vhost.conf
+PRESERVECONF += $(prefix)/apache2/etc/extra/httpd-graphite-vhost.conf
 
 # TBD: This needs customization of pathes
 PRESERVECONF += /opt/csw/lib/python2.6/site-packages/graphite/local_settings.py
@@ -140,7 +140,7 @@
 V2_7 = 2.7
 
 post-install:
-	ginstall -D -m 0644 $(DESTDIR)$(CONFDIR)/examples/example-graphite-vhost.conf $(DESTDIR)$(prefix)/apache2/etc/extra/graphite-vhost.conf.CSW
+	ginstall -D -m 0644 $(DESTDIR)$(CONFDIR)/examples/example-graphite-vhost.conf $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-graphite-vhost.conf.CSW
 	rm -f $(DESTDIR)$(CONFDIR)/examples/example-graphite-vhost.conf	
 	mv $(DESTDIR)/opt/csw/lib/python$(V$(PYTHON_VERSION))/site-packages/graphite/local_settings.py.example \
 	   $(DESTDIR)/opt/csw/lib/python$(V$(PYTHON_VERSION))/site-packages/graphite/local_settings.py.CSW

Modified: csw/mgar/pkg/lang-python/graphite-web/trunk/files/README.OPENCSW
===================================================================
--- csw/mgar/pkg/lang-python/graphite-web/trunk/files/README.OPENCSW	2015-05-27 12:32:14 UTC (rev 25026)
+++ csw/mgar/pkg/lang-python/graphite-web/trunk/files/README.OPENCSW	2015-05-27 13:22:20 UTC (rev 25027)
@@ -3,11 +3,28 @@
 
 pkgutil -y -i graphite_web
 
+* Configuration files
+    /etc/opt/csw/graphite
+
 carbon-cache.py start
+-> TBD: SMF
 
+-> TBD: Other Daemons carbon-relay.py, carbon-aggregator.py
+
 /opt/csw/apache2/etc/httpd.conf:
   Include etc/extra/graphite-vhost.conf
 
 python2.7 /opt/csw/lib/python2.7/site-packages/graphite/manage.py syncdb
 chown -R nobody:nobody /var/opt/csw/graphite
 
+* Settings:
+    /opt/csw/lib/python2.7/site-packages/graphite/local_settings.py
+
+* Remove user from Django:
+    http://stackoverflow.com/questions/26713443/django-delete-superuser
+  > django-admin.py shell
+  $ from django.contrib.auth.models import User
+  $ User.objects.get(username="joebloggs", is_superuser=True).delete()
+
+
+TBD: Grafana Dashboard ("Kibana for Graphite")

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 May 27 15:50:19 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2015 13:50:19 +0000
Subject: SF.net SVN: gar:[25028] csw/mgar/pkg/lang-python/graphite-web/trunk/
	Makefile
Message-ID: <3lxYT21nq9zKn@mail.opencsw.org>

Revision: 25028
          http://sourceforge.net/p/gar/code/25028
Author:   dmichelsen
Date:     2015-05-27 13:50:19 +0000 (Wed, 27 May 2015)
Log Message:
-----------
lang-python/graphite-web/trunk: Adjust quoting

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

Modified: csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile	2015-05-27 13:22:20 UTC (rev 25027)
+++ csw/mgar/pkg/lang-python/graphite-web/trunk/Makefile	2015-05-27 13:50:19 UTC (rev 25028)
@@ -101,17 +101,17 @@
 
 REINPLACEMENTS += localsettings_conf
 REINPLACE_MATCH_localsettings_conf = \#CONF_DIR.*
-REINPLACE_WITH_localsettings_conf = CONF_DIR = '$(CONFDIR)'
+REINPLACE_WITH_localsettings_conf = CONF_DIR = "$(CONFDIR)"
 REINPLACE_FILES_localsettings_conf += webapp/graphite/local_settings.py.example
 
 REINPLACEMENTS += localsettings_storage
 REINPLACE_MATCH_localsettings_storage = \#STORAGE_DIR.*
-REINPLACE_WITH_localsettings_storage = STORAGE_DIR = '$(STORAGEDIR)'
+REINPLACE_WITH_localsettings_storage = STORAGE_DIR = "$(STORAGEDIR)"
 REINPLACE_FILES_localsettings_storage += webapp/graphite/local_settings.py.example
 
 REINPLACEMENTS += localsettings_content
 REINPLACE_MATCH_localsettings_content = \#CONTENT_DIR.*
-REINPLACE_WITH_localsettings_content = CONTENT_DIR = '$(WEBAPPDIR)/webapp/content'
+REINPLACE_WITH_localsettings_content = CONTENT_DIR = "$(WEBAPPDIR)/webapp/content"
 REINPLACE_FILES_localsettings_content += webapp/graphite/local_settings.py.example
 
 EXTRA_INSTALL_ARGS += --install-data=$(CONFDIR)

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


From cgrzemba at users.sourceforge.net  Wed May 27 16:48:51 2015
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 27 May 2015 14:48:51 +0000
Subject: SF.net SVN: gar:[25029] csw/mgar/pkg/apache24/trunk/Makefile
Message-ID: <3lxZmf17x2zNw@mail.opencsw.org>

Revision: 25029
          http://sourceforge.net/p/gar/code/25029
Author:   cgrzemba
Date:     2015-05-27 14:48:50 +0000 (Wed, 27 May 2015)
Log Message:
-----------
apache24/trunk: readd checkpkg overrides

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

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 13:50:19 UTC (rev 25028)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 14:48:50 UTC (rev 25029)
@@ -48,7 +48,7 @@
 EXTRA_MERGE_DIRS_isa-extra += /etc/opt/csw/64/apache2/extra
 
 # This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
-CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
+# CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
 
 PACKAGES += CSWapache24-manual
 ARCHALL_CSWapache24-manual = 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 May 28 14:00:28 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 28 May 2015 12:00:28 +0000
Subject: SF.net SVN: gar:[25030] csw/mgar/pkg/lang-python/django/trunk
Message-ID: <3ly7030Zfnz1D6@mail.opencsw.org>

Revision: 25030
          http://sourceforge.net/p/gar/code/25030
Author:   dmichelsen
Date:     2015-05-28 12:00:28 +0000 (Thu, 28 May 2015)
Log Message:
-----------
lang-python/django/trunk: Update to 1.8.2

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

Modified: csw/mgar/pkg/lang-python/django/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django/trunk/Makefile	2015-05-27 14:48:50 UTC (rev 25029)
+++ csw/mgar/pkg/lang-python/django/trunk/Makefile	2015-05-28 12:00:28 UTC (rev 25030)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = django
-VERSION = 1.6.5
+VERSION = 1.8.2
 CATEGORIES = python
 GARTYPE = v2
 
@@ -17,40 +17,32 @@
   the stringent requirements of the experienced Web developers who wrote it. It
   lets you build high-performing, elegant Web applications quickly.
 endef
-SPKG_SOURCEURL = http://www.djangoproject.com/
-# UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz
 
-MASTER_SITES = http://www.djangoproject.com/download/$(VERSION)/tarball/
-DISTFILES  = $(DISTNAME).tar.gz
+#MASTER_SITES = http://www.djangoproject.com/download/$(VERSION)/tarball/
+MASTER_SITES += https://www.djangoproject.com/m/releases/1.8/
 DISTNAME = Django-$(VERSION)
+DISTFILES += $(DISTNAME).tar.gz
 
-PACKAGES = CSWpy-django
-CATALOGNAME_CSWpy-django = py_django
-ARCHALL = 1
+VENDOR_URL = http://www.djangoproject.com/
+
+# Django 1.8 only supports Python 2.7:
+#   https://docs.djangoproject.com/en/1.8/faq/install/#what-python-version-can-i-use-with-django
+MODULATIONS_PYTHON_VERSION = 2_7
+
+PACKAGES += CSWpy-django
+SPKG_DESC_CSWpy-django = A high-level Python Web framework
+# PKGFILES is catchall
+ARCHALL_CSWpy-django = 1
+
+# /usr/share/zoneinfo
+CHECKPKG_OVERRIDES_CSWpy-django += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/django/conf/__init__.py
+
+# Django 1.8 only supports Python 2.7, see above
+CHECKPKG_OVERRIDES_CSWpy-django += python-package-missing-py26-files
+
 # /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
-
-CONFIGURE_SCRIPTS =
-TEST_SCRIPTS =
-LICENSE = LICENSE
-# There's a problem that the download URL of the Django source tarball does not
-# contain the file name. The browser is being redirected instead. Hard-coding
-# the URL and using a custom target to fit the rest of mGAR.
-http//www.djangoproject.com/download/$(VERSION)/tarball/Django-$(VERSION).tar.gz:
-	@wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://www.djangoproject.com/download/$(VERSION)/tarball
-	pwd
-	mv $(DOWNLOADDIR)/partial/tarball $(DOWNLOADDIR)/partial/$(DISTFILES)
-
-CHECKPKG_OVERRIDES_CSWpy-django += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/django/conf/__init__.py
-CHECKPKG_OVERRIDES_CSWpy-django += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/django/conf/__init__.py
-
 include gar/category.mk
-
-post-install-modulated:
-	gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \;
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/lang-python/django/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/django/trunk/checksums	2015-05-27 14:48:50 UTC (rev 25029)
+++ csw/mgar/pkg/lang-python/django/trunk/checksums	2015-05-28 12:00:28 UTC (rev 25030)
@@ -1 +1 @@
-e4c5b2d35ecb3807317713afa70a0c77  Django-1.6.5.tar.gz
+ec4330cd275dd6ce64230feebcb449c4  Django-1.8.2.tar.gz

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


From rmottola at users.sourceforge.net  Fri May 29 09:40:59 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 29 May 2015 07:40:59 +0000
Subject: SF.net SVN: gar:[25031] csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
Message-ID: <3lydB16h6Hz1VV@mail.opencsw.org>

Revision: 25031
          http://sourceforge.net/p/gar/code/25031
Author:   rmottola
Date:     2015-05-29 07:40:58 +0000 (Fri, 29 May 2015)
Log Message:
-----------
gcc4/branches/gcc-4.6.x: disable cloog which depends on obsolete library, update mpc dependency

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile

Modified: csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-28 12:00:28 UTC (rev 25030)
+++ csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-29 07:40:58 UTC (rev 25031)
@@ -2,7 +2,6 @@
 
 NAME      = gcc
 VERSION   = 4.6.3
-CATEGORIES   = lang
 GARTYPE = v2
 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
 PKG_VERSION_TOKEN = gcc4
@@ -38,7 +37,7 @@
 BUILD_DEP_PKGS += CSWlibmpc-dev
 BUILD_DEP_PKGS += CSWlibmpfr-dev
 BUILD_DEP_PKGS += CSWlibppl-dev
-BUILD_DEP_PKGS += CSWcloog-dev
+#BUILD_DEP_PKGS += CSWcloog-dev
 
 # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix
 PROGRAM_SUFFIX = -$(BASE_VERSION)
@@ -59,8 +58,8 @@
 CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --enable-cloog-backend=isl
+#CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX)
+#CONFIGURE_ARGS += --enable-cloog-backend=isl
 CONFIGURE_ARGS += --enable-java-awt=xlib
 CONFIGURE_ARGS += --enable-libada
 CONFIGURE_ARGS += --enable-libssp
@@ -117,7 +116,7 @@
 PACKAGES = $(PKG_BASENAME)core
 SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION)
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibffi4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj$(JAVA_LIB_VERSION)
@@ -126,8 +125,8 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmpxx4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibisl7
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibisl7
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl-c4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl9
@@ -312,11 +311,11 @@
 # I do not understand this regular expression.
 PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
 PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmpxx4
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibisl7
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibisl7
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl-c4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl9
@@ -343,12 +342,12 @@
 PKGFILES_$(PKG_BASENAME)gfortran += $(mandir)/.*gfortran.1
 PKGFILES_$(PKG_BASENAME)gfortran += $(infodir)/gfortran.*
 PKGFILES_$(PKG_BASENAME)gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmpxx4
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibisl7
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibisl7
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl-c4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl9
@@ -363,15 +362,15 @@
 
 PACKAGES += $(PKG_BASENAME)java
 SPKG_DESC_$(PKG_BASENAME)java       = GNU Java Compiler
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj$(JAVA_LIB_VERSION)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj-tools$(JAVA_LIB_VERSION)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgij$(JAVA_LIB_VERSION)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmp10
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmpxx4
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibisl7
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibisl7
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl-c4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl9
@@ -449,11 +448,11 @@
 PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*/include/objc/.*
 PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc.so)
 PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so)
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmpxx4
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibisl7
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibisl7
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc3
@@ -491,12 +490,12 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc3
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10
-RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2
+#RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9
 
 # This is an obsolete package. Nothing depends on it, so we can remove it.

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


From rmottola at users.sourceforge.net  Fri May 29 09:53:46 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 29 May 2015 07:53:46 +0000
Subject: SF.net SVN: gar:[25032] csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
Message-ID: <3lydSj1LF5z1Y2@mail.opencsw.org>

Revision: 25032
          http://sourceforge.net/p/gar/code/25032
Author:   rmottola
Date:     2015-05-29 07:53:46 +0000 (Fri, 29 May 2015)
Log Message:
-----------
gcc4/branches/gcc-4.6.x: add some overrides, inspired by later receipes!

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile

Modified: csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-29 07:40:58 UTC (rev 25031)
+++ csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-29 07:53:46 UTC (rev 25032)
@@ -190,6 +190,28 @@
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core
 
+#Direct binding is disabled to to problem with amd64 libs
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += no-direct-binding
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += no-direct-binding
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += no-direct-binding
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += no-direct-binding
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += no-direct-binding
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibatomic1 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibobjc3 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibquadmath0 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibssp0 += no-direct-binding
+CHECKPKG_OVERRIDES_CSWlibstdc++6 += no-direct-binding
+
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
 MERGE_EXCLUDE_LIBTOOL =

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 May 29 14:05:35 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 29 May 2015 12:05:35 +0000
Subject: SF.net SVN: gar:[25033] csw/mgar/pkg/lang-python
Message-ID: <3lyl3N6Phbz5p@mail.opencsw.org>

Revision: 25033
          http://sourceforge.net/p/gar/code/25033
Author:   dmichelsen
Date:     2015-05-29 12:05:34 +0000 (Fri, 29 May 2015)
Log Message:
-----------
lang-python/bucky: Initial commit

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

Added Paths:
-----------
    csw/mgar/pkg/lang-python/bucky/

Modified: csw/mgar/pkg/lang-python/bucky/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/txamqp/trunk/Makefile	2015-04-03 16:12:03 UTC (rev 24802)
+++ csw/mgar/pkg/lang-python/bucky/trunk/Makefile	2015-05-29 12:05:34 UTC (rev 25033)
@@ -1,18 +1,31 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = txAMQP
-VERSION = 0.6.2
+NAME = bucky
+VERSION = 2.3.0
 CATEGORIES = python
 
-DESCRIPTION = Python library for communicating with AMQP peers and brokers using Twisted
+DESCRIPTION = StatsD and CollectD adapter for Graphite
 
 MASTER_SITES = $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
 
-PACKAGES += CSWpy-txamqp
-SPKG_DESC_CSWpy-txamqp = Python library for communicating with AMQP peers and brokers using Twisted
+PACKAGES += CSWpy-bucky
+SPKG_DESC_CSWpy-bucky = StatsD and CollectD adapter for Graphite
 # PKGFILES is catchall
-ARCHALL_CSWpy-txamqp = 1
+ARCHALL_CSWpy-bucky = 1
+RUNTIME_DEP_PKGS_CSWpy-bucky += CSWpy-setproctitle
+# Checkpkg can't track this
+CHECKPKG_OVERRIDES_CSWpy-bucky += surplus-dependency|CSWpy-setproctitle
 
+# This is a new package, don't bother building for 2.6
+MODULATIONS_PYTHON_VERSION = 2_7
+CHECKPKG_OVERRIDES_CSWpy-bucky += python-package-missing-py26-files
+
+# For types.db from CollectD
+REINPLACE_USRLOCAL += bucky/collectd.py
+
+# This is also for types.db
+CHECKPKG_OVERRIDES_CSWpy-bucky += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/bucky/collectd.py
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/bucky/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/txamqp/trunk/checksums	2015-04-03 16:12:03 UTC (rev 24802)
+++ csw/mgar/pkg/lang-python/bucky/trunk/checksums	2015-05-29 12:05:34 UTC (rev 25033)
@@ -1 +1 @@
-8c3e9c42d60d06b088d91ed9ba159e13  txAMQP-0.6.2.tar.gz
+106555f590a053f92a47f77e7a15968b  bucky-2.3.0.tar.gz

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


From rmottola at users.sourceforge.net  Fri May 29 16:38:41 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 29 May 2015 14:38:41 +0000
Subject: SF.net SVN: gar:[25034] csw/mgar/pkg/gcc4/branches/gcc-4.6.x
Message-ID: <3lypRv6sLpz9p@mail.opencsw.org>

Revision: 25034
          http://sourceforge.net/p/gar/code/25034
Author:   rmottola
Date:     2015-05-29 14:38:40 +0000 (Fri, 29 May 2015)
Log Message:
-----------
gcc4/branches/gcc-4.6.x: update to 4.6.4

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
    csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums

Modified: csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-29 12:05:34 UTC (rev 25033)
+++ csw/mgar/pkg/gcc4/branches/gcc-4.6.x/Makefile	2015-05-29 14:38:40 UTC (rev 25034)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME      = gcc
-VERSION   = 4.6.3
+VERSION   = 4.6.4
 GARTYPE = v2
 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
 PKG_VERSION_TOKEN = gcc4

Modified: csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums	2015-05-29 12:05:34 UTC (rev 25033)
+++ csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums	2015-05-29 14:38:40 UTC (rev 25034)
@@ -1 +1 @@
-773092fe5194353b02bb0110052a972e  gcc-4.6.3.tar.bz2
+3dded230921e55742778b75fde09de23  gcc-4.6.4.tar.bz2

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


From lblume at users.sourceforge.net  Fri May 29 16:42:20 2015
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Fri, 29 May 2015 14:42:20 +0000
Subject: SF.net SVN: gar:[25035] csw/mgar/pkg/mysql5/branches/mysql-5.5.x
Message-ID: <3lypXC2qN0zDC@mail.opencsw.org>

Revision: 25035
          http://sourceforge.net/p/gar/code/25035
Author:   lblume
Date:     2015-05-29 14:42:20 +0000 (Fri, 29 May 2015)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Bump to 5.5.44

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2015-05-29 14:38:40 UTC (rev 25034)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2015-05-29 14:42:20 UTC (rev 25035)
@@ -14,7 +14,7 @@
 PROJ_NAME    = mysql
 NAME         = $(PROJ_NAME)5
 BASE_VERSION = 5.5
-PATCHLEVEL   = 43
+PATCHLEVEL   = 44
 ALTS_PRIO    = 55
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2015-05-29 14:38:40 UTC (rev 25034)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2015-05-29 14:42:20 UTC (rev 25035)
@@ -1 +1 @@
-d77cc87df51af3f79b005d90e26879c1  mysql-5.5.43.tar.gz
+b897ffd67fab9c981c448fdbe00e36bf  mysql-5.5.44.tar.gz

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


From rmottola at users.sourceforge.net  Fri May 29 18:23:14 2015
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Fri, 29 May 2015 16:23:14 +0000
Subject: SF.net SVN: gar:[25036] csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums
Message-ID: <3lyrmX1FGnzHl@mail.opencsw.org>

Revision: 25036
          http://sourceforge.net/p/gar/code/25036
Author:   rmottola
Date:     2015-05-29 16:23:14 +0000 (Fri, 29 May 2015)
Log Message:
-----------
gcc4/branches/gcc-4.6.x: recalculate checksum

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums

Modified: csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums	2015-05-29 14:42:20 UTC (rev 25035)
+++ csw/mgar/pkg/gcc4/branches/gcc-4.6.x/checksums	2015-05-29 16:23:14 UTC (rev 25036)
@@ -1 +1 @@
-3dded230921e55742778b75fde09de23  gcc-4.6.4.tar.bz2
+b407a3d1480c11667f293bfb1f17d1a4  gcc-4.6.4.tar.bz2

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


From maciej at opencsw.org  Sat May 30 00:07:55 2015
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Fri, 29 May 2015 23:07:55 +0100
Subject: SF.net SVN: gar:[25029] csw/mgar/pkg/apache24/trunk/Makefile
In-Reply-To: <3lxZmf17x2zNw@mail.opencsw.org>
References: <3lxZmf17x2zNw@mail.opencsw.org>
Message-ID: <CALtRa-5d60NoJDmrbtMzBfw_BhOarMhV9vdRYz5bfL5u8NBOEA@mail.gmail.com>

2015-05-27 15:48 GMT+01:00 <cgrzemba at users.sourceforge.net>:

>  # This is because /opt/csw/sbin/sparcv9 is missing, most certainly an
> checkpkg issue
> -CHECKPKG_OVERRIDES_CSWapache24 +=
> missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
>

...or a CSWcommon issue?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20150529/6dd0a2d2/attachment.html>

From dmichelsen at users.sourceforge.net  Sat May 30 21:06:35 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 30 May 2015 19:06:35 +0000
Subject: SF.net SVN: gar:[25037] csw/mgar/pkg/joe/trunk
Message-ID: <3lzXLg3mDlzhJ@mail.opencsw.org>

Revision: 25037
          http://sourceforge.net/p/gar/code/25037
Author:   dmichelsen
Date:     2015-05-30 19:06:35 +0000 (Sat, 30 May 2015)
Log Message:
-----------
joe/trunk: Update to 4.0

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

Modified: csw/mgar/pkg/joe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/joe/trunk/Makefile	2015-05-29 16:23:14 UTC (rev 25036)
+++ csw/mgar/pkg/joe/trunk/Makefile	2015-05-30 19:06:35 UTC (rev 25037)
@@ -1,5 +1,5 @@
 NAME = joe
-VERSION = 3.7
+VERSION = 4.0
 GARTYPE = v2
 
 DESCRIPTION = Joe's Own Editor
@@ -31,4 +31,10 @@
 PRESERVECONF = /etc/opt/csw/joe/.*
 MIGRATE_FILES = jmacsrc joerc jpicorc jstarrc rjoerc
 
+# If configure detects Solaris it adds unconditionally /usr/local - why??
+REINPLACEMENTS += foo
+REINPLACE_MATCH_foo = solaris
+REINPLACE_WITH_foo = goaway
+REINPLACE_FILES_foo += configure
+
 include gar/category.mk

Modified: csw/mgar/pkg/joe/trunk/checksums
===================================================================
--- csw/mgar/pkg/joe/trunk/checksums	2015-05-29 16:23:14 UTC (rev 25036)
+++ csw/mgar/pkg/joe/trunk/checksums	2015-05-30 19:06:35 UTC (rev 25037)
@@ -1 +1 @@
-66de1b073e869ba12abbfcde3885c577  joe-3.7.tar.gz
+3c3b6d5089a29ddc746ee89bab59286e  joe-4.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  Sun May 31 22:36:14 2015
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 31 May 2015 20:36:14 +0000
Subject: SF.net SVN: gar:[25038] csw/mgar/pkg/stunnel/trunk
Message-ID: <3m0BJw1p38zH3@mail.opencsw.org>

Revision: 25038
          http://sourceforge.net/p/gar/code/25038
Author:   dmichelsen
Date:     2015-05-31 20:36:13 +0000 (Sun, 31 May 2015)
Log Message:
-----------
stunnel/trunk: Intermediate commit

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

Added Paths:
-----------
    csw/mgar/pkg/stunnel/trunk/files/0001-Honour-sysconfdir-bindir-and-localstatedir-everywher.patch

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2015-05-30 19:06:35 UTC (rev 25037)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2015-05-31 20:36:13 UTC (rev 25038)
@@ -7,7 +7,7 @@
 #       Test on Solaris 8 / 9 for comparison
 #
 NAME = stunnel
-VERSION = 4.56
+VERSION = 5.17
 GARTYPE = v2
 
 DESCRIPTION = Universal SSL Wrapper
@@ -19,35 +19,39 @@
   the daemon's code. 
 endef
 
-VENDOR_URL   = http://www.stunnel.org
 MASTER_SITES = ftp://ftp.stunnel.org/stunnel/
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
 DISTFILES   += CSWstunnel.cswstunnel
 
+# Use patch until this is fixed:
+#   https://github.com/dago/stunnel/compare/master...sysconfdir
+PATCHFILES += 0001-Honour-sysconfdir-bindir-and-localstatedir-everywher.patch
+
 # Upstream moves versions to an obsolete/ subdir over time, consider it too
 MAJOR_VER = $(firstword $(subst ., ,$(VERSION)))
 MASTER_SITES += ftp://ftp.stunnel.org/stunnel/obsolete/$(MAJOR_VER).x/
 
+VENDOR_URL   = http://www.stunnel.org
+
 BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibwrap-dev
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGES += CSWstunnel
+SPKG_DESC_CSWstunnel = Universal SSL Wrapper
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWstunnel += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWstunnel += CSWlibwrap1
 
-RUNTIME_DEP_PKGS += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS += CSWlibwrap1
-
 # Make stunnel.conf-sample.in honor our $localstatedir. Issue description:
 # cf. http://marc.info/?l=stunnel-users&m=128035848632004&w=2
 # Not merged upstream as ./configure without arguments leads to expansions
 # that the config file doesn't understand, e.g. sysconfdir='${prefix}/etc'
-PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+#PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
-sysconfdir=/etc/opt/csw
-localstatedir=/var/opt/csw
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 CONFIGURE_ARGS += --enable-ipv6
-CONFIGURE_ARGS += --enable-dh
+##CONFIGURE_ARGS += --enable-dh
 CONFIGURE_ARGS += --localstatedir=$(localstatedir)
 
 # No test target available

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2015-05-30 19:06:35 UTC (rev 25037)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2015-05-31 20:36:13 UTC (rev 25038)
@@ -1 +1 @@
-ac4c4a30bd7a55b6687cbd62d864054c  stunnel-4.56.tar.gz
+e70f001ee190105c5a10a74f4bd54901  stunnel-5.17.tar.gz

Added: csw/mgar/pkg/stunnel/trunk/files/0001-Honour-sysconfdir-bindir-and-localstatedir-everywher.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Honour-sysconfdir-bindir-and-localstatedir-everywher.patch	                        (rev 0)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Honour-sysconfdir-bindir-and-localstatedir-everywher.patch	2015-05-31 20:36:13 UTC (rev 25038)
@@ -0,0 +1,2992 @@
+From e7e2f2cd0788d84653ea7ed9e69c02078a9ecece Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 31 May 2015 22:16:27 +0200
+Subject: [PATCH] Honour sysconfdir, bindir and localstatedir everywhere
+
+---
+ configure.ac                 |    2 +-
+ doc/Makefile.am              |    8 +
+ doc/stunnel.pod              | 1365 ------------------------------------------
+ doc/stunnel.pod.in           | 1365 ++++++++++++++++++++++++++++++++++++++++++
+ src/Makefile.am              |    7 +
+ src/stunnel3.in              |    2 +-
+ tools/Makefile.am            |   14 +
+ tools/stunnel.conf-sample.in |   20 +-
+ tools/stunnel.init.in        |   16 +-
+ tools/stunnel.service.in     |    2 +-
+ 10 files changed, 1415 insertions(+), 1386 deletions(-)
+ delete mode 100644 doc/stunnel.pod
+ create mode 100644 doc/stunnel.pod.in
+
+diff --git a/configure.ac b/configure.ac
+index 1ee8860..519ed2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -441,7 +441,7 @@ CPPFLAGS="$valid_CPPFLAGS"
+ LIBS="$valid_LIBS"
+ 
+ AC_MSG_NOTICE([**************************************** write the results])
+-AC_CONFIG_FILES([Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init tools/stunnel.service])
++AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile tools/Makefile])
+ AC_OUTPUT
+ 
+ AC_MSG_NOTICE([**************************************** success])
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index cb64b68..8d0060f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -19,3 +19,11 @@ SUFFIXES = .pod .8 .html
+ 	pod2html --noindex --title stunnel.8 --infile=$< --outfile=$@
+ 	rm -f pod2htmd.tmp pod2htmi.tmp
+ 
++edit = sed \
++	-e 's|@bindir[@]|$(bindir)|g' \
++	-e 's|@sysconfdir[@]|$(sysconfdir)|g'
++
++stunnel.pod: Makefile
++	$(edit) '$(srcdir)/$@.in' >$@
++
++stunnel.pod: $(srcdir)/stunnel.pod
+diff --git a/doc/stunnel.pod b/doc/stunnel.pod
+deleted file mode 100644
+index 3fc3d4e..0000000
+--- a/doc/stunnel.pod
++++ /dev/null
+@@ -1,1365 +0,0 @@
+-=head1 NAME
+-
+-=encoding utf8
+-
+-stunnel - TLS offloading and load-balancing proxy
+-
+-
+-=head1 SYNOPSIS
+-
+-=over 4
+-
+-=item B<Unix:>
+-
+-B<stunnel> [S<FILE>] | S<-fd N> | S<-help> | S<-version> | S<-sockets> | S<-options>
+-
+-=item B<WIN32:>
+-
+-B<stunnel> [ [ S<-install> | S<-uninstall> | S<-start> | S<-stop> |
+-    S<-reload> | S<-reopen> | S<-exit> ] [S<-quiet>] [S<FILE>] ] |
+-    S<-help> | S<-version> | S<-sockets> | S<-options>
+-
+-=back
+-
+-
+-=head1 DESCRIPTION
+-
+-The B<stunnel> program is designed to work as I<SSL> encryption wrapper 
+-between remote clients and local (I<inetd>-startable) or remote
+-servers. The concept is that having non-SSL aware daemons running on
+-your system you can easily set them up to communicate with clients over
+-secure SSL channels.
+-
+-B<stunnel> can be used to add SSL functionality to commonly used I<Inetd>
+-daemons like POP-2, POP-3, and IMAP servers, to standalone daemons like
+-NNTP, SMTP and HTTP, and in tunneling PPP over network sockets without
+-changes to the source code.
+-
+-This product includes cryptographic software written by
+-Eric Young (eay at cryptsoft.com)
+-
+-
+-=head1 OPTIONS
+-
+-=over 4
+-
+-=item B<FILE>
+-
+-Use specified configuration file
+-
+-=item B<-fd N> (Unix only)
+-
+-Read the config file from specified file descriptor
+-
+-=item B<-help>
+-
+-Print B<stunnel> help menu
+-
+-=item B<-version>
+-
+-Print B<stunnel> version and compile time defaults
+-
+-=item B<-sockets>
+-
+-Print default socket options
+-
+-=item B<-options>
+-
+-Print supported SSL options
+-
+-=item B<-install> (Windows NT and later only)
+-
+-Install NT Service
+-
+-=item B<-uninstall> (Windows NT and later only)
+-
+-Uninstall NT Service
+-
+-=item B<-start> (Windows NT and later only)
+-
+-Start NT Service
+-
+-=item B<-stop> (Windows NT and later only)
+-
+-Stop NT Service
+-
+-=item B<-reload> (Windows NT and later only)
+-
+-Reload configuration file of the running NT Service
+-
+-=item B<-reopen> (Windows NT and later only)
+-
+-Reopen log file of the running NT Service
+-
+-=item B<-exit> (Win32 only)
+-
+-Exit an already started stunnel
+-
+-=item B<-quiet> (Win32 only)
+-
+-Don't display any message boxes
+-
+-=back
+-
+-
+-=head1 CONFIGURATION FILE
+-
+-Each line of the configuration file can be either:
+-
+-=over 4
+-
+-=item *
+-
+-An empty line (ignored).
+-
+-=item *
+-
+-A comment starting with ';' (ignored).
+-
+-=item *
+-
+-An 'option_name = option_value' pair.
+-
+-=item *
+-
+-'[service_name]' indicating a start of a service definition.
+-
+-=back
+-
+-An address parameter of an option may be either:
+-
+-=over 4
+-
+-=item *
+-
+-A port number.
+-
+-=item *
+-
+-A colon-separated pair of IP address (either IPv4, IPv6, or domain name) and port number.
+-
+-=item *
+-
+-A Unix socket path (Unix only).
+-
+-=back
+-
+-=head2 GLOBAL OPTIONS
+-
+-=over 4
+-
+-=item B<chroot> = DIRECTORY (Unix only)
+-
+-directory to chroot B<stunnel> process
+-
+-B<chroot> keeps B<stunnel> in chrooted jail.  I<CApath>, I<CRLpath>, I<pid>
+-and I<exec> are located inside the jail and the patches have to be relative
+-to the directory specified with B<chroot>.
+-
+-Several functions of the operating system also need their files to be located within chroot jail, e.g.:
+-
+-=over 4
+-
+-=item *
+-
+-Delayed resolver typically needs /etc/nsswitch.conf and /etc/resolv.conf.
+-
+-=item *
+-
+-Local time in log files needs /etc/timezone.
+-
+-=item *
+-
+-Some other functions may need devices, e.g. /dev/zero or /dev/null.
+-
+-=back
+-
+-=item B<compression> = deflate | zlib
+-
+-select data compression algorithm
+-
+-default: no compression
+-
+-deflate is the standard compression method as described in RFC 1951.
+-
+-zlib compression of B<OpenSSL 0.9.8> or above is not backward compatible with
+-B<OpenSSL 0.9.7>.
+-
+-=item B<debug> = [FACILITY.]LEVEL
+-
+-debugging level
+-
+-Level is a one of the syslog level names or numbers
+-emerg (0), alert (1), crit (2), err (3), warning (4), notice (5),
+-info (6), or debug (7).  All logs for the specified level and
+-all levels numerically less than it will be shown.  Use I<debug = debug> or
+-I<debug = 7> for greatest debugging output.  The default is notice (5).
+-
+-The syslog facility 'daemon' will be used unless a facility name is supplied.
+-(Facilities are not supported on Win32.)
+-
+-Case is ignored for both facilities and levels.
+-
+-=item B<EGD> = EGD_PATH (Unix only)
+-
+-path to Entropy Gathering Daemon socket
+-
+-Entropy Gathering Daemon socket to use to feed B<OpenSSL> random number
+-generator.  (Available only if compiled with B<OpenSSL 0.9.5a> or higher)
+-
+-=item B<engine> = auto | ENGINE_ID
+-
+-select hardware engine
+-
+-default: software-only cryptography
+-
+-Here is an example of advanced engine configuration to read private key from an
+-OpenSC engine
+-
+-    engine=dynamic
+-    engineCtrl=SO_PATH:/usr/lib/opensc/engine_pkcs11.so
+-    engineCtrl=ID:pkcs11
+-    engineCtrl=LIST_ADD:1
+-    engineCtrl=LOAD
+-    engineCtrl=MODULE_PATH:/usr/lib/pkcs11/opensc-pkcs11.so
+-    engineCtrl=INIT
+-
+-    [service]
+-    engineNum=1
+-    key=id_45
+-
+-=item B<engineCtrl> = COMMAND[:PARAMETER]
+-
+-control hardware engine
+-
+-Special commands "LOAD" and "INIT" can be used to load and initialize the
+-engine cryptogaphic module.
+-
+-=item B<engineDefault> = TASK_LIST
+-
+-set OpenSSL tasks delegated to the current engine
+-
+-The parameter specifies a comma-separated list of task to be delegated to the
+-current engine.
+-
+-The following tasks may be available, if supported by the engine: ALL, RSA,
+-DSA, ECDH, ECDSA, DH, RAND, CIPHERS, DIGESTS, PKEY, PKEY_CRYPTO, PKEY_ASN1.
+-
+-=item B<fips> = yes | no
+-
+-Enable or disable FIPS 140-2 mode.
+-
+-This option allows to disable entering FIPS mode if B<stunnel> was compiled
+-with FIPS 140-2 support.
+-
+-default: no (since version 5.00)
+-
+-=item B<foreground> = yes | no (Unix only)
+-
+-foreground mode
+-
+-Stay in foreground (don't fork) and log to stderr
+-instead of via syslog (unless I<output> is specified).
+-
+-default: background in daemon mode
+-
+-=item B<iconActive> = ICON_FILE (GUI only)
+-
+-GUI icon to be displayed when there are established connections
+-
+-On Windows platform the parameter should be an .ico file containing a 16x16
+-pixel image.
+-
+-=item B<iconError> = ICON_FILE (GUI only)
+-
+-GUI icon to be displayed when no valid configuration is loaded
+-
+-On Windows platform the parameter should be an .ico file containing a 16x16
+-pixel image.
+-
+-=item B<iconIdle> = ICON_FILE (GUI only)
+-
+-GUI icon to be displayed when there are no established connections
+-
+-On Windows platform the parameter should be an .ico file containing a 16x16
+-pixel image.
+-
+-=item B<log> = append | overwrite
+-
+-log file handling
+-
+-This option allows to choose whether the log file (specified with the I<output>
+-option) is appended or overwritten when opened or re-opened.
+-
+-default: append
+-
+-=item B<output> = FILE
+-
+-append log messages to a file
+-
+-/dev/stdout device can be used to send log messages to the standard
+-output (for example to log them with daemontools splogger).
+-
+-=item B<pid> = FILE (Unix only)
+-
+-pid file location
+-
+-If the argument is empty, then no pid file will be created.
+-
+-I<pid> path is relative to I<chroot> directory if specified.
+-
+-=item B<RNDbytes> = BYTES
+-
+-bytes to read from random seed files
+-
+-Number of bytes of data read from random seed files.  With SSL versions less
+-than B<0.9.5a>, also determines how many bytes of data are considered
+-sufficient to seed the PRNG.  More recent B<OpenSSL> versions have a builtin
+-function to determine when sufficient randomness is available.
+-
+-=item B<RNDfile> = FILE
+-
+-path to file with random seed data
+-
+-The SSL library will use data from this file first to seed the random
+-number generator.
+-
+-=item B<RNDoverwrite> = yes | no
+-
+-overwrite the random seed files with new random data
+-
+-default: yes
+-
+-=item B<service> = SERVICE (Unix only)
+-
+-stunnel service name
+-
+-The specified service name is used for syslog and as the I<inetd> mode service
+-name for TCP Wrappers.  While this option can technically be specified in the
+-service sections, it is only useful in global options.
+-
+-default: stunnel
+-
+-=item B<setgid> = GROUP (Unix only)
+-
+-setgid() to the specified group in daemon mode and clear all other groups
+-
+-=item B<setuid> = USER (Unix only)
+-
+-setuid() to the specified user in daemon mode
+-
+-=item B<socket> = a|l|r:OPTION=VALUE[:VALUE]
+-
+-Set an option on accept/local/remote socket
+-
+-The values for linger option are l_onof:l_linger.
+-The values for time are tv_sec:tv_usec.
+-
+-Examples:
+-
+-    socket = l:SO_LINGER=1:60
+-        set one minute timeout for closing local socket
+-    socket = r:SO_OOBINLINE=yes
+-        place out-of-band data directly into the
+-        receive data stream for remote sockets
+-    socket = a:SO_REUSEADDR=no
+-        disable address reuse (enabled by default)
+-    socket = a:SO_BINDTODEVICE=lo
+-        only accept connections on loopback interface
+-
+-=item B<syslog> = yes | no (Unix only)
+-
+-enable logging via syslog
+-
+-default: yes
+-
+-=item B<taskbar> = yes | no (WIN32 only)
+-
+-enable the taskbar icon
+-
+-default: yes
+-
+-=back
+-
+-
+-=head2 SERVICE-LEVEL OPTIONS
+-
+-Each configuration section begins with service name in square brackets.
+-The service name is used for libwrap (TCP Wrappers) access control and lets
+-you distinguish B<stunnel> services in your log files.
+-
+-Note that if you wish to run B<stunnel> in I<inetd> mode (where it
+-is provided a network socket by a server such as I<inetd>, I<xinetd>,
+-or I<tcpserver>) then you should read the section entitled I<INETD MODE>
+-below.
+-
+-
+-=over 4
+-
+-=item B<accept> = [HOST:]PORT
+-
+-accept connections on specified address
+-
+-If no host specified, defaults to all IPv4 addresses for the local host.
+-
+-To listen on all IPv6 addresses use:
+-
+-    accept = :::PORT
+-
+-=item B<CApath> = DIRECTORY
+-
+-Certificate Authority directory
+-
+-This is the directory in which B<stunnel> will look for certificates when using
+-the I<verify>.  Note that the certificates in this directory should be named
+-XXXXXXXX.0 where XXXXXXXX is the hash value of the DER encoded subject of the
+-cert.
+-
+-The hash algorithm has been changed in B<OpenSSL 1.0.0>.  It is required to
+-c_rehash the directory on upgrade from B<OpenSSL 0.x.x> to B<OpenSSL 1.x.x>.
+-
+-I<CApath> path is relative to I<chroot> directory if specified.
+-
+-=item B<CAfile> = CERT_FILE
+-
+-Certificate Authority file
+-
+-This file contains multiple CA certificates, used with the I<verify>.
+-
+-=item B<cert> = PEM_FILE
+-
+-certificate chain PEM file name
+-
+-The certificates must be in PEM format, and must be from the
+-actual server/client certificate to the self-signed root CA certificate.
+-
+-A certificate is required in server mode, and optional in client mode.
+-
+-=item B<checkEmail> = EMAIL
+-
+-email address of the peer certificate subject
+-
+-Multiple I<checkEmail> options are allowed in a single service section.
+-Certificates are accepted if no I<checkEmail> option was specified, or the
+-email address of the peer certificate matches any of the email addresses
+-specified with I<checkEmail>.
+-
+-=item B<checkHost> = HOST
+-
+-host of the peer certificate subject
+-
+-Multiple I<checkHost> options are allowed in a single service section.
+-Certificates are accepted if no I<checkHost> option was specified, or the host
+-name of the peer certificate matches any of the hosts specified with
+-I<checkHost>.
+-
+-=item B<checkIP> = IP
+-
+-IP address of the peer certificate subject
+-
+-Multiple I<checkIP> options are allowed in a single service section.
+-Certificates are accepted if no I<checkIP> option was specified, or the IP
+-address of the peer certificate matches any of the IP addresses specified with
+-I<checkIP>.
+-
+-=item B<ciphers> = CIPHER_LIST
+-
+-Select permitted SSL ciphers
+-
+-A colon delimited list of the ciphers to allow in the SSL connection,
+-for example DES-CBC3-SHA:IDEA-CBC-MD5.
+-
+-=item B<client> = yes | no
+-
+-client mode (remote service uses SSL)
+-
+-default: no (server mode)
+-
+-=item B<connect> = [HOST:]PORT
+-
+-connect to a remote address
+-
+-If no host is specified, the host defaults to localhost.
+-
+-Multiple I<connect> options are allowed in a single service section.
+-
+-If host resolves to multiple addresses and/or if multiple I<connect>
+-options are specified, then the remote address is chosen using a
+-round-robin algorithm.
+-
+-=item B<CRLpath> = DIRECTORY
+-
+-Certificate Revocation Lists directory
+-
+-This is the directory in which B<stunnel> will look for CRLs when
+-using the I<verify>. Note that the CRLs in this directory should
+-be named XXXXXXXX.r0 where XXXXXXXX is the hash value of the CRL.
+-
+-The hash algorithm has been changed in B<OpenSSL 1.0.0>.  It is required to
+-c_rehash the directory on upgrade from B<OpenSSL 0.x.x> to B<OpenSSL 1.x.x>.
+-
+-I<CRLpath> path is relative to I<chroot> directory if specified.
+-
+-=item B<CRLfile> = CERT_FILE
+-
+-Certificate Revocation Lists file
+-
+-This file contains multiple CRLs, used with the I<verify>.
+-
+-=item B<curve> = NID
+-
+-specify ECDH curve name
+-
+-To get a list of supported cuves use:
+-
+-    openssl ecparam -list_curves
+-
+-default: prime256v1
+-
+-=item B<logId> = TYPE
+-
+-connection identifier type
+-
+-This identifier allows to distinguish log entries generated for each of the
+-connections.
+-
+-Currently supported types:
+-
+-=over 4
+-
+-=item I<sequential>
+-
+-The numeric sequential identifier is only unique within a single instance of
+-B<stunnel>, but very compact.  It is most useful for manual log analysis.
+-
+-=item I<unique>
+-
+-This alphanumeric identifier is globally unique, but longer than the sequential
+-number.  It is most useful for automated log analysis.
+-
+-=item I<thread>
+-
+-The operating system thread identifier is neither unique (even within a single
+-instance of B<stunnel>) nor short.  It is most useful for debugging software
+-or configuration issues.
+-
+-=back
+-
+-default: sequential
+-
+-=item B<debug> = LEVEL
+-
+-debugging level
+-
+-Level is a one of the syslog level names or numbers
+-emerg (0), alert (1), crit (2), err (3), warning (4), notice (5),
+-info (6), or debug (7).  All logs for the specified level and
+-all levels numerically less than it will be shown.  Use I<debug = debug> or
+-I<debug = 7> for greatest debugging output.  The default is notice (5).
+-
+-=item B<delay> = yes | no
+-
+-delay DNS lookup for I<connect> option
+-
+-This option is useful for dynamic DNS, or when DNS is not available during
+-B<stunnel> startup (road warrior VPN, dial-up configurations).
+-
+-Delayed resolver mode is automatically engaged when stunnel fails to resolve on
+-startup any of the I<connect> targets for a service.
+-
+-Delayed resolver inflicts I<failover = prio>.
+-
+-default: no
+-
+-=item B<engineId> = ENGINE_ID
+-
+-select engine ID for the service
+-
+-=item B<engineNum> = ENGINE_NUMBER
+-
+-select engine number for the service
+-
+-The engines are numbered starting from 1.
+-
+-=item B<exec> = EXECUTABLE_PATH
+-
+-execute local inetd-type program 
+-
+-I<exec> path is relative to I<chroot> directory if specified.
+-
+-The following environmental variables are set on Unix platform:
+-REMOTE_HOST, REMOTE_PORT, SSL_CLIENT_DN, SSL_CLIENT_I_DN.
+-
+-=item B<execArgs> = $0 $1 $2 ...
+-
+-arguments for I<exec> including program name ($0)
+-
+-Quoting is currently not supported.
+-Arguments are separated with arbitrary number of whitespaces.
+-
+-=item B<failover> = rr | prio
+-
+-Failover strategy for multiple "connect" targets.
+-
+-    rr (round robin) - fair load distribution
+-    prio (priority) - use the order specified in config file
+-
+-default: rr
+-
+-=item B<ident> = USERNAME
+-
+-use IDENT (RFC 1413) username checking
+-
+-=item B<key> = KEY_FILE
+-
+-private key for certificate specified with I<cert> option
+-
+-Private key is needed to authenticate certificate owner.
+-Since this file should be kept secret it should only be readable
+-to its owner.  On Unix systems you can use the following command:
+-
+-    chmod 600 keyfile
+-
+-default: value of I<cert> option
+-
+-=item B<libwrap> = yes | no
+-
+-Enable or disable the use of /etc/hosts.allow and /etc/hosts.deny.
+-
+-default: no (since version 5.00)
+-
+-=item B<local> = HOST
+-
+-IP of the outgoing interface is used as source for remote connections.
+-Use this option to bind a static local IP address, instead.
+-
+-=item B<sni> = SERVICE:SERVER_PATTERN (server mode)
+-
+-Use the service as a slave service (a name-based virtual server) for Server
+-Name Indication TLS extension (RFC 3546).
+-
+-I<service_name> specifies the master service that accepts client connections
+-with I<accept> option.  I<server_name_pattern> specifies the host name to be
+-redirected.  The pattern may start with '*' character, e.g. '*.example.com'.
+-Multiple slave services are normally specified for a single master service.
+-I<sni> option can also be specified more than once within a single slave
+-service.
+-
+-This service, as well as the master service, may not be configured in client
+-mode.
+-
+-I<connect> option of the slave service is ignored when I<protocol> option is
+-specified, as I<protocol> connects remote host before TLS handshake.
+-
+-Libwrap checks (Unix only) are performed twice: with master service name after
+-TCP connection is accepted, and with slave service name during TLS handshake.
+-
+-Option I<sni> is only available when compiled with B<OpenSSL 1.0.0> and later.
+-
+-=item B<sni> = SERVER (client mode)
+-
+-Use the parameter as the value of TLS Server Name Indication (RFC 3546)
+-extension.
+-
+-Option I<sni> is only available when compiled with B<OpenSSL 1.0.0> and later.
+-
+-=item B<OCSP> = URL
+-
+-select OCSP server for certificate verification
+-
+-=item B<OCSPaia> = yes | no
+-
+-validate certificates with their AIA OCSP responders
+-
+-This option enables I<stunnel> to validate certificates with the list of
+-OCSP responder URLs retrieved from their AIA (Authority Information Access)
+-extension.
+-
+-=item B<OCSPflag> = OCSP_FLAG
+-
+-specify OCSP server flag
+-
+-Several I<OCSPflag> can be used to specify multiple flags.
+-
+-currently supported flags: NOCERTS, NOINTERN NOSIGS, NOCHAIN, NOVERIFY,
+-NOEXPLICIT, NOCASIGN, NODELEGATED, NOCHECKS, TRUSTOTHER, RESPID_KEY, NOTIME
+-
+-=item B<options> = SSL_OPTIONS
+-
+-B<OpenSSL> library options
+-
+-The parameter is the B<OpenSSL> option name as described in the
+-I<SSL_CTX_set_options(3ssl)> manual, but without I<SSL_OP_> prefix.
+-I<stunnel -options> lists the options found to be allowed in the
+-current combination of I<stunnel> and the I<OpenSSL> library used
+-to build it.
+-
+-Several I<options> can be used to specify multiple options.
+-An option name can be prepended with a dash ("-") to disable the option.
+-
+-For example, for compatibility with the erroneous Eudora SSL
+-implementation, the following option can be used:
+-
+-    options = DONT_INSERT_EMPTY_FRAGMENTS
+-
+-default:
+-
+-    options = NO_SSLv2
+-    options = NO_SSLv3
+-
+-=item B<protocol> = PROTO
+-
+-application protocol to negotiate SSL
+-
+-This option enables initial, protocol-specific negotiation of the SSL/TLS
+-encryption.
+-I<protocol> option should not be used with SSL encryption on a separate port.
+-
+-Currently supported protocols:
+-
+-=over 4
+-
+-=item I<cifs>
+-
+-Proprietary (undocummented) extension of CIFS protocol implemented in Samba.
+-Support for this extension was dropped in Samba 3.0.0.
+-
+-=item I<connect>
+-
+-Based on RFC 2817 - I<Upgrading to TLS Within HTTP/1.1>, section 5.2 - I<Requesting a Tunnel with CONNECT>
+-
+-This protocol is only supported in client mode.
+-
+-=item I<imap>
+-
+-Based on RFC 2595 - I<Using TLS with IMAP, POP3 and ACAP>
+-
+-=item I<nntp>
+-
+-Based on RFC 4642 - I<Using Transport Layer Security (TLS) with Network News Transfer Protocol (NNTP)>
+-
+-This protocol is only supported in client mode.
+-
+-=item I<pgsql>
+-
+-Based on
+-F<http://www.postgresql.org/docs/8.3/static/protocol-flow.html#AEN73982>
+-
+-=item I<pop3>
+-
+-Based on RFC 2449 - I<POP3 Extension Mechanism>
+-
+-=item I<proxy>
+-
+-Haproxy client IP address
+-F<http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt>
+-
+-=item I<smtp>
+-
+-Based on RFC 2487 - I<SMTP Service Extension for Secure SMTP over TLS>
+-
+-=item I<socks>
+-
+-SOCKS versions 4, 4a, and 5 are supported.  The SOCKS protocol itself
+-is encapsulated within SSL/TLS encryption layer to protect the final
+-destination address.
+-
+-F<http://www.openssh.com/txt/socks4.protocol>
+-
+-F<http://www.openssh.com/txt/socks4a.protocol>
+-
+-The BIND command of the SOCKS protocol is not supported.
+-The USERID parameter is ignored.
+-
+-See Examples section for sample configuration files for VPN based on SOCKS
+-encryption.
+-
+-=back
+-
+-=item B<protocolAuthentication> = basic | ntlm
+-
+-authentication type for protocol negotiations
+-
+-Currently authentication type only applies to the 'connect' protocol.
+-
+-default: basic
+-
+-=item B<protocolHost> = HOST:PORT
+-
+-destination address for protocol negotiations
+-
+-I<protocolHost> specifies the final SSL server to be connected by the proxy,
+-and not the proxy server directly connected by B<stunnel>.
+-The proxy server should be specified with the 'connect' option.
+-
+-Currently protocol destination address only applies to 'connect' protocol.
+-
+-=item B<protocolPassword> = PASSWORD
+-
+-password for protocol negotiations
+-
+-=item B<protocolUsername> = USERNAME
+-
+-username for protocol negotiations
+-
+-=item B<PSKidentity> = IDENTITY
+-
+-PSK identity for the PSK client
+-
+-I<PSKidentity> can be used on B<stunnel> clients to select the PSK identity
+-used for authentication.  This option is ignored in server sections.
+-
+-default: the first identity specified in the I<PSKsecrets> file.
+-
+-=item B<PSKsecrets> = FILE
+-
+-file with PSK identities and corresponding keys
+-
+-Each line of the file in the following format:
+-
+-    IDENTITY:KEY
+-
+-The key is required to be at least 20 characters long.
+-The file should not be world-readable nor world-writable.
+-
+-=item B<pty> = yes | no (Unix only)
+-
+-allocate pseudoterminal for 'exec' option
+-
+-=item B<redirect> = [HOST:]PORT
+-
+-redirect SSL client connections on certificate-based authentication failures
+-
+-This option only works in server mode.
+-Some protocol negotiations are also incompatible with the I<redirect> option.
+-
+-=item B<renegotiation> = yes | no
+-
+-support SSL renegotiation
+-
+-Applications of the SSL renegotiation include some authentication scenarios,
+-or re-keying long lasting connections.
+-
+-On the other hand this feature can facilitate a trivial CPU-exhaustion
+-DoS attack:
+-
+-F<http://vincent.bernat.im/en/blog/2011-ssl-dos-mitigation.html>
+-
+-Please note that disabling SSL renegotiation does not fully mitigate
+-this issue.
+-
+-default: yes (if supported by B<OpenSSL>)
+-
+-=item B<reset> = yes | no
+-
+-attempt to use TCP RST flag to indicate an error
+-
+-This option is not supported on some platforms.
+-
+-default: yes
+-
+-=item B<retry> = yes | no
+-
+-reconnect a connect+exec section after it's disconnected
+-
+-default: no
+-
+-=item B<sessionCacheSize> = NUM_ENTRIES
+-
+-session cache size
+-
+-I<sessionCacheSize> specifies the maximum number of the internal session cache
+-entries.
+-
+-The value of 0 can be used for unlimited size.  It is not recommended
+-for production use due to the risk of memory exhaustion DoS attack.
+-
+-=item B<sessionCacheTimeout> = TIMEOUT
+-
+-session cache timeout
+-
+-This is the number of seconds to keep cached SSL sessions.
+-
+-=item B<sessiond> = HOST:PORT
+-
+-address of sessiond SSL cache server
+-
+-=item B<sslVersion> = SSL_VERSION
+-
+-select the SSL protocol version
+-
+-Allowed values: all, SSLv2, SSLv3, TLSv1, TLSv1.1, TLSv1.2
+-
+-=item B<stack> = BYTES (except for FORK model)
+-
+-thread stack size
+-
+-=item B<TIMEOUTbusy> = SECONDS
+-
+-time to wait for expected data
+-
+-=item B<TIMEOUTclose> = SECONDS
+-
+-time to wait for close_notify (set to 0 for buggy MSIE)
+-
+-=item B<TIMEOUTconnect> = SECONDS
+-
+-time to wait to connect a remote host
+-
+-=item B<TIMEOUTidle> = SECONDS
+-
+-time to keep an idle connection
+-
+-=item B<transparent> = none | source | destination | both (Unix only)
+-
+-enable transparent proxy support on selected platforms
+-
+-Supported values:
+-
+-=over 4
+-
+-=item I<none>
+-
+-Disable transparent proxy support.  This is the default.
+-
+-=item I<source>
+-
+-Re-write address to appear as if wrapped daemon is connecting
+-from the SSL client machine instead of the machine running B<stunnel>.
+-
+-This option is currently available in:
+-
+-=over 4
+-
+-=item Remote mode (I<connect> option) on I<Linux E<gt>=2.6.28>
+-
+-This configuration requires B<stunnel> to be executed as root and without
+-I<setuid> option.
+-
+-This configuration requires the following setup for iptables and routing
+-(possibly in /etc/rc.local or equivalent file):
+-
+-    iptables -t mangle -N DIVERT
+-    iptables -t mangle -A PREROUTING -p tcp -m socket -j DIVERT
+-    iptables -t mangle -A DIVERT -j MARK --set-mark 1
+-    iptables -t mangle -A DIVERT -j ACCEPT
+-    ip rule add fwmark 1 lookup 100
+-    ip route add local 0.0.0.0/0 dev lo table 100
+-    echo 0 >/proc/sys/net/ipv4/conf/lo/rp_filter
+-
+-B<stunnel> must also to be executed as root and without I<setuid> option.
+-
+-=item Remote mode (I<connect> option) on I<Linux 2.2.x>
+-
+-This configuration requires kernel to be compiled with I<transparent proxy>
+-option.
+-Connected service must be installed on a separate host.
+-Routing towards the clients has to go through the B<stunnel> box.
+-
+-B<stunnel> must also to be executed as root and without I<setuid> option.
+-
+-=item Remote mode (I<connect> option) on I<FreeBSD E<gt>=8.0>
+-
+-This configuration requires additional firewall and routing setup.
+-B<stunnel> must also to be executed as root and without I<setuid> option.
+-
+-=item Local mode (I<exec> option)
+-
+-This configuration works by pre-loading I<libstunnel.so> shared library.
+-_RLD_LIST environment variable is used on Tru64, and LD_PRELOAD variable on
+-other platforms.
+-
+-=back
+-
+-=item I<destination>
+-
+-Original destination is used instead of I<connect> option.
+-
+-A service section for transparent destination may look like this:
+-
+-    [transparent]
+-    client=yes
+-    accept=<stunnel_port>
+-    transparent=destination
+-
+-This configuration requires iptables setup to work,
+-possibly in /etc/rc.local or equivalent file.
+-
+-For a connect target installed on the same host:
+-
+-    /sbin/iptables -t nat -I OUTPUT -p tcp --dport <redirected_port> \
+-        -m ! --uid-owner <stunnel_user_id> \
+-        -j DNAT --to-destination <local_ip>:<stunnel_port>
+-
+-For a connect target installed on a remote host:
+-
+-    /sbin/iptables -I INPUT -i eth0 -p tcp --dport <stunnel_port> -j ACCEPT
+-    /sbin/iptables -t nat -I PREROUTING -p tcp --dport <redirected_port> \
+-        -i eth0 -j DNAT --to-destination <local_ip>:<stunnel_port>
+-
+-Transparent destination option is currently only supported on Linux.
+-
+-=item I<both>
+-
+-Use both I<source> and I<destination> transparent proxy.
+-
+-=back
+-
+-Two legacy options are also supported for backward compatibility:
+-
+-=over 4
+-
+-=item I<yes>
+-
+-This options has been renamed to I<source>.
+-
+-=item I<no>
+-
+-This options has been renamed to I<none>.
+-
+-=back
+-
+-
+-=item B<verify> = LEVEL
+-
+-verify peer certificate
+-
+-=over 4
+-
+-=item level 0
+-
+-Request and ignore peer certificate.
+-
+-=item level 1
+-
+-Verify peer certificate if present.
+-
+-=item level 2
+-
+-Verify peer certificate.
+-
+-=item level 3
+-
+-Verify peer with locally installed certificate.
+-
+-=item level 4
+-
+-Ignore CA chain and only verify peer certificate.
+-
+-=item default
+-
+-No verify.
+-
+-=back
+-
+-It is important to understand, that this option was solely designed for access
+-control and not for authorization.  Specifically for level 2 every non-revoked
+-certificate is accepted regardless of its Common Name.  For this reason a
+-dedicated CA should be used with level 2, and not a generic CA commonly used
+-for webservers.  Level 3 is preferred for point-to-point connections.
+-
+-=back
+-
+-
+-=head1 RETURN VALUE
+-
+-B<stunnel> returns zero on success, non-zero on error.
+-
+-
+-=head1 SIGNALS
+-
+-The following signals can be used to control B<stunnel> in Unix environment:
+-
+-=over 4
+-
+-=item SIGHUP
+-
+-Force a reload of the configuration file.
+-
+-Some global options will not be reloaded:
+-
+-=over 4
+-
+-=item *
+-
+-chroot
+-
+-=item *
+-
+-foreground
+-
+-=item *
+-
+-pid
+-
+-=item *
+-
+-setgid
+-
+-=item *
+-
+-setuid
+-
+-=back
+-
+-The use of 'setuid' option will also prevent B<stunnel> from binding privileged
+-(<1024) ports during configuration reloading.
+-
+-When 'chroot' option is used, B<stunnel> will look for all its files (including
+-configuration file, certificates, log file and pid file) within the chroot
+-jail.
+-
+-=item SIGUSR1
+-
+-Close and reopen B<stunnel> log file.
+-This function can be used for log rotation.
+-
+-=item SIGTERM, SIGQUIT, SIGINT
+-
+-Shut B<stunnel> down.
+-
+-=back
+-
+-The result of sending any other signals to the server is undefined.
+-
+-
+-=head1 EXAMPLES
+-
+-In order to provide SSL encapsulation to your local I<imapd> service, use:
+-
+-    [imapd]
+-    accept = 993
+-    exec = /usr/sbin/imapd
+-    execArgs = imapd
+-
+-or in remote mode:
+-
+-    [imapd]
+-    accept = 993
+-    connect = 143
+-
+-In order to let your local e-mail client connect to an SSL-enabled I<imapd>
+-service on another server, configure the e-mail client to connect to localhost
+-on port 119 and use:
+-
+-    [imap]
+-    client = yes
+-    accept = 143
+-    connect = servername:993
+-
+-If you want to provide tunneling to your I<pppd> daemon on port 2020,
+-use something like:
+-
+-    [vpn]
+-    accept = 2020
+-    exec = /usr/sbin/pppd
+-    execArgs = pppd local
+-    pty = yes
+-
+-If you want to use B<stunnel> in I<inetd> mode to launch your imapd
+-process, you'd use this I<stunnel.conf>.
+-Note there must be no I<[service_name]> section.
+-
+-    exec = /usr/sbin/imapd
+-    execArgs = imapd
+-
+-To setup SOCKS VPN configure the following client service:
+-
+-    [socks_client]
+-    client = yes
+-    accept = 127.0.0.1:1080
+-    connect = vpn_server:9080
+-    verify = 4
+-    CAfile = stunnel.pem
+-
+-The corresponding configuration on the vpn_server host:
+-
+-    [socks_server]
+-    protocol = socks
+-    accept = 9080
+-    cert = stunnel.pem
+-    key = stunnel.key
+-
+-Now test your configuration on the client machine with:
+-
+-    curl --socks4a localhost http://www.example.com/
+-
+-=head1 NOTES
+-
+-=head2 RESTRICTIONS
+-
+-B<stunnel> cannot be used for the FTP daemon because of the nature
+-of the FTP protocol which utilizes multiple ports for data transfers.
+-There are available SSL-enabled versions of FTP and telnet daemons, however.
+-
+-
+-=head2 INETD MODE
+-
+-The most common use of B<stunnel> is to listen on a network
+-port and establish communication with either a new port
+-via the connect option, or a new program via the I<exec> option.
+-However there is a special case when you wish to have
+-some other program accept incoming connections and
+-launch B<stunnel>, for example with I<inetd>, I<xinetd>,
+-or I<tcpserver>.
+-
+-For example, if you have the following line in I<inetd.conf>:
+-
+-    imaps stream tcp nowait root /usr/bin/stunnel stunnel /etc/stunnel/imaps.conf
+-
+-In these cases, the I<inetd>-style program is responsible
+-for binding a network socket (I<imaps> above) and handing
+-it to B<stunnel> when a connection is received.
+-Thus you do not want B<stunnel> to have any I<accept> option.
+-All the I<Service Level Options> should be placed in the
+-global options section, and no I<[service_name]> section
+-will be present.  See the I<EXAMPLES> section for example
+-configurations.
+-
+-=head2 CERTIFICATES
+-
+-Each SSL-enabled daemon needs to present a valid X.509 certificate
+-to the peer. It also needs a private key to decrypt the incoming
+-data. The easiest way to obtain a certificate and a key is to 
+-generate them with the free B<OpenSSL> package. You can find more
+-information on certificates generation on pages listed below.
+-
+-The order of contents of the I<.pem> file is important.  It should contain the
+-unencrypted private key first, then a signed certificate (not certificate
+-request).  There should be also empty lines after certificate and private key.
+-Plaintext certificate information appended on the top of generated certificate
+-should be discarded. So the file should look like this:
+-
+-    -----BEGIN RSA PRIVATE KEY-----
+-    [encoded key]
+-    -----END RSA PRIVATE KEY-----
+-    [empty line]
+-    -----BEGIN CERTIFICATE-----
+-    [encoded certificate]
+-    -----END CERTIFICATE-----
+-    [empty line]
+-
+-=head2 RANDOMNESS
+-
+-B<stunnel> needs to seed the PRNG (pseudo random number generator) in
+-order for SSL to use good randomness.  The following sources are loaded
+-in order until sufficient random data has been gathered:
+-
+-=over 4
+-
+-=item *
+-
+-The file specified with the I<RNDfile> flag.
+-
+-=item *
+-
+-The file specified by the RANDFILE environment variable, if set.
+-
+-=item *
+-
+-The file .rnd in your home directory, if RANDFILE not set.
+-
+-=item *
+-
+-The file specified with '--with-random' at compile time.
+-
+-=item *
+-
+-The contents of the screen if running on Windows.
+-
+-=item *
+-
+-The egd socket specified with the I<EGD> flag.
+-
+-=item *
+-
+-The egd socket specified with '--with-egd-sock' at compile time.
+-
+-=item *
+-
+-The /dev/urandom device.
+-
+-=back
+-
+-With recent (B<OpenSSL 0.9.5a> or later) version of SSL it will stop loading
+-random data automatically when sufficient entropy has been gathered.  With
+-previous versions it will continue to gather from all the above sources since
+-no SSL function exists to tell when enough data is available.
+-
+-Note that on Windows machines that do not have console user interaction
+-(mouse movements, creating windows, etc.) the screen contents are not
+-variable enough to be sufficient, and you should provide a random file
+-for use with the I<RNDfile> flag.
+-
+-Note that the file specified with the I<RNDfile> flag should contain
+-random data -- that means it should contain different information
+-each time B<stunnel> is run.  This is handled automatically
+-unless the I<RNDoverwrite> flag is used.  If you wish to update this file
+-manually, the I<openssl rand> command in recent versions of B<OpenSSL>,
+-would be useful.
+-
+-Important note: If /dev/urandom is available, B<OpenSSL> often seeds the PRNG
+-with it while checking the random state.  On systems with /dev/urandom
+-B<OpenSSL> is likely to use it even though it is listed at the very bottom of
+-the list above.  This is the behaviour of B<OpenSSL> and not B<stunnel>.
+-
+-=head2 DH PARAMETERS
+-
+-Stunnel 4.40 and later contains hardcoded 2048-bit DH parameters.
+-
+-It is also possible to specify DH parameters in the certificate file:
+-
+-    openssl dhparam 2048 >> stunnel.pem
+-
+-DH parameter generation may take several minutes.
+-
+-
+-=head1 FILES
+-
+-=over 4
+-
+-=item F<stunnel.conf>
+-
+-B<stunnel> configuration file
+-
+-=back
+-
+-
+-=head1 BUGS
+-
+-Option I<execArgs> and Win32 command line does not support quoting.
+-
+-
+-=head1 SEE ALSO
+-
+-=over 4
+-
+-=item L<tcpd(8)>
+-
+-access control facility for internet services
+-
+-=item L<inetd(8)>
+-
+-internet 'super-server'
+-
+-=item F<http://www.stunnel.org/>
+-
+-B<stunnel> homepage
+-
+-=item F<http://www.openssl.org/>
+-
+-B<OpenSSL> project website
+-
+-=back
+-
+-
+-=head1 AUTHOR
+-
+-=over 4
+-
+-=item Micha? Trojnara
+-
+-<F<Michal.Trojnara at mirt.net>>
+-
+-=back
+-
+diff --git a/doc/stunnel.pod.in b/doc/stunnel.pod.in
+new file mode 100644
+index 0000000..fa166f2
+--- /dev/null
++++ b/doc/stunnel.pod.in
+@@ -0,0 +1,1365 @@
++=head1 NAME
++
++=encoding utf8
++
++stunnel - TLS offloading and load-balancing proxy
++
++
++=head1 SYNOPSIS
++
++=over 4
++
++=item B<Unix:>
++
++B<stunnel> [S<FILE>] | S<-fd N> | S<-help> | S<-version> | S<-sockets> | S<-options>
++
++=item B<WIN32:>
++
++B<stunnel> [ [ S<-install> | S<-uninstall> | S<-start> | S<-stop> |
++    S<-reload> | S<-reopen> | S<-exit> ] [S<-quiet>] [S<FILE>] ] |
++    S<-help> | S<-version> | S<-sockets> | S<-options>
++
++=back
++
++
++=head1 DESCRIPTION
++
++The B<stunnel> program is designed to work as I<SSL> encryption wrapper 
++between remote clients and local (I<inetd>-startable) or remote
++servers. The concept is that having non-SSL aware daemons running on
++your system you can easily set them up to communicate with clients over
++secure SSL channels.
++
++B<stunnel> can be used to add SSL functionality to commonly used I<Inetd>
++daemons like POP-2, POP-3, and IMAP servers, to standalone daemons like
++NNTP, SMTP and HTTP, and in tunneling PPP over network sockets without
++changes to the source code.
++
++This product includes cryptographic software written by
++Eric Young (eay at cryptsoft.com)
++
++
++=head1 OPTIONS
++
++=over 4
++
++=item B<FILE>
++
++Use specified configuration file
++
++=item B<-fd N> (Unix only)
++
++Read the config file from specified file descriptor
++
++=item B<-help>
++
++Print B<stunnel> help menu
++
++=item B<-version>
++
++Print B<stunnel> version and compile time defaults
++
++=item B<-sockets>
++
++Print default socket options
++
++=item B<-options>
++
++Print supported SSL options
++
++=item B<-install> (Windows NT and later only)
++
++Install NT Service
++
++=item B<-uninstall> (Windows NT and later only)
++
++Uninstall NT Service
++
++=item B<-start> (Windows NT and later only)
++
++Start NT Service
++
++=item B<-stop> (Windows NT and later only)
++
++Stop NT Service
++
++=item B<-reload> (Windows NT and later only)
++
++Reload configuration file of the running NT Service
++
++=item B<-reopen> (Windows NT and later only)
++
++Reopen log file of the running NT Service
++
++=item B<-exit> (Win32 only)
++
++Exit an already started stunnel
++
++=item B<-quiet> (Win32 only)
++
++Don't display any message boxes
++
++=back
++
++
++=head1 CONFIGURATION FILE
++
++Each line of the configuration file can be either:
++
++=over 4
++
++=item *
++
++An empty line (ignored).
++
++=item *
++
++A comment starting with ';' (ignored).
++
++=item *
++
++An 'option_name = option_value' pair.
++
++=item *
++
++'[service_name]' indicating a start of a service definition.
++
++=back
++
++An address parameter of an option may be either:
++
++=over 4
++
++=item *
++
++A port number.
++
++=item *
++
++A colon-separated pair of IP address (either IPv4, IPv6, or domain name) and port number.
++
++=item *
++
++A Unix socket path (Unix only).
++
++=back
++
++=head2 GLOBAL OPTIONS
++
++=over 4
++
++=item B<chroot> = DIRECTORY (Unix only)
++
++directory to chroot B<stunnel> process
++
++B<chroot> keeps B<stunnel> in chrooted jail.  I<CApath>, I<CRLpath>, I<pid>
++and I<exec> are located inside the jail and the patches have to be relative
++to the directory specified with B<chroot>.
++
++Several functions of the operating system also need their files to be located within chroot jail, e.g.:
++
++=over 4
++
++=item *
++
++Delayed resolver typically needs /etc/nsswitch.conf and /etc/resolv.conf.
++
++=item *
++
++Local time in log files needs /etc/timezone.
++
++=item *
++
++Some other functions may need devices, e.g. /dev/zero or /dev/null.
++
++=back
++
++=item B<compression> = deflate | zlib
++
++select data compression algorithm
++
++default: no compression
++
++deflate is the standard compression method as described in RFC 1951.
++
++zlib compression of B<OpenSSL 0.9.8> or above is not backward compatible with
++B<OpenSSL 0.9.7>.
++
++=item B<debug> = [FACILITY.]LEVEL
++
++debugging level
++
++Level is a one of the syslog level names or numbers
++emerg (0), alert (1), crit (2), err (3), warning (4), notice (5),
++info (6), or debug (7).  All logs for the specified level and
++all levels numerically less than it will be shown.  Use I<debug = debug> or
++I<debug = 7> for greatest debugging output.  The default is notice (5).
++
++The syslog facility 'daemon' will be used unless a facility name is supplied.
++(Facilities are not supported on Win32.)
++
++Case is ignored for both facilities and levels.
++
++=item B<EGD> = EGD_PATH (Unix only)
++
++path to Entropy Gathering Daemon socket
++
++Entropy Gathering Daemon socket to use to feed B<OpenSSL> random number
++generator.  (Available only if compiled with B<OpenSSL 0.9.5a> or higher)
++
++=item B<engine> = auto | ENGINE_ID
++
++select hardware engine
++
++default: software-only cryptography
++
++Here is an example of advanced engine configuration to read private key from an
++OpenSC engine
++
++    engine=dynamic
++    engineCtrl=SO_PATH:/usr/lib/opensc/engine_pkcs11.so
++    engineCtrl=ID:pkcs11
++    engineCtrl=LIST_ADD:1
++    engineCtrl=LOAD
++    engineCtrl=MODULE_PATH:/usr/lib/pkcs11/opensc-pkcs11.so
++    engineCtrl=INIT
++
++    [service]
++    engineNum=1
++    key=id_45
++
++=item B<engineCtrl> = COMMAND[:PARAMETER]
++
++control hardware engine
++
++Special commands "LOAD" and "INIT" can be used to load and initialize the
++engine cryptogaphic module.
++
++=item B<engineDefault> = TASK_LIST
++
++set OpenSSL tasks delegated to the current engine
++
++The parameter specifies a comma-separated list of task to be delegated to the
++current engine.
++
++The following tasks may be available, if supported by the engine: ALL, RSA,
++DSA, ECDH, ECDSA, DH, RAND, CIPHERS, DIGESTS, PKEY, PKEY_CRYPTO, PKEY_ASN1.
++
++=item B<fips> = yes | no
++
++Enable or disable FIPS 140-2 mode.
++
++This option allows to disable entering FIPS mode if B<stunnel> was compiled
++with FIPS 140-2 support.
++
++default: no (since version 5.00)
++
++=item B<foreground> = yes | no (Unix only)
++
++foreground mode
++
++Stay in foreground (don't fork) and log to stderr
++instead of via syslog (unless I<output> is specified).
++
++default: background in daemon mode
++
++=item B<iconActive> = ICON_FILE (GUI only)
++
++GUI icon to be displayed when there are established connections
++
++On Windows platform the parameter should be an .ico file containing a 16x16
++pixel image.
++
++=item B<iconError> = ICON_FILE (GUI only)
++
++GUI icon to be displayed when no valid configuration is loaded
++
++On Windows platform the parameter should be an .ico file containing a 16x16
++pixel image.
++
++=item B<iconIdle> = ICON_FILE (GUI only)
++
++GUI icon to be displayed when there are no established connections
++
++On Windows platform the parameter should be an .ico file containing a 16x16
++pixel image.
++
++=item B<log> = append | overwrite
++
++log file handling
++
++This option allows to choose whether the log file (specified with the I<output>
++option) is appended or overwritten when opened or re-opened.
++
++default: append
++
++=item B<output> = FILE
++
++append log messages to a file
++
++/dev/stdout device can be used to send log messages to the standard
++output (for example to log them with daemontools splogger).
++
++=item B<pid> = FILE (Unix only)
++
++pid file location
++
++If the argument is empty, then no pid file will be created.
++
++I<pid> path is relative to I<chroot> directory if specified.
++
++=item B<RNDbytes> = BYTES
++
++bytes to read from random seed files
++
++Number of bytes of data read from random seed files.  With SSL versions less
++than B<0.9.5a>, also determines how many bytes of data are considered
++sufficient to seed the PRNG.  More recent B<OpenSSL> versions have a builtin
++function to determine when sufficient randomness is available.
++
++=item B<RNDfile> = FILE
++
++path to file with random seed data
++
++The SSL library will use data from this file first to seed the random
++number generator.
++
++=item B<RNDoverwrite> = yes | no
++
++overwrite the random seed files with new random data
++
++default: yes
++
++=item B<service> = SERVICE (Unix only)
++
++stunnel service name
++
++The specified service name is used for syslog and as the I<inetd> mode service
++name for TCP Wrappers.  While this option can technically be specified in the
++service sections, it is only useful in global options.
++
++default: stunnel
++
++=item B<setgid> = GROUP (Unix only)
++
++setgid() to the specified group in daemon mode and clear all other groups
++
++=item B<setuid> = USER (Unix only)
++
++setuid() to the specified user in daemon mode
++
++=item B<socket> = a|l|r:OPTION=VALUE[:VALUE]
++
++Set an option on accept/local/remote socket
++
++The values for linger option are l_onof:l_linger.
++The values for time are tv_sec:tv_usec.
++
++Examples:
++
++    socket = l:SO_LINGER=1:60
++        set one minute timeout for closing local socket
++    socket = r:SO_OOBINLINE=yes
++        place out-of-band data directly into the
++        receive data stream for remote sockets
++    socket = a:SO_REUSEADDR=no
++        disable address reuse (enabled by default)
++    socket = a:SO_BINDTODEVICE=lo
++        only accept connections on loopback interface
++
++=item B<syslog> = yes | no (Unix only)
++
++enable logging via syslog
++
++default: yes
++
++=item B<taskbar> = yes | no (WIN32 only)
++
++enable the taskbar icon
++
++default: yes
++
++=back
++
++
++=head2 SERVICE-LEVEL OPTIONS
++
++Each configuration section begins with service name in square brackets.
++The service name is used for libwrap (TCP Wrappers) access control and lets
++you distinguish B<stunnel> services in your log files.
++
++Note that if you wish to run B<stunnel> in I<inetd> mode (where it
++is provided a network socket by a server such as I<inetd>, I<xinetd>,
++or I<tcpserver>) then you should read the section entitled I<INETD MODE>
++below.
++
++
++=over 4
++
++=item B<accept> = [HOST:]PORT
++
++accept connections on specified address
++
++If no host specified, defaults to all IPv4 addresses for the local host.
++
++To listen on all IPv6 addresses use:
++
++    accept = :::PORT
++
++=item B<CApath> = DIRECTORY
++
++Certificate Authority directory
++
++This is the directory in which B<stunnel> will look for certificates when using
++the I<verify>.  Note that the certificates in this directory should be named
++XXXXXXXX.0 where XXXXXXXX is the hash value of the DER encoded subject of the
++cert.
++
++The hash algorithm has been changed in B<OpenSSL 1.0.0>.  It is required to
++c_rehash the directory on upgrade from B<OpenSSL 0.x.x> to B<OpenSSL 1.x.x>.
++
++I<CApath> path is relative to I<chroot> directory if specified.
++
++=item B<CAfile> = CERT_FILE
++
++Certificate Authority file
++
++This file contains multiple CA certificates, used with the I<verify>.
++
++=item B<cert> = PEM_FILE
++
++certificate chain PEM file name
++
++The certificates must be in PEM format, and must be from the
++actual server/client certificate to the self-signed root CA certificate.
++
++A certificate is required in server mode, and optional in client mode.
++
++=item B<checkEmail> = EMAIL
++
++email address of the peer certificate subject
++
++Multiple I<checkEmail> options are allowed in a single service section.
++Certificates are accepted if no I<checkEmail> option was specified, or the
++email address of the peer certificate matches any of the email addresses
++specified with I<checkEmail>.
++
++=item B<checkHost> = HOST
++
++host of the peer certificate subject
++
++Multiple I<checkHost> options are allowed in a single service section.
++Certificates are accepted if no I<checkHost> option was specified, or the host
++name of the peer certificate matches any of the hosts specified with
++I<checkHost>.
++
++=item B<checkIP> = IP
++
++IP address of the peer certificate subject
++
++Multiple I<checkIP> options are allowed in a single service section.
++Certificates are accepted if no I<checkIP> option was specified, or the IP
++address of the peer certificate matches any of the IP addresses specified with
++I<checkIP>.
++
++=item B<ciphers> = CIPHER_LIST
++
++Select permitted SSL ciphers
++
++A colon delimited list of the ciphers to allow in the SSL connection,
++for example DES-CBC3-SHA:IDEA-CBC-MD5.
++
++=item B<client> = yes | no
++
++client mode (remote service uses SSL)
++
++default: no (server mode)
++
++=item B<connect> = [HOST:]PORT
++
++connect to a remote address
++
++If no host is specified, the host defaults to localhost.
++
++Multiple I<connect> options are allowed in a single service section.
++
++If host resolves to multiple addresses and/or if multiple I<connect>
++options are specified, then the remote address is chosen using a
++round-robin algorithm.
++
++=item B<CRLpath> = DIRECTORY
++
++Certificate Revocation Lists directory
++
++This is the directory in which B<stunnel> will look for CRLs when
++using the I<verify>. Note that the CRLs in this directory should
++be named XXXXXXXX.r0 where XXXXXXXX is the hash value of the CRL.
++
++The hash algorithm has been changed in B<OpenSSL 1.0.0>.  It is required to
++c_rehash the directory on upgrade from B<OpenSSL 0.x.x> to B<OpenSSL 1.x.x>.
++
++I<CRLpath> path is relative to I<chroot> directory if specified.
++
++=item B<CRLfile> = CERT_FILE
++
++Certificate Revocation Lists file
++
++This file contains multiple CRLs, used with the I<verify>.
++
++=item B<curve> = NID
++
++specify ECDH curve name
++
++To get a list of supported cuves use:
++
++    openssl ecparam -list_curves
++
++default: prime256v1
++
++=item B<logId> = TYPE
++
++connection identifier type
++
++This identifier allows to distinguish log entries generated for each of the
++connections.
++
++Currently supported types:
++
++=over 4
++
++=item I<sequential>
++
++The numeric sequential identifier is only unique within a single instance of
++B<stunnel>, but very compact.  It is most useful for manual log analysis.
++
++=item I<unique>
++
++This alphanumeric identifier is globally unique, but longer than the sequential
++number.  It is most useful for automated log analysis.
++
++=item I<thread>
++
++The operating system thread identifier is neither unique (even within a single
++instance of B<stunnel>) nor short.  It is most useful for debugging software
++or configuration issues.
++
++=back
++
++default: sequential
++
++=item B<debug> = LEVEL
++
++debugging level
++
++Level is a one of the syslog level names or numbers
++emerg (0), alert (1), crit (2), err (3), warning (4), notice (5),
++info (6), or debug (7).  All logs for the specified level and
++all levels numerically less than it will be shown.  Use I<debug = debug> or
++I<debug = 7> for greatest debugging output.  The default is notice (5).
++
++=item B<delay> = yes | no
++
++delay DNS lookup for I<connect> option
++
++This option is useful for dynamic DNS, or when DNS is not available during
++B<stunnel> startup (road warrior VPN, dial-up configurations).
++
++Delayed resolver mode is automatically engaged when stunnel fails to resolve on
++startup any of the I<connect> targets for a service.
++
++Delayed resolver inflicts I<failover = prio>.
++
++default: no
++
++=item B<engineId> = ENGINE_ID
++
++select engine ID for the service
++
++=item B<engineNum> = ENGINE_NUMBER
++
++select engine number for the service
++
++The engines are numbered starting from 1.
++
++=item B<exec> = EXECUTABLE_PATH
++
++execute local inetd-type program 
++
++I<exec> path is relative to I<chroot> directory if specified.
++
++The following environmental variables are set on Unix platform:
++REMOTE_HOST, REMOTE_PORT, SSL_CLIENT_DN, SSL_CLIENT_I_DN.
++
++=item B<execArgs> = $0 $1 $2 ...
++
++arguments for I<exec> including program name ($0)
++
++Quoting is currently not supported.
++Arguments are separated with arbitrary number of whitespaces.
++
++=item B<failover> = rr | prio
++
++Failover strategy for multiple "connect" targets.
++
++    rr (round robin) - fair load distribution
++    prio (priority) - use the order specified in config file
++
++default: rr
++
++=item B<ident> = USERNAME
++
++use IDENT (RFC 1413) username checking
++
++=item B<key> = KEY_FILE
++
++private key for certificate specified with I<cert> option
++
++Private key is needed to authenticate certificate owner.
++Since this file should be kept secret it should only be readable
++to its owner.  On Unix systems you can use the following command:
++
++    chmod 600 keyfile
++
++default: value of I<cert> option
++
++=item B<libwrap> = yes | no
++
++Enable or disable the use of /etc/hosts.allow and /etc/hosts.deny.
++
++default: no (since version 5.00)
++
++=item B<local> = HOST
++
++IP of the outgoing interface is used as source for remote connections.
++Use this option to bind a static local IP address, instead.
++
++=item B<sni> = SERVICE:SERVER_PATTERN (server mode)
++
++Use the service as a slave service (a name-based virtual server) for Server
++Name Indication TLS extension (RFC 3546).
++
++I<service_name> specifies the master service that accepts client connections
++with I<accept> option.  I<server_name_pattern> specifies the host name to be
++redirected.  The pattern may start with '*' character, e.g. '*.example.com'.
++Multiple slave services are normally specified for a single master service.
++I<sni> option can also be specified more than once within a single slave
++service.
++
++This service, as well as the master service, may not be configured in client
++mode.
++
++I<connect> option of the slave service is ignored when I<protocol> option is
++specified, as I<protocol> connects remote host before TLS handshake.
++
++Libwrap checks (Unix only) are performed twice: with master service name after
++TCP connection is accepted, and with slave service name during TLS handshake.
++
++Option I<sni> is only available when compiled with B<OpenSSL 1.0.0> and later.
++
++=item B<sni> = SERVER (client mode)
++
++Use the parameter as the value of TLS Server Name Indication (RFC 3546)
++extension.
++
++Option I<sni> is only available when compiled with B<OpenSSL 1.0.0> and later.
++
++=item B<OCSP> = URL
++
++select OCSP server for certificate verification
++
++=item B<OCSPaia> = yes | no
++
++validate certificates with their AIA OCSP responders
++
++This option enables I<stunnel> to validate certificates with the list of
++OCSP responder URLs retrieved from their AIA (Authority Information Access)
++extension.
++
++=item B<OCSPflag> = OCSP_FLAG
++
++specify OCSP server flag
++
++Several I<OCSPflag> can be used to specify multiple flags.
++
++currently supported flags: NOCERTS, NOINTERN NOSIGS, NOCHAIN, NOVERIFY,
++NOEXPLICIT, NOCASIGN, NODELEGATED, NOCHECKS, TRUSTOTHER, RESPID_KEY, NOTIME
++
++=item B<options> = SSL_OPTIONS
++
++B<OpenSSL> library options
++
++The parameter is the B<OpenSSL> option name as described in the
++I<SSL_CTX_set_options(3ssl)> manual, but without I<SSL_OP_> prefix.
++I<stunnel -options> lists the options found to be allowed in the
++current combination of I<stunnel> and the I<OpenSSL> library used
++to build it.
++
++Several I<options> can be used to specify multiple options.
++An option name can be prepended with a dash ("-") to disable the option.
++
++For example, for compatibility with the erroneous Eudora SSL
++implementation, the following option can be used:
++
++    options = DONT_INSERT_EMPTY_FRAGMENTS
++
++default:
++
++    options = NO_SSLv2
++    options = NO_SSLv3
++
++=item B<protocol> = PROTO
++
++application protocol to negotiate SSL
++
++This option enables initial, protocol-specific negotiation of the SSL/TLS
++encryption.
++I<protocol> option should not be used with SSL encryption on a separate port.
++
++Currently supported protocols:
++
++=over 4
++
++=item I<cifs>
++
++Proprietary (undocummented) extension of CIFS protocol implemented in Samba.
++Support for this extension was dropped in Samba 3.0.0.
++
++=item I<connect>
++
++Based on RFC 2817 - I<Upgrading to TLS Within HTTP/1.1>, section 5.2 - I<Requesting a Tunnel with CONNECT>
++
++This protocol is only supported in client mode.
++
++=item I<imap>
++
++Based on RFC 2595 - I<Using TLS with IMAP, POP3 and ACAP>
++
++=item I<nntp>
++
++Based on RFC 4642 - I<Using Transport Layer Security (TLS) with Network News Transfer Protocol (NNTP)>
++
++This protocol is only supported in client mode.
++
++=item I<pgsql>
++
++Based on
++F<http://www.postgresql.org/docs/8.3/static/protocol-flow.html#AEN73982>
++
++=item I<pop3>
++
++Based on RFC 2449 - I<POP3 Extension Mechanism>
++
++=item I<proxy>
++
++Haproxy client IP address
++F<http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt>
++
++=item I<smtp>
++
++Based on RFC 2487 - I<SMTP Service Extension for Secure SMTP over TLS>
++
++=item I<socks>
++
++SOCKS versions 4, 4a, and 5 are supported.  The SOCKS protocol itself
++is encapsulated within SSL/TLS encryption layer to protect the final
++destination address.
++
++F<http://www.openssh.com/txt/socks4.protocol>
++
++F<http://www.openssh.com/txt/socks4a.protocol>
++
++The BIND command of the SOCKS protocol is not supported.
++The USERID parameter is ignored.
++
++See Examples section for sample configuration files for VPN based on SOCKS
++encryption.
++
++=back
++
++=item B<protocolAuthentication> = basic | ntlm
++
++authentication type for protocol negotiations
++
++Currently authentication type only applies to the 'connect' protocol.
++
++default: basic
++
++=item B<protocolHost> = HOST:PORT
++
++destination address for protocol negotiations
++
++I<protocolHost> specifies the final SSL server to be connected by the proxy,
++and not the proxy server directly connected by B<stunnel>.
++The proxy server should be specified with the 'connect' option.
++
++Currently protocol destination address only applies to 'connect' protocol.
++
++=item B<protocolPassword> = PASSWORD
++
++password for protocol negotiations
++
++=item B<protocolUsername> = USERNAME
++
++username for protocol negotiations
++
++=item B<PSKidentity> = IDENTITY
++
++PSK identity for the PSK client
++
++I<PSKidentity> can be used on B<stunnel> clients to select the PSK identity
++used for authentication.  This option is ignored in server sections.
++
++default: the first identity specified in the I<PSKsecrets> file.
++
++=item B<PSKsecrets> = FILE
++
++file with PSK identities and corresponding keys
++
++Each line of the file in the following format:
++
++    IDENTITY:KEY
++
++The key is required to be at least 20 characters long.
++The file should not be world-readable nor world-writable.
++
++=item B<pty> = yes | no (Unix only)
++
++allocate pseudoterminal for 'exec' option
++
++=item B<redirect> = [HOST:]PORT
++
++redirect SSL client connections on certificate-based authentication failures
++
++This option only works in server mode.
++Some protocol negotiations are also incompatible with the I<redirect> option.
++
++=item B<renegotiation> = yes | no
++
++support SSL renegotiation
++
++Applications of the SSL renegotiation include some authentication scenarios,
++or re-keying long lasting connections.
++
++On the other hand this feature can facilitate a trivial CPU-exhaustion
++DoS attack:
++
++F<http://vincent.bernat.im/en/blog/2011-ssl-dos-mitigation.html>
++
++Please note that disabling SSL renegotiation does not fully mitigate
++this issue.
++
++default: yes (if supported by B<OpenSSL>)
++
++=item B<reset> = yes | no
++
++attempt to use TCP RST flag to indicate an error
++
++This option is not supported on some platforms.
++
++default: yes
++
++=item B<retry> = yes | no
++
++reconnect a connect+exec section after it's disconnected
++
++default: no
++
++=item B<sessionCacheSize> = NUM_ENTRIES
++
++session cache size
++
++I<sessionCacheSize> specifies the maximum number of the internal session cache
++entries.
++
++The value of 0 can be used for unlimited size.  It is not recommended
++for production use due to the risk of memory exhaustion DoS attack.
++
++=item B<sessionCacheTimeout> = TIMEOUT
++
++session cache timeout
++
++This is the number of seconds to keep cached SSL sessions.
++
++=item B<sessiond> = HOST:PORT
++
++address of sessiond SSL cache server
++
++=item B<sslVersion> = SSL_VERSION
++
++select the SSL protocol version
++
++Allowed values: all, SSLv2, SSLv3, TLSv1, TLSv1.1, TLSv1.2
++
++=item B<stack> = BYTES (except for FORK model)
++
++thread stack size
++
++=item B<TIMEOUTbusy> = SECONDS
++
++time to wait for expected data
++
++=item B<TIMEOUTclose> = SECONDS
++
++time to wait for close_notify (set to 0 for buggy MSIE)
++
++=item B<TIMEOUTconnect> = SECONDS
++
++time to wait to connect a remote host
++
++=item B<TIMEOUTidle> = SECONDS
++
++time to keep an idle connection
++
++=item B<transparent> = none | source | destination | both (Unix only)
++
++enable transparent proxy support on selected platforms
++
++Supported values:
++
++=over 4
++
++=item I<none>
++
++Disable transparent proxy support.  This is the default.
++
++=item I<source>
++
++Re-write address to appear as if wrapped daemon is connecting
++from the SSL client machine instead of the machine running B<stunnel>.
++
++This option is currently available in:
++
++=over 4
++
++=item Remote mode (I<connect> option) on I<Linux E<gt>=2.6.28>
++
++This configuration requires B<stunnel> to be executed as root and without
++I<setuid> option.
++
++This configuration requires the following setup for iptables and routing
++(possibly in /etc/rc.local or equivalent file):
++
++    iptables -t mangle -N DIVERT
++    iptables -t mangle -A PREROUTING -p tcp -m socket -j DIVERT
++    iptables -t mangle -A DIVERT -j MARK --set-mark 1
++    iptables -t mangle -A DIVERT -j ACCEPT
++    ip rule add fwmark 1 lookup 100
++    ip route add local 0.0.0.0/0 dev lo table 100
++    echo 0 >/proc/sys/net/ipv4/conf/lo/rp_filter
++
++B<stunnel> must also to be executed as root and without I<setuid> option.
++
++=item Remote mode (I<connect> option) on I<Linux 2.2.x>
++
++This configuration requires kernel to be compiled with I<transparent proxy>
++option.
++Connected service must be installed on a separate host.
++Routing towards the clients has to go through the B<stunnel> box.
++
++B<stunnel> must also to be executed as root and without I<setuid> option.
++
++=item Remote mode (I<connect> option) on I<FreeBSD E<gt>=8.0>
++
++This configuration requires additional firewall and routing setup.
++B<stunnel> must also to be executed as root and without I<setuid> option.
++
++=item Local mode (I<exec> option)
++
++This configuration works by pre-loading I<libstunnel.so> shared library.
++_RLD_LIST environment variable is used on Tru64, and LD_PRELOAD variable on
++other platforms.
++
++=back
++
++=item I<destination>
++
++Original destination is used instead of I<connect> option.
++
++A service section for transparent destination may look like this:
++
++    [transparent]
++    client=yes
++    accept=<stunnel_port>
++    transparent=destination
++
++This configuration requires iptables setup to work,
++possibly in /etc/rc.local or equivalent file.
++
++For a connect target installed on the same host:
++
++    /sbin/iptables -t nat -I OUTPUT -p tcp --dport <redirected_port> \
++        -m ! --uid-owner <stunnel_user_id> \
++        -j DNAT --to-destination <local_ip>:<stunnel_port>
++
++For a connect target installed on a remote host:
++
++    /sbin/iptables -I INPUT -i eth0 -p tcp --dport <stunnel_port> -j ACCEPT
++    /sbin/iptables -t nat -I PREROUTING -p tcp --dport <redirected_port> \
++        -i eth0 -j DNAT --to-destination <local_ip>:<stunnel_port>
++
++Transparent destination option is currently only supported on Linux.
++
++=item I<both>
++
++Use both I<source> and I<destination> transparent proxy.
++
++=back
++
++Two legacy options are also supported for backward compatibility:
++
++=over 4
++
++=item I<yes>
++
++This options has been renamed to I<source>.
++
++=item I<no>
++
++This options has been renamed to I<none>.
++
++=back
++
++
++=item B<verify> = LEVEL
++
++verify peer certificate
++
++=over 4
++
++=item level 0
++
++Request and ignore peer certificate.
++
++=item level 1
++
++Verify peer certificate if present.
++
++=item level 2
++
++Verify peer certificate.
++
++=item level 3
++
++Verify peer with locally installed certificate.
++
++=item level 4
++
++Ignore CA chain and only verify peer certificate.
++
++=item default
++
++No verify.
++
++=back
++
++It is important to understand, that this option was solely designed for access
++control and not for authorization.  Specifically for level 2 every non-revoked
++certificate is accepted regardless of its Common Name.  For this reason a
++dedicated CA should be used with level 2, and not a generic CA commonly used
++for webservers.  Level 3 is preferred for point-to-point connections.
++
++=back
++
++
++=head1 RETURN VALUE
++
++B<stunnel> returns zero on success, non-zero on error.
++
++
++=head1 SIGNALS
++
++The following signals can be used to control B<stunnel> in Unix environment:
++
++=over 4
++
++=item SIGHUP
++
++Force a reload of the configuration file.
++
++Some global options will not be reloaded:
++
++=over 4
++
++=item *
++
++chroot
++
++=item *
++
++foreground
++
++=item *
++
++pid
++
++=item *
++
++setgid
++
++=item *
++
++setuid
++
++=back
++
++The use of 'setuid' option will also prevent B<stunnel> from binding privileged
++(<1024) ports during configuration reloading.
++
++When 'chroot' option is used, B<stunnel> will look for all its files (including
++configuration file, certificates, log file and pid file) within the chroot
++jail.
++
++=item SIGUSR1
++
++Close and reopen B<stunnel> log file.
++This function can be used for log rotation.
++
++=item SIGTERM, SIGQUIT, SIGINT
++
++Shut B<stunnel> down.
++
++=back
++
++The result of sending any other signals to the server is undefined.
++
++
++=head1 EXAMPLES
++
++In order to provide SSL encapsulation to your local I<imapd> service, use:
++
++    [imapd]
++    accept = 993
++    exec = /usr/sbin/imapd
++    execArgs = imapd
++
++or in remote mode:
++
++    [imapd]
++    accept = 993
++    connect = 143
++
++In order to let your local e-mail client connect to an SSL-enabled I<imapd>
++service on another server, configure the e-mail client to connect to localhost
++on port 119 and use:
++
++    [imap]
++    client = yes
++    accept = 143
++    connect = servername:993
++
++If you want to provide tunneling to your I<pppd> daemon on port 2020,
++use something like:
++
++    [vpn]
++    accept = 2020
++    exec = /usr/sbin/pppd
++    execArgs = pppd local
++    pty = yes
++
++If you want to use B<stunnel> in I<inetd> mode to launch your imapd
++process, you'd use this I<stunnel.conf>.
++Note there must be no I<[service_name]> section.
++
++    exec = /usr/sbin/imapd
++    execArgs = imapd
++
++To setup SOCKS VPN configure the following client service:
++
++    [socks_client]
++    client = yes
++    accept = 127.0.0.1:1080
++    connect = vpn_server:9080
++    verify = 4
++    CAfile = stunnel.pem
++
++The corresponding configuration on the vpn_server host:
++
++    [socks_server]
++    protocol = socks
++    accept = 9080
++    cert = stunnel.pem
++    key = stunnel.key
++
++Now test your configuration on the client machine with:
++
++    curl --socks4a localhost http://www.example.com/
++
++=head1 NOTES
++
++=head2 RESTRICTIONS
++
++B<stunnel> cannot be used for the FTP daemon because of the nature
++of the FTP protocol which utilizes multiple ports for data transfers.
++There are available SSL-enabled versions of FTP and telnet daemons, however.
++
++
++=head2 INETD MODE
++
++The most common use of B<stunnel> is to listen on a network
++port and establish communication with either a new port
++via the connect option, or a new program via the I<exec> option.
++However there is a special case when you wish to have
++some other program accept incoming connections and
++launch B<stunnel>, for example with I<inetd>, I<xinetd>,
++or I<tcpserver>.
++
++For example, if you have the following line in I<inetd.conf>:
++
++    imaps stream tcp nowait root @bindir@/stunnel stunnel @sysconfdir@/stunnel/imaps.conf
++
++In these cases, the I<inetd>-style program is responsible
++for binding a network socket (I<imaps> above) and handing
++it to B<stunnel> when a connection is received.
++Thus you do not want B<stunnel> to have any I<accept> option.
++All the I<Service Level Options> should be placed in the
++global options section, and no I<[service_name]> section
++will be present.  See the I<EXAMPLES> section for example
++configurations.
++
++=head2 CERTIFICATES
++
++Each SSL-enabled daemon needs to present a valid X.509 certificate
++to the peer. It also needs a private key to decrypt the incoming
++data. The easiest way to obtain a certificate and a key is to 
++generate them with the free B<OpenSSL> package. You can find more
++information on certificates generation on pages listed below.
++
++The order of contents of the I<.pem> file is important.  It should contain the
++unencrypted private key first, then a signed certificate (not certificate
++request).  There should be also empty lines after certificate and private key.
++Plaintext certificate information appended on the top of generated certificate
++should be discarded. So the file should look like this:
++
++    -----BEGIN RSA PRIVATE KEY-----
++    [encoded key]
++    -----END RSA PRIVATE KEY-----
++    [empty line]
++    -----BEGIN CERTIFICATE-----
++    [encoded certificate]
++    -----END CERTIFICATE-----
++    [empty line]
++
++=head2 RANDOMNESS
++
++B<stunnel> needs to seed the PRNG (pseudo random number generator) in
++order for SSL to use good randomness.  The following sources are loaded
++in order until sufficient random data has been gathered:
++
++=over 4
++
++=item *
++
++The file specified with the I<RNDfile> flag.
++
++=item *
++
++The file specified by the RANDFILE environment variable, if set.
++
++=item *
++
++The file .rnd in your home directory, if RANDFILE not set.
++
++=item *
++
++The file specified with '--with-random' at compile time.
++
++=item *
++
++The contents of the screen if running on Windows.
++
++=item *
++
++The egd socket specified with the I<EGD> flag.
++
++=item *
++
++The egd socket specified with '--with-egd-sock' at compile time.
++
++=item *
++
++The /dev/urandom device.
++
++=back
++
++With recent (B<OpenSSL 0.9.5a> or later) version of SSL it will stop loading
++random data automatically when sufficient entropy has been gathered.  With
++previous versions it will continue to gather from all the above sources since
++no SSL function exists to tell when enough data is available.
++
++Note that on Windows machines that do not have console user interaction
++(mouse movements, creating windows, etc.) the screen contents are not
++variable enough to be sufficient, and you should provide a random file
++for use with the I<RNDfile> flag.
++
++Note that the file specified with the I<RNDfile> flag should contain
++random data -- that means it should contain different information
++each time B<stunnel> is run.  This is handled automatically
++unless the I<RNDoverwrite> flag is used.  If you wish to update this file
++manually, the I<openssl rand> command in recent versions of B<OpenSSL>,
++would be useful.
++
++Important note: If /dev/urandom is available, B<OpenSSL> often seeds the PRNG
++with it while checking the random state.  On systems with /dev/urandom
++B<OpenSSL> is likely to use it even though it is listed at the very bottom of
++the list above.  This is the behaviour of B<OpenSSL> and not B<stunnel>.
++
++=head2 DH PARAMETERS
++
++Stunnel 4.40 and later contains hardcoded 2048-bit DH parameters.
++
++It is also possible to specify DH parameters in the certificate file:
++
++    openssl dhparam 2048 >> stunnel.pem
++
++DH parameter generation may take several minutes.
++
++
++=head1 FILES
++
++=over 4
++
++=item F<@sysconfdir@/stunnel/stunnel.conf>
++
++B<stunnel> configuration file
++
++=back
++
++
++=head1 BUGS
++
++Option I<execArgs> and Win32 command line does not support quoting.
++
++
++=head1 SEE ALSO
++
++=over 4
++
++=item L<tcpd(8)>
++
++access control facility for internet services
++
++=item L<inetd(8)>
++
++internet 'super-server'
++
++=item F<http://www.stunnel.org/>
++
++B<stunnel> homepage
++
++=item F<http://www.openssl.org/>
++
++B<OpenSSL> project website
++
++=back
++
++
++=head1 AUTHOR
++
++=over 4
++
++=item Micha? Trojnara
++
++<F<Michal.Trojnara at mirt.net>>
++
++=back
++
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8fc3fe6..3bcbdfd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -90,3 +90,10 @@ resources.obj: resources.rc resources.h version.h
+ mostlyclean-local:
+ 	-rm -f *.obj
+ 
++edit = sed \
++	-e 's|@bindir[@]|$(bindir)|g'
++
++stunnel3: Makefile
++	$(edit) '$(srcdir)/$@.in' >$@
++
++stunnel3: $(srcdir)/stunnel3.in
+diff --git a/src/stunnel3.in b/src/stunnel3.in
+index db2bce0..eebbdcd 100755
+--- a/src/stunnel3.in
++++ b/src/stunnel3.in
+@@ -22,7 +22,7 @@ use POSIX;
+ use Getopt::Std;
+ 
+ # Configuration - path to stunnel (version >=4.05)
+-$stunnel_bin='@prefix@/bin/stunnel';
++$stunnel_bin='@bindir@/stunnel';
+ 
+ # stunnel3 script body begins here
+ ($read_fd, $write_fd)=POSIX::pipe();
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 79ef010..375cf91 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -37,3 +37,17 @@ cert:
+ 		rm -f stunnel.rnd; \
+ 	fi
+ 
++edit = sed \
++	-e 's|@prefix[@]|$(prefix)|g' \
++	-e 's|@bindir[@]|$(bindir)|g' \
++	-e 's|@localstatedir[@]|$(localstatedir)|g' \
++	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
++	-e 's|@DEFAULT_GROUP[@]|$(DEFAULT_GROUP)|g'
++
++stunnel.conf-sample stunnel.init stunnel.service: Makefile
++	$(edit) '$(srcdir)/$@.in' >$@
++
++stunnel.conf-sample: $(srcdir)/stunnel.conf-sample.in
++stunnel.init: $(srcdir)/stunnel.init.in
++stunnel.service: $(srcdir)/stunnel.service.in
++
+diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
+index c8f65dc..716c229 100644
+--- a/tools/stunnel.conf-sample.in
++++ b/tools/stunnel.conf-sample.in
+@@ -12,7 +12,7 @@
+ ;setgid = @DEFAULT_GROUP@
+ 
+ ; PID file is created inside the chroot jail (if enabled)
+-;pid = @prefix@/var/run/stunnel.pid
++;pid = @localstatedir@/run/stunnel.pid
+ 
+ ; Debugging stuff (may be useful for troubleshooting)
+ ;foreground = yes
+@@ -44,7 +44,7 @@ client = yes
+ accept = 127.0.0.1:110
+ connect = pop.gmail.com:995
+ verify = 2
+-CApath = /etc/ssl/certs
++CApath = @sysconfdir@/ssl/certs
+ checkHost = pop.gmail.com
+ 
+ [gmail-imap]
+@@ -52,7 +52,7 @@ client = yes
+ accept = 127.0.0.1:143
+ connect = imap.gmail.com:993
+ verify = 2
+-CApath = /etc/ssl/certs
++CApath = @sysconfdir@/ssl/certs
+ checkHost = imap.gmail.com
+ 
+ [gmail-smtp]
+@@ -60,7 +60,7 @@ client = yes
+ accept = 127.0.0.1:25
+ connect = smtp.gmail.com:465
+ verify = 2
+-CApath = /etc/ssl/certs
++CApath = @sysconfdir@/ssl/certs
+ checkHost = smtp.gmail.com
+ 
+ ; ***************************************** Example TLS server mode services
+@@ -68,34 +68,34 @@ checkHost = smtp.gmail.com
+ ;[pop3s]
+ ;accept  = 995
+ ;connect = 110
+-;cert = @prefix@/etc/stunnel/stunnel.pem
++;cert = @sysconfdir@/stunnel/stunnel.pem
+ 
+ ;[imaps]
+ ;accept  = 993
+ ;connect = 143
+-;cert = @prefix@/etc/stunnel/stunnel.pem
++;cert = @sysconfdir@/stunnel/stunnel.pem
+ 
+ ;[ssmtp]
+ ;accept  = 465
+ ;connect = 25
+-;cert = @prefix@/etc/stunnel/stunnel.pem
++;cert = @sysconfdir@/stunnel/stunnel.pem
+ 
+ ; TLS front-end to a web server
+ ;[https]
+ ;accept  = 443
+ ;connect = 80
+-;cert = @prefix@/etc/stunnel/stunnel.pem
++;cert = @sysconfdir@/stunnel/stunnel.pem
+ ; "TIMEOUTclose = 0" is a workaround for a design flaw in Microsoft SChannel
+ ; Microsoft implementations do not use TLS close-notify alert and thus they
+ ; are vulnerable to truncation attacks
+ ;TIMEOUTclose = 0
+ 
+ ; Remote shell protected with PSK-authenticated TLS
+-; Create "@prefix@/etc/stunnel/secrets.txt" containing IDENTITY:KEY pairs
++; Create "@sysconfdir@/stunnel/secrets.txt" containing IDENTITY:KEY pairs
+ ;[shell]
+ ;accept = 1337
+ ;exec = /bin/sh
+ ;execArgs = sh -i
+-;PSKsecrets = @prefix@/etc/stunnel/secrets.txt
++;PSKsecrets = @sysconfdir@/stunnel/secrets.txt
+ 
+ ; vim:ft=dosini
+diff --git a/tools/stunnel.init.in b/tools/stunnel.init.in
+index 32a3e64..aa46e9f 100644
+--- a/tools/stunnel.init.in
++++ b/tools/stunnel.init.in
+@@ -15,7 +15,7 @@
+ ### END INIT INFO
+ 
+ DEFAULTPIDFILE="/var/run/stunnel.pid"
+-DAEMON=@prefix@/bin/stunnel
++DAEMON=@bindir@/stunnel
+ NAME=stunnel
+ DESC="SSL tunnels"
+ OPTIONS=""
+@@ -100,9 +100,9 @@ if [ "x$OPTIONS" != "x" ]; then
+   OPTIONS="-- $OPTIONS"
+ fi
+ 
+-[ -f /etc/default/stunnel ] && . /etc/default/stunnel
++[ -f @sysconfdir@/default/stunnel ] && . /etc/default/stunnel
+ if [ "$ENABLED" = "0" ] ; then
+-  echo "$DESC disabled, see /etc/default/stunnel"
++  echo "$DESC disabled, see @sysconfdir@/default/stunnel"
+   exit 0
+ fi
+ 
+@@ -110,15 +110,15 @@ fi
+ # is in $2. Otherwise, respect /etc/default/stunnel4 setting. If no
+ # setting there, use /etc/stunnel/*.conf
+ if [ -n "${2:-}" ]; then
+-  if [ -e "/etc/stunnel/$2.conf" ]; then
+-    FILES="/etc/stunnel/$2.conf"
++  if [ -e "@sysconfdir@/stunnel/$2.conf" ]; then
++    FILES="@sysconfdir@/stunnel/$2.conf"
+   else
+-    echo >&2 "/etc/stunnel/$2.conf does not exist."
++    echo >&2 "@sysconfdir@/stunnel/$2.conf does not exist."
+     exit 1
+   fi
+ else
+   if [ -z "$FILES" ]; then
+-    FILES="/etc/stunnel/*.conf"
++    FILES="@sysconfdir@/stunnel/*.conf"
+   fi
+ fi
+ 
+@@ -158,7 +158,7 @@ case "$1" in
+ 	querydaemons
+ 	;;
+   *)
+-        N=/etc/init.d/$NAME
++        N=@sysconfdir@/init.d/$NAME
+         echo "Usage: $N {start|stop|status|reload|reopen-logs|restart} [<stunnel instance>]" >&2
+         exit 1
+         ;;
+diff --git a/tools/stunnel.service.in b/tools/stunnel.service.in
+index 0f7adfa..7776364 100644
+--- a/tools/stunnel.service.in
++++ b/tools/stunnel.service.in
+@@ -3,7 +3,7 @@ Description=SSL tunnel for network daemons
+ After=syslog.target
+ 
+ [Service]
+-ExecStart=@prefix@/bin/stunnel
++ExecStart=@bindir@/stunnel
+ Type=forking
+ 
+ [Install]
+-- 
+2.3.3
+

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


From opk at users.sourceforge.net  Sun May 31 23:52:29 2015
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Sun, 31 May 2015 21:52:29 +0000
Subject: SF.net SVN: gar:[25039] csw/mgar/pkg/zsh/trunk
Message-ID: <3m0CzX4QddzKm@mail.opencsw.org>

Revision: 25039
          http://sourceforge.net/p/gar/code/25039
Author:   opk
Date:     2015-05-31 21:52:29 +0000 (Sun, 31 May 2015)
Log Message:
-----------
update zsh to 5.0.8

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

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2015-05-31 20:36:13 UTC (rev 25038)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2015-05-31 21:52:29 UTC (rev 25039)
@@ -1,5 +1,5 @@
 NAME = zsh
-VERSION = 5.0.7
+VERSION = 5.0.8
 GARTYPE = v2
 
 DESCRIPTION = Powerful UNIX shell

Modified: csw/mgar/pkg/zsh/trunk/checksums
===================================================================
--- csw/mgar/pkg/zsh/trunk/checksums	2015-05-31 20:36:13 UTC (rev 25038)
+++ csw/mgar/pkg/zsh/trunk/checksums	2015-05-31 21:52:29 UTC (rev 25039)
@@ -1 +1 @@
-1cd396ce17952de50b8a89980d617f0a  zsh-5.0.7.tar.bz2
+e6759e8dd7b714d624feffd0a73ba0fe  zsh-5.0.8.tar.bz2

Modified: csw/mgar/pkg/zsh/trunk/files/_mgar
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/_mgar	2015-05-31 20:36:13 UTC (rev 25038)
+++ csw/mgar/pkg/zsh/trunk/files/_mgar	2015-05-31 21:52:29 UTC (rev 25039)
@@ -9,7 +9,7 @@
     help:list\ available\ commands
     install:install\ files\ to\ staging\ directory
     makepatch:create\ a\ patch\ for\ outstanding\ changes
-    check-prereqs checksum test
+    check-prereqs checksum test patch
     ${${(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.