From skayser at users.sourceforge.net  Wed Sep  1 00:17:39 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 31 Aug 2010 22:17:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10855] csw/mgar/pkg/postfix
Message-ID: <E1OqZ99-0008VJ-5m@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10855
          http://gar.svn.sourceforge.net/gar/?rev=10855&view=rev
Author:   skayser
Date:     2010-08-31 22:17:38 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
postfix: move old recipe to 2.4 branch

Added Paths:
-----------
    csw/mgar/pkg/postfix/branches/postfix-2.4/

Removed Paths:
-------------
    csw/mgar/pkg/postfix/trunk/


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

From skayser at users.sourceforge.net  Wed Sep  1 00:28:57 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 31 Aug 2010 22:28:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10856] csw/mgar/pkg/postfix
Message-ID: <E1OqZK5-000860-UN@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10856
          http://gar.svn.sourceforge.net/gar/?rev=10856&view=rev
Author:   skayser
Date:     2010-08-31 22:28:57 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
postfix: move 2.7 branch to trunk

Added Paths:
-----------
    csw/mgar/pkg/postfix/trunk/

Removed Paths:
-------------
    csw/mgar/pkg/postfix/branches/postfix-2.7/


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

From skayser at users.sourceforge.net  Wed Sep  1 00:30:18 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 31 Aug 2010 22:30:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[10857] csw/mgar/pkg/postfix/trunk
Message-ID: <E1OqZLO-0000XT-Se@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10857
          http://gar.svn.sourceforge.net/gar/?rev=10857&view=rev
Author:   skayser
Date:     2010-08-31 22:30:18 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
postfix: final touches before 2.7 release

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

Modified: csw/mgar/pkg/postfix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postfix/trunk/Makefile	2010-08-31 22:28:57 UTC (rev 10856)
+++ csw/mgar/pkg/postfix/trunk/Makefile	2010-08-31 22:30:18 UTC (rev 10857)
@@ -10,8 +10,6 @@
 #
 #
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! Build, install and test package (works? spool permissions ok?)
-#   WRT to permissions, run "postfix set-permissions" and compare
 # * Ship simple default configuration (restrict mynetworks to 127.0.0.1?)
 # * alias_database points to /etc/mail/aliases, symlink
 #   /etc/opt/csw/postfix/aliases to /etc/mail/aliases?

Modified: csw/mgar/pkg/postfix/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postfix/trunk/files/changelog.CSW	2010-08-31 22:28:57 UTC (rev 10856)
+++ csw/mgar/pkg/postfix/trunk/files/changelog.CSW	2010-08-31 22:30:18 UTC (rev 10857)
@@ -1,4 +1,4 @@
-postfix (2.7.1,REV=2010.07.30)
+postfix (2.7.1,REV=2010.09.01)
 
   * Adopted and updated to 2.7.1. (Closes #3580, #3700, #3970)
   * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
@@ -10,4 +10,4 @@
   * Doesn't automatically substitute system sendmail binaries any more.
     Please refer to README.CSW instead. (Closes #1943, #2964, #3060) 
 
- -- Sebastian Kayser <skayser at opencsw.org>  Fri, 30 Jul 2010 15:10:26 +0200
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed,  1 Sep 2010 00:29:32 +0200


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

From skayser at users.sourceforge.net  Wed Sep  1 00:33:17 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 31 Aug 2010 22:33:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10858]
	csw/mgar/pkg/nano/trunk/files/changelog.CSW
Message-ID: <E1OqZOH-0008D6-Gu@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10858
          http://gar.svn.sourceforge.net/gar/?rev=10858&view=rev
Author:   skayser
Date:     2010-08-31 22:33:17 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
nano: update changelog.CSW

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

Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/nano/trunk/files/changelog.CSW	2010-08-31 22:30:18 UTC (rev 10857)
+++ csw/mgar/pkg/nano/trunk/files/changelog.CSW	2010-08-31 22:33:17 UTC (rev 10858)
@@ -1,8 +1,8 @@
-nano (2.2.5,REV=2010.08.11)
+nano (2.2.5,REV=2010.09.01)
 
   * Version bump to 2.2.5.
 
- -- Sebastian Kayser <skayser at opencsw.org>  Wed, 11 Aug 2010 23:40:47 +0200
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed,  1 Sep 2010 00:31:41 +0200
 
 nano (2.2.4,REV=2010.07.30)
 


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

From skayser at users.sourceforge.net  Wed Sep  1 01:16:14 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 31 Aug 2010 23:16:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10859] csw/mgar/pkg/sudosh2/trunk
Message-ID: <E1Oqa3q-0000xn-Ir@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10859
          http://gar.svn.sourceforge.net/gar/?rev=10859&view=rev
Author:   skayser
Date:     2010-08-31 23:16:14 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
sudosh: version bump to 1.0.4

Modified Paths:
--------------
    csw/mgar/pkg/sudosh2/trunk/Makefile
    csw/mgar/pkg/sudosh2/trunk/checksums
    csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/sudosh2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudosh2/trunk/Makefile	2010-08-31 22:33:17 UTC (rev 10858)
+++ csw/mgar/pkg/sudosh2/trunk/Makefile	2010-08-31 23:16:14 UTC (rev 10859)
@@ -1,8 +1,8 @@
-# TODO/Issues
-# - Submit 001- (DESTDIR) and 002- (man page) patches upstream
-# - clearenvironment is not documented in sudosh.conf(5), others?
+# TODO (release-critical prefixed with !, non release-critical with *)
+# * Submit 001- (DESTDIR) and 002- (man page) patches upstream
+# * clearenvironment is not documented in sudosh.conf(5), others?
 GARNAME = sudosh2
-GARVERSION = 1.0.2
+GARVERSION = 1.0.4
 CATEGORIES = apps
 
 DESCRIPTION = Extensive auditing of user shell usage
@@ -20,11 +20,11 @@
   Sudosh2 is a fork of sudosh (by Douglas Hanks).
 endef
 
-SPKG_SOURCEURL = http://sudosh2.sf.net
-MASTER_SITES   = $(SF_MIRRORS)
-DISTFILES      = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES     += CSWsudosh2.postinstall
-DISTFILES     += CSWsudosh2.postremove
+VENDOR_URL    = http://sudosh2.sf.net
+MASTER_SITES  = $(SF_MIRRORS)
+DISTFILES     = $(GARNAME)-$(GARVERSION).tgz
+DISTFILES    += CSWsudosh2.postinstall
+DISTFILES    += CSWsudosh2.postremove
 
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
@@ -57,9 +57,6 @@
 PATCHFILES += 002-strip-man-page-blank.patch
 # The binary is called sudosh (not sudosh2 - only leave sudosh2 in the title)
 PATCHFILES += 003-adjust-sudosh-man-binary-name.patch
-# sudosh-replay leaks FDs on listing sessions
-# http://sourceforge.net/tracker/?func=detail&aid=2040342&group_id=213047&atid=1024149
-PATCHFILES += 004-replay-close-fds.patch
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/sudosh2/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudosh2/trunk/checksums	2010-08-31 22:33:17 UTC (rev 10858)
+++ csw/mgar/pkg/sudosh2/trunk/checksums	2010-08-31 23:16:14 UTC (rev 10859)
@@ -4,4 +4,4 @@
 41edfc118e6aaf191e647decee641bee  004-replay-close-fds.patch
 0b8a0b464681f636262f716d096420f6  CSWsudosh2.postinstall
 e324c66237a431004242d274fa2ad1f4  CSWsudosh2.postremove
-4c837f7739d9db780ad324ed8482e8a7  sudosh2-1.0.2.tgz
+28c0b6cfd60299a6c339cf9b07f2367f  sudosh2-1.0.4.tgz

Modified: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW	2010-08-31 22:33:17 UTC (rev 10858)
+++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW	2010-08-31 23:16:14 UTC (rev 10859)
@@ -1,3 +1,9 @@
+sudosh2 (1.0.4,REV=2010.09.01)
+
+  * Version bump to 1.0.4. (Closes #4487)
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed,  1 Sep 2010 01:06:14 +0200
+
 sudosh2 (1.0.2,REV=2009.12.02)
 
   * Applied file handle leak patch so that sudosh-replay doesn't run out of


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

From bdwalton at users.sourceforge.net  Wed Sep  1 05:10:43 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 01 Sep 2010 03:10:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[10860] csw/mgar/pkg/gettext/trunk
Message-ID: <E1Oqdil-0003TU-Lj@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10860
          http://gar.svn.sourceforge.net/gar/?rev=10860&view=rev
Author:   bdwalton
Date:     2010-09-01 03:10:43 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
gettext: add the 0.17 version of the libs as SONAME requirements will need these files

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

Added Paths:
-----------
    csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.amd64
    csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.i
    csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s
    csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s9
    csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.amd64
    csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.i
    csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s
    csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s9

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-08-31 23:16:14 UTC (rev 10859)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-01 03:10:43 UTC (rev 10860)
@@ -61,6 +61,7 @@
 
 #provided by iconv
 MERGE_EXCLUDE_FILES  = .*/charset.alias
+MERGE_EXCLUDE_FILES += .*/locale.alias
 MERGE_EXCLUDE_FILES += .*/iconv.m4
 MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
 

Added: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.amd64
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.amd64
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.i
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.i
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.amd64
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.amd64
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.i
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.i
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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 Sep  1 09:38:57 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 07:38:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10861]
	csw/mgar/pkg/cpan/Apache-DBI/trunk
Message-ID: <E1OqhuL-0005iG-L1@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10861
          http://gar.svn.sourceforge.net/gar/?rev=10861&view=rev
Author:   dmichelsen
Date:     2010-09-01 07:38:57 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
cpan/Apache-DBI: Update to 1.08 and mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-DBI/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Apache-DBI/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.depend
    csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Apache-DBI/trunk/


Property changes on: csw/mgar/pkg/cpan/Apache-DBI/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile	2010-09-01 03:10:43 UTC (rev 10860)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile	2010-09-01 07:38:57 UTC (rev 10861)
@@ -1,18 +1,26 @@
 GARNAME = Apache-DBI
-GARVERSION = 0.94
+GARVERSION = 1.08
 CATEGORIES = cpan
 AUTHOR = ABH
 
-DESCRIPTION = initiate a persistent database connection
+DESCRIPTION = Initiate a persistent database connection
 define BLURB
-  This module initiates a persistent database connection.
+  These modules are supposed to be used with the Apache server together with 
+  an embedded perl interpreter like mod_perl. They provide support for basic 
+  authentication and authorization as well as support for persistent database 
+  connections via Perl's Database Independent Interface (DBI). 
 endef
 
-DISTFILES += CSWpmapachedbi.gspec CSWpmapachedbi.depend
+DISTFILES = COPYING
 
-DEPENDS += cpan/DBI
+PACKAGES = CSWpmapachedbi
+CATALOGNAME = pm_apachedbi
 
+DEP_PKGS = CSWmodperl CSWpmdbi CSWpmdigestsha1
+
 # Tests require MySQL to be running
-TEST_SCRIPTS =
+# TEST_SCRIPTS =
 
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Apache-DBI/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/checksums	2010-09-01 03:10:43 UTC (rev 10860)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/checksums	2010-09-01 07:38:57 UTC (rev 10861)
@@ -1,3 +1,2 @@
-3d5e99bc48ef2a40688d084369e973e1  download/CSWpmapachedbi.gspec
-89c5044274f2f62e6d6fc58ec4bf2906  download/CSWpmapachedbi.depend
-70a90a6d96b3563a204996e0f8122e61  download/Apache-DBI-0.94.tar.gz
+cb33b7ce268ef3a6fcbdc82d13d89b5c  Apache-DBI-1.08.tar.gz
+7fc3ac03a8acf663f0e6c6a1d8cb0748  COPYING

Added: csw/mgar/pkg/cpan/Apache-DBI/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/files/COPYING	2010-09-01 07:38:57 UTC (rev 10861)
@@ -0,0 +1,6 @@
+COPYRIGHT:
+----------
+
+You may distribute under the terms of either the GNU General Public
+License or the Artistic License, as specified in the Perl README file.
+

Deleted: csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.depend
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.depend	2010-09-01 03:10:43 UTC (rev 10860)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.depend	2010-09-01 07:38:57 UTC (rev 10861)
@@ -1 +0,0 @@
-P CSWpmdbi pm_dbi - database independent interface for Perl

Deleted: csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.gspec
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.gspec	2010-09-01 03:10:43 UTC (rev 10860)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/files/CSWpmapachedbi.gspec	2010-09-01 07:38:57 UTC (rev 10861)
@@ -1,6 +0,0 @@
-%var            bitname pm_apachedbi
-%var            pkgname CSWpmapachedbi
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-The Apache::AuthDBI module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.


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

From dmichelsen at users.sourceforge.net  Wed Sep  1 10:40:38 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 08:40:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10862] csw/mgar/gar/v2/gar.mk
Message-ID: <E1Oqis2-0004qD-FW@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10862
          http://gar.svn.sourceforge.net/gar/?rev=10862&view=rev
Author:   dmichelsen
Date:     2010-09-01 08:40:38 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
mGAR v2: Skip things in files/ from checksumming

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-09-01 07:38:57 UTC (rev 10861)
+++ csw/mgar/gar/v2/gar.mk	2010-09-01 08:40:38 UTC (rev 10862)
@@ -45,7 +45,8 @@
 DISTNAME ?= $(GARNAME)-$(GARVERSION)
 
 DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR))))
-_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM)
+_LOCALFILES = $(notdir $(wildcard files/*))
+_NOCHECKSUM += $(DYNSCRIPTS) $(_LOCALFILES) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM)
 
 DISTFILES += $(_EXTRA_GAR_DISTFILES)
 


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

From chninkel at users.sourceforge.net  Wed Sep  1 12:31:03 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 10:31:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10863] csw/mgar/pkg/vsftpd/trunk
Message-ID: <E1Oqkat-0007nu-KR@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10863
          http://gar.svn.sourceforge.net/gar/?rev=10863&view=rev
Author:   chninkel
Date:     2010-09-01 10:31:03 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: switched from /opt/csw/var/empy to /var/opt/csw/empy

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch
    csw/mgar/pkg/vsftpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 08:40:38 UTC (rev 10862)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 10:31:03 UTC (rev 10863)
@@ -147,4 +147,4 @@
 	ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW"
 
 merge-empty-directory:
-	ginstall -d "$(PKGROOT)$(localstatedir)/empty/vsftpd"
+	ginstall -d "$(PKGROOT)/var/opt/csw/empty/vsftpd"

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 08:40:38 UTC (rev 10862)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 10:31:03 UTC (rev 10863)
@@ -3,8 +3,8 @@
 281c51282cabd9475cceef363bbc699b  build_options.patch
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
-a9e994d2b57999b76a0e03503745c01a  csw_paths.patch
-3dc08f17f383de22b400f1af00ff7ef6  cswusergroup
+57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
+c4928b039f7e0658dfaf7420eea98cbb  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
 83d13bd15ec4c0de2695640b7407c700  destdir.patch

Modified: csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch	2010-09-01 08:40:38 UTC (rev 10862)
+++ csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch	2010-09-01 10:31:03 UTC (rev 10863)
@@ -18,7 +18,7 @@
    tunable_chown_upload_mode = 0600;
  
 -  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+  install_str_setting("/opt/csw/var/empty/vsftpd", &tunable_secure_chroot_dir);
++  install_str_setting("/var/opt/csw/empty/vsftpd", &tunable_secure_chroot_dir);
    install_str_setting("ftp", &tunable_ftp_username);
    install_str_setting("root", &tunable_chown_username);
    install_str_setting("/var/log/xferlog", &tunable_xferlog_file);

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 08:40:38 UTC (rev 10862)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 10:31:03 UTC (rev 10863)
@@ -1,2 +1,2 @@
-vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false:::NP
+vsftpd:vsftpd:vsftpd privsep user:/var/opt/csw/empty/vsftpd:/bin/false:::NP
 ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:y::NP


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

From chninkel at users.sourceforge.net  Wed Sep  1 12:36:33 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 10:36:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10864] csw/mgar/pkg/vsftpd/trunk
Message-ID: <E1OqkgD-0006i8-Uj@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10864
          http://gar.svn.sourceforge.net/gar/?rev=10864&view=rev
Author:   chninkel
Date:     2010-09-01 10:36:33 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: also switched from /opt/csw/var/ftp to /var/opt/csw/ftp

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 10:31:03 UTC (rev 10863)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 10:36:33 UTC (rev 10864)
@@ -4,7 +4,7 @@
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
 57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
-c4928b039f7e0658dfaf7420eea98cbb  cswusergroup
+97284faaf1157370fcbe1737b5e725b4  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
 83d13bd15ec4c0de2695640b7407c700  destdir.patch

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 10:31:03 UTC (rev 10863)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 10:36:33 UTC (rev 10864)
@@ -1,2 +1,2 @@
 vsftpd:vsftpd:vsftpd privsep user:/var/opt/csw/empty/vsftpd:/bin/false:::NP
-ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:y::NP
+ftp:nogroup:ftp user for anonymous access:/var/opt/csw/ftp:/bin/false:y::NP


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

From chninkel at users.sourceforge.net  Wed Sep  1 13:15:23 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:15:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10865] csw/mgar/pkg/vsftpd/trunk
Message-ID: <E1OqlHn-0007nh-NZ@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10865
          http://gar.svn.sourceforge.net/gar/?rev=10865&view=rev
Author:   chninkel
Date:     2010-09-01 11:15:23 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: manually create the ftp home directory

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
    csw/mgar/pkg/vsftpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:15:23 UTC (rev 10865)
@@ -1,10 +1,10 @@
-a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
+0ea60e4bd6ed8f5bfc79457c930f84e3  CSWvsftpd.preinstall
 eeaf77528b2da0c7730323838f30b7ef  README.CSW
 281c51282cabd9475cceef363bbc699b  build_options.patch
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
 57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
-97284faaf1157370fcbe1737b5e725b4  cswusergroup
+36e99857f4727e99a13721c8f726c856  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
 83d13bd15ec4c0de2695640b7407c700  destdir.patch

Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:15:23 UTC (rev 10865)
@@ -5,4 +5,9 @@
 	if [ -z "$FTP_HOME" ] || [ ! -d "$FTP_HOME" ]; then
 		echo "WARNING: the ftp user doesn't have a valid home directory !" 
 	fi
+else
+	# we manually create the ftp home directory if the ftp user doesn't exist
+	#  cswusergroup action class can create the directory but populates it
+	# with skeleton files and we want an empty directory
+	mkdir -p "$PKG_INSTALL_ROOT/var/opt/csw/ftp"
 fi

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 11:15:23 UTC (rev 10865)
@@ -1,2 +1,2 @@
 vsftpd:vsftpd:vsftpd privsep user:/var/opt/csw/empty/vsftpd:/bin/false:::NP
-ftp:nogroup:ftp user for anonymous access:/var/opt/csw/ftp:/bin/false:y::NP
+ftp:nogroup:ftp user for anonymous access:/var/opt/csw/ftp:/bin/false:::NP


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

From bonivart at users.sourceforge.net  Wed Sep  1 13:17:47 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:17:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10866]
	csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile
Message-ID: <E1OqlK7-00037N-P9@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10866
          http://gar.svn.sourceforge.net/gar/?rev=10866&view=rev
Author:   bonivart
Date:     2010-09-01 11:17:47 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
convert-binhex: skip tests

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile	2010-09-01 11:15:23 UTC (rev 10865)
+++ csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile	2010-09-01 11:17:47 UTC (rev 10866)
@@ -16,4 +16,6 @@
 
 ARCHALL = 1
 
+SKIPTEST = 1
+
 include gar/category.mk


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

From dmichelsen at users.sourceforge.net  Wed Sep  1 13:36:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:36:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10867]
	csw/mgar/pkg/cpan/PatchReader/trunk
Message-ID: <E1Oqlbv-0003dq-US@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10867
          http://gar.svn.sourceforge.net/gar/?rev=10867&view=rev
Author:   dmichelsen
Date:     2010-09-01 11:36:11 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
cpan/PatchReader: Update to mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/PatchReader/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.gspec
    csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.prototype

Property Changed:
----------------
    csw/mgar/pkg/cpan/PatchReader/trunk/


Property changes on: csw/mgar/pkg/cpan/PatchReader/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/PatchReader/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/PatchReader/trunk/Makefile	2010-09-01 11:17:47 UTC (rev 10866)
+++ csw/mgar/pkg/cpan/PatchReader/trunk/Makefile	2010-09-01 11:36:11 UTC (rev 10867)
@@ -10,6 +10,11 @@
   patch information.
 endef
 
-DISTFILES += $(call admfiles,CSWpmpatchreader,prototype)
+DISTFILES = COPYING
 
+PACKAGES = CSWpmpatchreader
+CATALOGNAME = pm_patchreader
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/PatchReader/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/PatchReader/trunk/checksums	2010-09-01 11:17:47 UTC (rev 10866)
+++ csw/mgar/pkg/cpan/PatchReader/trunk/checksums	2010-09-01 11:36:11 UTC (rev 10867)
@@ -1,3 +1 @@
-a88b18ade7beff8d7cea7c1cb51ffed3  download/CSWpmpatchreader.gspec
-a1490c865be3ed4409a554fa4db198c7  download/CSWpmpatchreader.prototype
-8aca86b807aec3c82dcb981c7730f022  download/PatchReader-0.9.5.tar.gz
+8aca86b807aec3c82dcb981c7730f022  PatchReader-0.9.5.tar.gz

Copied: csw/mgar/pkg/cpan/PatchReader/trunk/files/COPYING (from rev 10860, csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.gspec)
===================================================================
--- csw/mgar/pkg/cpan/PatchReader/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/PatchReader/trunk/files/COPYING	2010-09-01 11:36:11 UTC (rev 10867)
@@ -0,0 +1,2 @@
+This module is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.gspec
===================================================================
--- csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.gspec	2010-09-01 11:17:47 UTC (rev 10866)
+++ csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.gspec	2010-09-01 11:36:11 UTC (rev 10867)
@@ -1,7 +0,0 @@
-%var            bitname pm_patchreader
-%var            pkgname CSWpmpatchreader
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-This module is free software; you can redistribute it and/or modify it under
-the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.prototype
===================================================================
--- csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.prototype	2010-09-01 11:17:47 UTC (rev 10866)
+++ csw/mgar/pkg/cpan/PatchReader/trunk/files/CSWpmpatchreader.prototype	2010-09-01 11:36:11 UTC (rev 10867)
@@ -1,25 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/PatchReader 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/PatchReader/.packlist 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/PatchReader.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/PatchReader 0755 root bin
-f none /opt/csw/share/perl/csw/PatchReader.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/AddCVSContext.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/Base.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/CVSClient.pm 0555 root bin
-d none /opt/csw/share/perl/csw/PatchReader/DiffPrinter 0755 root bin
-f none /opt/csw/share/perl/csw/PatchReader/DiffPrinter/raw.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/DiffPrinter/template.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/FilterPatch.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/FixPatchRoot.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/NarrowPatch.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/PatchInfoGrabber.pm 0555 root bin
-f none /opt/csw/share/perl/csw/PatchReader/Raw.pm 0555 root bin


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 Sep  1 13:41:55 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:41:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10868] csw/mgar/pkg/cpan/GDGraph/trunk
Message-ID: <E1OqlhT-0003nb-PA@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10868
          http://gar.svn.sourceforge.net/gar/?rev=10868&view=rev
Author:   dmichelsen
Date:     2010-09-01 11:41:55 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
cpan/GDGraph: Update to 1.44 and mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/GDGraph/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.depend
    csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/GDGraph/trunk/


Property changes on: csw/mgar/pkg/cpan/GDGraph/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/GDGraph/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GDGraph/trunk/Makefile	2010-09-01 11:36:11 UTC (rev 10867)
+++ csw/mgar/pkg/cpan/GDGraph/trunk/Makefile	2010-09-01 11:41:55 UTC (rev 10868)
@@ -1,15 +1,20 @@
 GARNAME = GDGraph
-GARVERSION = 1.43
+GARVERSION = 1.44
 CATEGORIES = cpan
-AUTHOR = MVERB
+AUTHOR = BWARFIELD
 
-DESCRIPTION = graph plotting module
+DESCRIPTION = Graph plotting module
 define BLURB
   GD::Graph is a perl5 module to create charts using the GD module.
 endef
 
-DISTFILES += CSWpmgdgraph.gspec CSWpmgdgraph.depend
+DISTFILES = COPYING
 
-DEPENDS += cpan/GDTextUtil
+PACKAGES = CSWpmgdgraph
+CATALOGNAME = pm_gdgraph
 
+DEP_PKGS = CSWpmgdtextut
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/GDGraph/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/GDGraph/trunk/checksums	2010-09-01 11:36:11 UTC (rev 10867)
+++ csw/mgar/pkg/cpan/GDGraph/trunk/checksums	2010-09-01 11:41:55 UTC (rev 10868)
@@ -1,3 +1,2 @@
-ac3fefa96abf02aa67527c5decb61d8d  download/CSWpmgdgraph.gspec
-d363f77821d2f1adfe8eb77feffe681b  download/CSWpmgdgraph.depend
-cf546f2de827a56458afe288ab0807f2  download/GDGraph-1.43.tar.gz
+7f2a043c36d834e728debf0cc8058c24  COPYING
+a8a4ab62741258803b5744cb8882e68c  GDGraph-1.44.tar.gz

Copied: csw/mgar/pkg/cpan/GDGraph/trunk/files/COPYING (from rev 9723, csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.gspec)
===================================================================
--- csw/mgar/pkg/cpan/GDGraph/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/GDGraph/trunk/files/COPYING	2010-09-01 11:41:55 UTC (rev 10868)
@@ -0,0 +1,7 @@
+GD::Graph       Copyright (c) 1999-2002 Martien Verbruggen. All rights reserved.
+Chart::PNGgraph Copyright (c) 1999 Steve Bonds.  All rights reserved.
+GIFgraph        Copyright (c) 1995-1999 Martien Verbruggen. All rights reserved.
+
+This package is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+

Deleted: csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.depend
===================================================================
--- csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.depend	2010-09-01 11:36:11 UTC (rev 10867)
+++ csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.depend	2010-09-01 11:41:55 UTC (rev 10868)
@@ -1 +0,0 @@
-P CSWpmgdtextut pm_gdtextut - Text utilities for use with GD

Deleted: csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.gspec
===================================================================
--- csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.gspec	2010-09-01 11:36:11 UTC (rev 10867)
+++ csw/mgar/pkg/cpan/GDGraph/trunk/files/CSWpmgdgraph.gspec	2010-09-01 11:41:55 UTC (rev 10868)
@@ -1,12 +0,0 @@
-%var            bitname pm_gdgraph
-%var            pkgname CSWpmgdgraph
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-GD::Graph       Copyright (c) 1999-2002 Martien Verbruggen. All rights reserved.
-Chart::PNGgraph Copyright (c) 1999 Steve Bonds.  All rights reserved.
-GIFgraph        Copyright (c) 1995-1999 Martien Verbruggen. All rights reserved.
-
-This package is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-


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

From bonivart at users.sourceforge.net  Wed Sep  1 13:42:07 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:42:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10869]
	csw/mgar/pkg/cpan/Convert-TNEF/trunk
Message-ID: <E1Oqlhf-0003nu-HL@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10869
          http://gar.svn.sourceforge.net/gar/?rev=10869&view=rev
Author:   bonivart
Date:     2010-09-01 11:42:07 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
convert-tnef: some fixes

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.depend
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/


Property changes on: csw/mgar/pkg/cpan/Convert-TNEF/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile	2010-09-01 11:41:55 UTC (rev 10868)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile	2010-09-01 11:42:07 UTC (rev 10869)
@@ -10,8 +10,13 @@
   attachment, you may want to use this module.
 endef
 
-DISTFILES += CSWpmconverttnef.gspec
+DISTFILES += COPYING
 
-DEPENDS += cpan/MIME-tools
+PACKAGES = CSWpmconverttnef
+CATALOGNAME = pm_converttnef
 
+ARCHALL = 1
+
+RUNTIME_DEP_PKGS += CSWpmmimetools
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Convert-TNEF/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/checksums	2010-09-01 11:41:55 UTC (rev 10868)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/checksums	2010-09-01 11:42:07 UTC (rev 10869)
@@ -1,2 +1 @@
-5af281b288816285a0fb4a5bea21cbe4  download/CSWpmconverttnef.gspec
-31cddf42fae9495b4a686b17ec68d7e0  download/Convert-TNEF-0.17.tar.gz
+31cddf42fae9495b4a686b17ec68d7e0  Convert-TNEF-0.17.tar.gz

Added: csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/COPYING	2010-09-01 11:42:07 UTC (rev 10869)
@@ -0,0 +1,3 @@
+Copyright (c) 1999 Douglas Wilson <dougw at cpan.org>. All rights reserved.
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.depend
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.depend	2010-09-01 11:41:55 UTC (rev 10868)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.depend	2010-09-01 11:42:07 UTC (rev 10869)
@@ -1 +0,0 @@
-P CSWpmmimetools pm_mimetools - Perl modules for parsing and creating MIME entities

Deleted: csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.gspec
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.gspec	2010-09-01 11:41:55 UTC (rev 10868)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/files/CSWpmconverttnef.gspec	2010-09-01 11:42:07 UTC (rev 10869)
@@ -1,8 +0,0 @@
-%var            bitname pm_converttnef
-%var            pkgname CSWpmconverttnef
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (c) 1999 Douglas Wilson <dougw at cpan.org>. All rights reserved.
-This program is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.


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

From chninkel at users.sourceforge.net  Wed Sep  1 13:42:13 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:42:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10870] csw/mgar/pkg/vsftpd/trunk
Message-ID: <E1Oqlhl-00006k-LW@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10870
          http://gar.svn.sourceforge.net/gar/?rev=10870&view=rev
Author:   chninkel
Date:     2010-09-01 11:42:13 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: rather create the ftp home directory in the prototype

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:42:13 UTC (rev 10870)
@@ -127,7 +127,7 @@
 	 ginstall -d $(DESTDIR)$(docdir)/vsftpd )
 
 
-post-merge: merge-doc-files merge-config-files merge-init-file merge-empty-directory
+post-merge: merge-doc-files merge-config-files merge-init-file merge-special-directories
 
 merge-init-file:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/opt/csw/init.d/cswvsftpd"
@@ -148,3 +148,5 @@
 
 merge-empty-directory:
 	ginstall -d "$(PKGROOT)/var/opt/csw/empty/vsftpd"
+	ginstall -d "$(PKGROOT)/var/opt/csw/ftp"
+	

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:42:13 UTC (rev 10870)
@@ -1,4 +1,4 @@
-0ea60e4bd6ed8f5bfc79457c930f84e3  CSWvsftpd.preinstall
+a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
 eeaf77528b2da0c7730323838f30b7ef  README.CSW
 281c51282cabd9475cceef363bbc699b  build_options.patch
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW

Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:42:13 UTC (rev 10870)
@@ -5,9 +5,4 @@
 	if [ -z "$FTP_HOME" ] || [ ! -d "$FTP_HOME" ]; then
 		echo "WARNING: the ftp user doesn't have a valid home directory !" 
 	fi
-else
-	# we manually create the ftp home directory if the ftp user doesn't exist
-	#  cswusergroup action class can create the directory but populates it
-	# with skeleton files and we want an empty directory
-	mkdir -p "$PKG_INSTALL_ROOT/var/opt/csw/ftp"
 fi


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

From chninkel at users.sourceforge.net  Wed Sep  1 13:45:49 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:45:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10871]
	csw/mgar/pkg/vsftpd/trunk/Makefile
Message-ID: <E1OqllF-0003ur-2G@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10871
          http://gar.svn.sourceforge.net/gar/?rev=10871&view=rev
Author:   chninkel
Date:     2010-09-01 11:45:48 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: fixed Makefile mistake

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

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:42:13 UTC (rev 10870)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:45:48 UTC (rev 10871)
@@ -146,7 +146,7 @@
 	ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW"
 
-merge-empty-directory:
+merge-special-directories:
 	ginstall -d "$(PKGROOT)/var/opt/csw/empty/vsftpd"
 	ginstall -d "$(PKGROOT)/var/opt/csw/ftp"
 	


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 Sep  1 13:56:34 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:56:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10872]
	csw/mgar/pkg/cpan/GDGraph3d/trunk
Message-ID: <E1Oqlve-0004CR-Od@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10872
          http://gar.svn.sourceforge.net/gar/?rev=10872&view=rev
Author:   dmichelsen
Date:     2010-09-01 11:56:34 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
cpan/GDGraph3d: Update to 0.63 and mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/GDGraph3d/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.depend
    csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/GDGraph3d/trunk/


Property changes on: csw/mgar/pkg/cpan/GDGraph3d/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/GDGraph3d/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GDGraph3d/trunk/Makefile	2010-09-01 11:45:48 UTC (rev 10871)
+++ csw/mgar/pkg/cpan/GDGraph3d/trunk/Makefile	2010-09-01 11:56:34 UTC (rev 10872)
@@ -1,17 +1,22 @@
-GARNAME = GDGraph3d
-GARVERSION = 0.56
+GARNAME = GD-Graph3d
+GARVERSION = 0.63
 CATEGORIES = cpan
 AUTHOR = WADG
 
-DESCRIPTION = create 3D graphs with GD and GD::Graph
+DESCRIPTION = Create 3D graphs with GD and GD::Graph
 define BLURB
   This is the GD::Graph3d extensions module. It provides 3D graphs for the
   GD::Graph module by Martien Verbruggen, which in turn generates graph using
   Lincoln Stein's GD.pm.
 endef
 
-DISTFILES += $(call admfiles,CSWpmgdgraph3d,depend)
+DISTFILES = COPYING
 
-DEPENDS += cpan/GDGraph
+PACKAGES = CSWpmgdgraph3d
+CATALOGNAME = pm_gdgraph3d
 
+DEP_PKGS = CSWpmgdgraph
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/GDGraph3d/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/GDGraph3d/trunk/checksums	2010-09-01 11:45:48 UTC (rev 10871)
+++ csw/mgar/pkg/cpan/GDGraph3d/trunk/checksums	2010-09-01 11:56:34 UTC (rev 10872)
@@ -1,3 +1 @@
-f219a0b3e87c54acd41914fc6af5710f  download/CSWpmgdgraph3d.gspec
-3d8f40609dbc51dd6d1f2a7158245bf6  download/CSWpmgdgraph3d.depend
-294dabc54c640ee62046932e7c4c6d1c  download/GDGraph3d-0.56.tar.gz
+f866dcdd1e7e2056bb946ab7ac3fe37b  GD-Graph3d-0.63.tar.gz

Copied: csw/mgar/pkg/cpan/GDGraph3d/trunk/files/COPYING (from rev 10860, csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.gspec)
===================================================================
--- csw/mgar/pkg/cpan/GDGraph3d/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/GDGraph3d/trunk/files/COPYING	2010-09-01 11:56:34 UTC (rev 10872)
@@ -0,0 +1,13 @@
+Copyright (c) 1999,2000 Wadsack-Allen. All rights reserved.
+
+Much of the original code is from GD::Graph:
+
+GIFgraph: Copyright (c) 1995-1999 Martien Verbruggen.
+
+Chart::PNGgraph: Copyright (c) 1999 Steve Bonds.
+
+GD::Graph: Copyright (c) 1999 Martien Verbruggen.
+
+This package is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+

Deleted: csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.depend
===================================================================
--- csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.depend	2010-09-01 11:45:48 UTC (rev 10871)
+++ csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.depend	2010-09-01 11:56:34 UTC (rev 10872)
@@ -1 +0,0 @@
-P CSWpmgdgraph pm_gdgraph - graph plotting module

Deleted: csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.gspec
===================================================================
--- csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.gspec	2010-09-01 11:45:48 UTC (rev 10871)
+++ csw/mgar/pkg/cpan/GDGraph3d/trunk/files/CSWpmgdgraph3d.gspec	2010-09-01 11:56:34 UTC (rev 10872)
@@ -1,18 +0,0 @@
-%var            bitname pm_gdgraph3d
-%var            pkgname CSWpmgdgraph3d
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (c) 1999,2000 Wadsack-Allen. All rights reserved.
-
-Much of the original code is from GD::Graph:
-
-GIFgraph: Copyright (c) 1995-1999 Martien Verbruggen.
-
-Chart::PNGgraph: Copyright (c) 1999 Steve Bonds.
-
-GD::Graph: Copyright (c) 1999 Martien Verbruggen.
-
-This package is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-


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

From bonivart at users.sourceforge.net  Wed Sep  1 13:57:11 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 11:57:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10873] csw/mgar/pkg/cpan
Message-ID: <E1OqlwF-0004Cx-1X@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10873
          http://gar.svn.sourceforge.net/gar/?rev=10873&view=rev
Author:   bonivart
Date:     2010-09-01 11:57:10 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
io-socket-inet6: initial commit

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


Property changes on: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile	2010-09-01 11:57:10 UTC (rev 10873)
@@ -0,0 +1,17 @@
+GARNAME = IO-Socket-INET6
+GARVERSION = 2.65
+CATEGORIES = cpan
+AUTHOR = SHLOMIF
+
+DESCRIPTION = Object interface for AF_INET|AF_INET6 domain sockets
+define BLURB
+  Object interface for AF_INET|AF_INET6 domain sockets
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmiosocketinet6
+CATALOGNAME = pm_iosocketinet6
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/checksums	2010-09-01 11:57:10 UTC (rev 10873)
@@ -0,0 +1 @@
+4ac4a245b3c31a09e01c755b16a1e3e2  IO-Socket-INET6-2.65.tar.gz

Added: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/files/COPYING	2010-09-01 11:57:10 UTC (rev 10873)
@@ -0,0 +1,17 @@
+AUTHOR and COPYRIGHT
+This program is based on IO::Socket::INET by Graham Barr <gbarr at pobox.com>
+and currently maintained by the Perl Porters.
+
+Modified by Rafael Martinez Torres <rmartine at fdi.ucm.es> and
+Euro6IX project.
+
+Further modified by Shlomi Fish <shlomif at iglu.org.il>.
+
+Copyright (c) 2003- Rafael Martinez Torres <rmartine at fdi.ucm.es>.
+Copyright (c) 2003- Euro6IX project.
+Copyright (c) 1996-8 Graham Barr <gbarr at pobox.com>.
+
+All rights reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.


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

From dmichelsen at users.sourceforge.net  Wed Sep  1 14:01:09 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 01 Sep 2010 12:01:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10874]
	csw/mgar/pkg/cpan/Geography-Countries/trunk
Message-ID: <E1Oqm05-0000eD-C3@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10874
          http://gar.svn.sourceforge.net/gar/?rev=10874&view=rev
Author:   dmichelsen
Date:     2010-09-01 12:01:09 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
cpan/Geography-Countries: Update to 2009041301 and mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Geography-Countries/trunk/Makefile
    csw/mgar/pkg/cpan/Geography-Countries/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Geography-Countries/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Geography-Countries/trunk/files/CSWpmgeocountries.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Geography-Countries/trunk/


Property changes on: csw/mgar/pkg/cpan/Geography-Countries/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Geography-Countries/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Geography-Countries/trunk/Makefile	2010-09-01 11:57:10 UTC (rev 10873)
+++ csw/mgar/pkg/cpan/Geography-Countries/trunk/Makefile	2010-09-01 12:01:09 UTC (rev 10874)
@@ -1,15 +1,20 @@
 GARNAME = Geography-Countries
-GARVERSION = 1.4
+GARVERSION = 2009041301
 CATEGORIES = cpan
 AUTHOR = ABIGAIL
 
-DESCRIPTION = 2-letter, 3-letter, and numerical codes for countries.
+DESCRIPTION = 2-letter, 3-letter, and numerical codes for countries
 define BLURB
   This module maps country names, and their 2-letter, 3-letter and numerical
   codes, as defined by the ISO-3166 maintenance agency [1], and defined by the
   UNSD.
 endef
 
-DISTFILES += CSWpmgeocountries.gspec
+DISTFILES = COPYING
 
+PACKAGES = CSWpmgeocountries
+CATALOGNAME = pm_geocountries
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Geography-Countries/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Geography-Countries/trunk/checksums	2010-09-01 11:57:10 UTC (rev 10873)
+++ csw/mgar/pkg/cpan/Geography-Countries/trunk/checksums	2010-09-01 12:01:09 UTC (rev 10874)
@@ -1,2 +1 @@
-1d36b5804ce48022ec3509322b24ae92  download/CSWpmgeocountries.gspec
-693426ab59ce3d51fcd48dfe3b402107  download/Geography-Countries-1.4.tar.gz
+2c9ef26b46bbeca9abbca5015cc748b9  Geography-Countries-2009041301.tar.gz

Copied: csw/mgar/pkg/cpan/Geography-Countries/trunk/files/COPYING (from rev 10860, csw/mgar/pkg/cpan/Geography-Countries/trunk/files/CSWpmgeocountries.gspec)
===================================================================
--- csw/mgar/pkg/cpan/Geography-Countries/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Geography-Countries/trunk/files/COPYING	2010-09-01 12:01:09 UTC (rev 10874)
@@ -0,0 +1,19 @@
+This package is copyright 1999-2003 by Abigail.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Deleted: csw/mgar/pkg/cpan/Geography-Countries/trunk/files/CSWpmgeocountries.gspec
===================================================================
--- csw/mgar/pkg/cpan/Geography-Countries/trunk/files/CSWpmgeocountries.gspec	2010-09-01 11:57:10 UTC (rev 10873)
+++ csw/mgar/pkg/cpan/Geography-Countries/trunk/files/CSWpmgeocountries.gspec	2010-09-01 12:01:09 UTC (rev 10874)
@@ -1,24 +0,0 @@
-%var            bitname pm_geocountries
-%var            pkgname CSWpmgeocountries
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-This package is copyright 1999-2003 by Abigail.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.


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

From bonivart at users.sourceforge.net  Wed Sep  1 14:23:50 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 12:23:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10875]
	csw/mgar/pkg/cpan/IO-Socket-SSL/trunk
Message-ID: <E1OqmM2-0004wy-Jg@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10875
          http://gar.svn.sourceforge.net/gar/?rev=10875&view=rev
Author:   bonivart
Date:     2010-09-01 12:23:50 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
io-socket-ssl: update to 1.33

Modified Paths:
--------------
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.depend
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/


Property changes on: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile	2010-09-01 12:01:09 UTC (rev 10874)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile	2010-09-01 12:23:50 UTC (rev 10875)
@@ -1,9 +1,9 @@
 GARNAME = IO-Socket-SSL
-GARVERSION = 0.97
+GARVERSION = 1.33
 CATEGORIES = cpan
-AUTHOR = BEHROOZI
+AUTHOR = SULLR
 
-DESCRIPTION = nearly transparent SSL encapsulation for IO::Socket::INET.
+DESCRIPTION = Nearly transparent SSL encapsulation for IO::Socket::INET.
 define BLURB
   This module is a true drop-in replacement for IO::Socket::INET that uses SSL
   to encrypt data before it is transferred to a remote server or client.
@@ -13,8 +13,13 @@
   extra bonus, it works perfectly with mod_perl.
 endef
 
-DISTFILES += CSWpmiosocketssl.gspec CSWpmiosocketssl.depend
+DISTFILES += COPYING
 
-DEPENDS += cpan/Net-SSLeay
+PACKAGES = CSWpmiosocketssl
+CATALOGNAME = pm_iosocketssl
 
+ARCHALL = 1
+
+RUNTIME_DEP_PKGS += CSWpmnetssleay
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums	2010-09-01 12:01:09 UTC (rev 10874)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/checksums	2010-09-01 12:23:50 UTC (rev 10875)
@@ -1,3 +1 @@
-3de3891a1bb627a570b1ff7ba09b0c85  download/CSWpmiosocketssl.gspec
-ceea11422f8d3ecaa194755619318d3f  download/CSWpmiosocketssl.depend
-34562e9475de132faa0f14ca2be053a5  download/IO-Socket-SSL-0.97.tar.gz
+e288b5cda3de1f4cbf15e2eb709e9d7c  IO-Socket-SSL-1.33.tar.gz

Added: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/COPYING	2010-09-01 12:23:50 UTC (rev 10875)
@@ -0,0 +1,6 @@
+COPYRIGHT 
+
+Working support for non-blocking was added by Steffen Ullrich.
+The rewrite of this module is Copyright (C) 2002-2005 Peter Behroozi.
+The original versions of this module are Copyright (C) 1999-2002 Marko Asplund.
+This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.depend
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.depend	2010-09-01 12:01:09 UTC (rev 10874)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.depend	2010-09-01 12:23:50 UTC (rev 10875)
@@ -1 +0,0 @@
-P CSWpmnetssleay pm_netssleay - extension for using OpenSSL

Deleted: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.gspec
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.gspec	2010-09-01 12:01:09 UTC (rev 10874)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/files/CSWpmiosocketssl.gspec	2010-09-01 12:23:50 UTC (rev 10875)
@@ -1,11 +0,0 @@
-%var            bitname pm_iosocketssl
-%var            pkgname CSWpmiosocketssl
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-The rewrite of this module is Copyright (C) 2002-2004 Peter Behroozi.
-
-The original versions of this module are Copyright (C) 1999-2002 Marko Asplund.
-
-This module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.


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

From chninkel at users.sourceforge.net  Wed Sep  1 14:50:40 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 12:50:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10876] csw/mgar/pkg/rlwrap/trunk
Message-ID: <E1Oqmm0-0005h3-D7@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10876
          http://gar.svn.sourceforge.net/gar/?rev=10876&view=rev
Author:   chninkel
Date:     2010-09-01 12:50:40 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
rlwrap: updated checksum and changelog

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

Modified: csw/mgar/pkg/rlwrap/trunk/checksums
===================================================================
--- csw/mgar/pkg/rlwrap/trunk/checksums	2010-09-01 12:23:50 UTC (rev 10875)
+++ csw/mgar/pkg/rlwrap/trunk/checksums	2010-09-01 12:50:40 UTC (rev 10876)
@@ -1,2 +1 @@
-bc563e56246a8fdd9e1d6821fb327134  changelog.CSW
 04cd6e2c257eb5a86b297f2ebf91dbbf  rlwrap-0.37.tar.gz

Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW	2010-09-01 12:23:50 UTC (rev 10875)
+++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW	2010-09-01 12:50:40 UTC (rev 10876)
@@ -1,8 +1,8 @@
-rlwrap (0.37,REV=2010.06.25) unstable
+rlwrap (0.37,REV=2010.09.01) unstable
 
   * New upstream release.
 
- -- Yann Rouillard <yann at opencsw.org>  Fri, 25 Jun 2010 22:16:02 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 14:49:59 +0200
 
 rlwrap (0.36,REV=2010.02.28) unstable
 


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

From bonivart at users.sourceforge.net  Wed Sep  1 14:54:26 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 12:54:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10877]
	csw/mgar/pkg/cpan/IP-Country/trunk
Message-ID: <E1Oqmpe-000252-4N@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10877
          http://gar.svn.sourceforge.net/gar/?rev=10877&view=rev
Author:   bonivart
Date:     2010-09-01 12:54:25 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
ip-country: update to 2.27

Modified Paths:
--------------
    csw/mgar/pkg/cpan/IP-Country/trunk/Makefile
    csw/mgar/pkg/cpan/IP-Country/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/IP-Country/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.depend
    csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/IP-Country/trunk/


Property changes on: csw/mgar/pkg/cpan/IP-Country/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/IP-Country/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/Makefile	2010-09-01 12:50:40 UTC (rev 10876)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/Makefile	2010-09-01 12:54:25 UTC (rev 10877)
@@ -1,9 +1,9 @@
 GARNAME = IP-Country
-GARVERSION = 2.23
+GARVERSION = 2.27
 CATEGORIES = cpan
 AUTHOR = NWETTERS
 
-DESCRIPTION = fast lookup of country codes from IP addresses
+DESCRIPTION = Fast lookup of country codes from IP addresses
 define BLURB
   Finding the home country of a client using only the IP address can be
   difficult. Looking up the domain name associated with that address can
@@ -12,8 +12,12 @@
   country.
 endef
 
-DISTFILES += CSWpmipcountry.gspec CSWpmipcountry.depend
+DISTFILES += COPYING
 
-DEPENDS += cpan/Geography-Countries
+PACKAGES = CSWpmipcountry
+CATALOGNAME = pm_ipcountry
+ARCHALL = 1
 
+RUNTIME_DEP_PKGS += CSWpmgeocountries
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/IP-Country/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/checksums	2010-09-01 12:50:40 UTC (rev 10876)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/checksums	2010-09-01 12:54:25 UTC (rev 10877)
@@ -1,3 +1 @@
-c616aa972af22976a85829a44e49a937  download/CSWpmipcountry.gspec
-4bf88a199daa14847e9c3e7d6763210d  download/CSWpmipcountry.depend
-0665e7b9cbab77fd18e255a779a856e0  download/IP-Country-2.23.tar.gz
+32932280ee4729145e85e08dad5ab8c6  IP-Country-2.27.tar.gz

Added: csw/mgar/pkg/cpan/IP-Country/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/files/COPYING	2010-09-01 12:54:25 UTC (rev 10877)
@@ -0,0 +1,9 @@
+Copyright (C) 2002-2005 Nigel Wetters Gourlay. All Rights Reserved.
+
+NO WARRANTY. This module is free software; you can redistribute 
+it and/or modify it under the same terms as Perl itself.
+
+Some parts of this software distribution are derived from the APNIC,
+LACNIC, ARIN, AFRINIC and RIPE databases (copyright details below).
+I am not a lawyer, so please direct questions about the RIR's 
+licenses to them, not me.

Deleted: csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.depend
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.depend	2010-09-01 12:50:40 UTC (rev 10876)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.depend	2010-09-01 12:54:25 UTC (rev 10877)
@@ -1 +0,0 @@
-P CSWpmgeocountries pm_geocountries - 2-letter, 3-letter, and numerical codes for countries.

Deleted: csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.gspec
===================================================================
--- csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.gspec	2010-09-01 12:50:40 UTC (rev 10876)
+++ csw/mgar/pkg/cpan/IP-Country/trunk/files/CSWpmipcountry.gspec	2010-09-01 12:54:25 UTC (rev 10877)
@@ -1,59 +0,0 @@
-%var            bitname pm_ipcountry
-%var            pkgname CSWpmipcountry
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (C) 2002,2003 Nigel Wetters Gourlay. All Rights Reserved.
-
-NO WARRANTY. This module is free software; you can redistribute 
-it and/or modify it under the same terms as Perl itself.
-
-Some parts of this software distribution are derived from the APNIC,
-LACNIC, ARIN and RIPE databases (copyright details below). The author of
-this module makes no claims of ownership on those parts.
-
-APNIC conditions of use
-
-The files are freely available for download and use on the condition 
-that APNIC will not be held responsible for any loss or damage 
-arising from the application of the information contained in these 
-reports.
-
-APNIC endeavours to the best of its ability to ensure the accuracy 
-of these reports; however, APNIC makes no guarantee in this regard.
-
-In particular, it should be noted that these reports seek to 
-indicate the country where resources were first allocated or 
-assigned. It is not intended that these reports be considered 
-as an authoritative statement of the location in which any specific 
-resource may currently be in use.
-
-ARIN database copyright
-
-Copyright (c) American Registry for Internet Numbers. All rights reserved.                         
-                                                                                                   
-The ARIN WHOIS data is for Internet operational or technical research                              
-purposes pertaining to Internet operations only.  It may not be used for                           
-advertising, direct marketing, marketing research, or similar purposes.                            
-Use of the ARIN WHOIS data for these activities is explicitly forbidden.                           
-ARIN requests to be notified of any such activities or suspicions thereof.                         
-                                                                                                   
-RIPE database copyright                                                                     
-                                                                                                   
-The information in the RIPE Database is available to the public                                    
-for agreed Internet operation purposes, but is under copyright.                                    
-The copyright statement is:                                                                        
-                                                                                                   
-"Except for agreed Internet operational purposes, no part of this                                  
-publication may be reproduced, stored in a retrieval system, or transmitted,                       
-in any form or by any means, electronic, mechanical, recording, or                                 
-otherwise, without prior permission of the RIPE NCC on behalf of the                               
-copyright holders. Any use of this material to target advertising                                  
-or similar activities is explicitly forbidden and may be prosecuted.                               
-The RIPE NCC requests to be notified of any such activities or                                     
-suspicions thereof."                                                                               
-                                                                                                   
-LACNIC database copyright                                                                   
-                                                                                                   
-Copyright (c) Latin American and Caribbean IP address Regional Registry.                           
-All rights reserved.


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

From bonivart at users.sourceforge.net  Wed Sep  1 15:08:03 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 13:08:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10878]
	csw/mgar/pkg/cpan/Pod-Escapes/trunk
Message-ID: <E1Oqn2p-000698-GC@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10878
          http://gar.svn.sourceforge.net/gar/?rev=10878&view=rev
Author:   bonivart
Date:     2010-09-01 13:08:03 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
pod-escapes: some fixes

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.depend
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.gspec
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.prototype

Property Changed:
----------------
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/


Property changes on: csw/mgar/pkg/cpan/Pod-Escapes/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Pod-Escapes/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Pod-Escapes/trunk/Makefile	2010-09-01 12:54:25 UTC (rev 10877)
+++ csw/mgar/pkg/cpan/Pod-Escapes/trunk/Makefile	2010-09-01 13:08:03 UTC (rev 10878)
@@ -3,13 +3,17 @@
 CATEGORIES = cpan
 AUTHOR = SBURKE
 
-DESCRIPTION = for resolving Pod E sequences
+DESCRIPTION = For resolving Pod E sequences
 define BLURB
   This module provides things that are useful in decoding Pod E<...>
   sequences.  Presumably, it should be used only by Pod parsers and/or
   formatters.
 endef
 
-DISTFILES = $(call admfiles,CSWpmpodescapes,depend prototype)
+DISTFILES += COPYING
 
+PACKAGES = CSWpmpodescapes
+CATALOGNAME = pm_podescapes
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Pod-Escapes/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Pod-Escapes/trunk/checksums	2010-09-01 12:54:25 UTC (rev 10877)
+++ csw/mgar/pkg/cpan/Pod-Escapes/trunk/checksums	2010-09-01 13:08:03 UTC (rev 10878)
@@ -1,4 +1 @@
-d42a7f121b5142c07592fdf0236f025b  download/CSWpmpodescapes.gspec
-6e0d583c86d7f74b43769810714242aa  download/CSWpmpodescapes.depend
-c8c03ae7c78ff20368e120631b24f39c  download/CSWpmpodescapes.prototype
-00ea2e0d2e84ed98517a4616708b68d3  download/Pod-Escapes-1.04.tar.gz
+00ea2e0d2e84ed98517a4616708b68d3  Pod-Escapes-1.04.tar.gz

Added: csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/COPYING	2010-09-01 13:08:03 UTC (rev 10878)
@@ -0,0 +1,17 @@
+Copyright (c) 2001-2004 Sean M. Burke.  All rights reserved.
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+This program is distributed in the hope that it will be useful, but
+without any warranty; without even the implied warranty of
+merchantability or fitness for a particular purpose.
+
+Portions of the data tables in this module are derived from the
+entity declarations in the W3C XHTML specification.
+
+Currently (October 2001), that's these three:
+
+ http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent
+ http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
+ http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent

Deleted: csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.depend
===================================================================
Deleted: csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.gspec
===================================================================
--- csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.gspec	2010-09-01 12:54:25 UTC (rev 10877)
+++ csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.gspec	2010-09-01 13:08:03 UTC (rev 10878)
@@ -1,22 +0,0 @@
-%var            bitname pm_podescapes
-%var            pkgname CSWpmpodescapes
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (c) 2001-2004 Sean M. Burke.  All rights reserved.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.
-
-Portions of the data tables in this module are derived from the
-entity declarations in the W3C XHTML specification.
-
-Currently (October 2001), that's these three:
-
- http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent
- http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
- http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent

Deleted: csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.prototype
===================================================================
--- csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.prototype	2010-09-01 12:54:25 UTC (rev 10877)
+++ csw/mgar/pkg/cpan/Pod-Escapes/trunk/files/CSWpmpodescapes.prototype	2010-09-01 13:08:03 UTC (rev 10878)
@@ -1,15 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/Pod 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/Pod/Escapes 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/Pod/Escapes/.packlist 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/Pod::Escapes.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/Pod 0755 root bin
-f none /opt/csw/share/perl/csw/Pod/Escapes.pm 0444 root bin


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

From bonivart at users.sourceforge.net  Wed Sep  1 15:17:38 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 13:17:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10879]
	csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk
Message-ID: <E1OqnC6-0002kg-9N@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10879
          http://gar.svn.sourceforge.net/gar/?rev=10879&view=rev
Author:   bonivart
Date:     2010-09-01 13:17:38 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
sys-hostname-long: some fixes

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/Makefile
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/CSWpmsyshostnamelong.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/


Property changes on: csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/Makefile	2010-09-01 13:08:03 UTC (rev 10878)
+++ csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/Makefile	2010-09-01 13:17:38 UTC (rev 10879)
@@ -3,7 +3,7 @@
 CATEGORIES = cpan
 AUTHOR = SCOTT
 
-DESCRIPTION = try every conceivable way to get full hostname
+DESCRIPTION = Try every conceivable way to get full hostname
 define BLURB
   This is the SECOND release of this code. It has an improved set of tests and
   improved interfaces - but it is still often failing to get a full host name.
@@ -12,6 +12,10 @@
   dependent on the order of the entries in /etc/hosts.
 endef
 
-DISTFILES += CSWpmsyshostnamelong.gspec
+DISTFILES += COPYING
 
+PACKAGES = CSWpmsyshostnamelong
+CATALOGNAME = pm_syshostnamelong
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/checksums	2010-09-01 13:08:03 UTC (rev 10878)
+++ csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/checksums	2010-09-01 13:17:38 UTC (rev 10879)
@@ -1,2 +1 @@
-5b7070171e8c18cb7f3c9962e307d283  download/CSWpmsyshostnamelong.gspec
-a5b3c23754cbcff10e283d16c42ec3d3  download/Sys-Hostname-Long-1.4.tar.gz
+a5b3c23754cbcff10e283d16c42ec3d3  Sys-Hostname-Long-1.4.tar.gz

Added: csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/COPYING	2010-09-01 13:17:38 UTC (rev 10879)
@@ -0,0 +1,2 @@
+Copyright (C) 2001 Scott Penrose <scottp at dd.com.au>
+http://linux.dd.com.au/

Deleted: csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/CSWpmsyshostnamelong.gspec
===================================================================
--- csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/CSWpmsyshostnamelong.gspec	2010-09-01 13:08:03 UTC (rev 10878)
+++ csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/files/CSWpmsyshostnamelong.gspec	2010-09-01 13:17:38 UTC (rev 10879)
@@ -1,7 +0,0 @@
-%var            bitname pm_syshostnamelong
-%var            pkgname CSWpmsyshostnamelong
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright (C) 2001 Scott Penrose <scottp at dd.com.au>
-http://linux.dd.com.au/


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

From chninkel at users.sourceforge.net  Wed Sep  1 15:23:50 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 13:23:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10880] csw/mgar/pkg/bash/trunk
Message-ID: <E1OqnI6-0002ut-S2@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10880
          http://gar.svn.sourceforge.net/gar/?rev=10880&view=rev
Author:   chninkel
Date:     2010-09-01 13:23:50 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
bash: updated checksum and changelog

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

Modified: csw/mgar/pkg/bash/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash/trunk/checksums	2010-09-01 13:17:38 UTC (rev 10879)
+++ csw/mgar/pkg/bash/trunk/checksums	2010-09-01 13:23:50 UTC (rev 10880)
@@ -6,6 +6,3 @@
 9471e666797f0b03eb2175ed752a9550  bash41-005
 fb80ccd58cb1e34940f3adf4ce6e4a1e  bash41-006
 192a8b161d419a1d0d211169f1d1046e  bash41-007
-3773cd83b6ae2f546832681b384b6138  changelog.CSW
-60956e6be20f69dafbb06fcc83bab88e  shells
-29607316cff22f7427322d8f190cbadf  use_system_bashrc_and_logout.patch

Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash/trunk/files/changelog.CSW	2010-09-01 13:17:38 UTC (rev 10879)
+++ csw/mgar/pkg/bash/trunk/files/changelog.CSW	2010-09-01 13:23:50 UTC (rev 10880)
@@ -1,8 +1,8 @@
-bash (4.1.07,REV=2010.06.25) unstable
+bash (4.1.07,REV=2010.09.01) unstable
 
   * Added bash patches bash41-006 and bash41-007.
 
- -- Yann Rouillard <yann at opencsw.org>  Fri, 25 Jun 2010 22:30:45 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 15:23:10 +0200
 
 bash (4.1.04,REV=2010.03.27) unstable
 


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

From chninkel at users.sourceforge.net  Wed Sep  1 16:08:41 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 14:08:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10881] csw/mgar/pkg/openssl/trunk
Message-ID: <E1OqnzV-00053U-19@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10881
          http://gar.svn.sourceforge.net/gar/?rev=10881&view=rev
Author:   chninkel
Date:     2010-09-01 14:08:40 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssl: some checkpkg override + changelog update

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/checksums
    csw/mgar/pkg/openssl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-01 14:08:40 UTC (rev 10881)
@@ -54,16 +54,30 @@
 
 CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates
 # we will not recompile old 0.9.7 version for now
+ifeq ($(GARCH),sparc) 
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7
+else
+CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/amd64/libcrypto.so.0.9.7
+CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/pentium_pro/libssl.so.0.9.7
+endif
 
 # we do ship .a files in the devel package
+ifeq ($(GARCH),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/libssl.a
+else
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
+endif
+
+
 CHECKPKG_OVERRIDES_CSWossldevel += surplus-dependency|CSWosslrt
 
 

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/checksums	2010-09-01 14:08:40 UTC (rev 10881)
@@ -1,13 +1 @@
-88d71b493eb56f5a1ebf67cf33c70b9a  CSWossl.prototype
-f293ba8ca08b0a5fd391dcf3c7b29539  CSWossldevel.prototype-i386
-1f491e2f0c0f26fdc0b93fcebfc77613  CSWossldevel.prototype-sparc
-05ace5330714d6cd9c0e076b6ae2518f  CSWosslrt.checkinstall
-1c3f600eaf942a18ecab3637e1fc32bd  CSWosslrt.postinstall
-c9de908daad1a31fca20329cb043ad3c  CSWosslrt.preinstall
-7535e5b5b281adb5c13bf9ad878b5cf1  CSWosslrt.prototype-i386
-0fcaed441f7527bdeda410a70bb60f6f  CSWosslrt.prototype-sparc
-07b1ad34d1f742052460e4655eccb41f  CSWosslutils.prototype
-b78faa440d6f6a2a07663de331678648  README.CSW
-f0d5119652618d956eb24490b7577eb9  changelog.CSW
-84830e15846f1b20d8371c1fa375a0b1  more_configure_targets.patch
 63ddc5116488985e820075e65fbe6aa4  openssl-0.9.8o.tar.gz

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2010-09-01 14:08:40 UTC (rev 10881)
@@ -1,3 +1,9 @@
+openssl (0.9.8o,REV=2010.09.01) unstable
+
+  * New upstream version.
+
+   -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 16:07:54 +0200
+
 openssl (0.9.8n,REV=2010.03.24) unstable
 
   * New upstream version.


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

From bonivart at users.sourceforge.net  Wed Sep  1 16:23:33 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 01 Sep 2010 14:23:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10882] csw/mgar/pkg/cpan/Test-Pod/trunk
Message-ID: <E1OqoDt-0005UR-Ub@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10882
          http://gar.svn.sourceforge.net/gar/?rev=10882&view=rev
Author:   bonivart
Date:     2010-09-01 14:23:33 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
test-pod: update to 1.44

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Pod/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Test-Pod/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.depend
    csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Test-Pod/trunk/


Property changes on: csw/mgar/pkg/cpan/Test-Pod/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile	2010-09-01 14:08:40 UTC (rev 10881)
+++ csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile	2010-09-01 14:23:33 UTC (rev 10882)
@@ -1,7 +1,7 @@
 GARNAME = Test-Pod
-GARVERSION = 1.41
+GARVERSION = 1.44
 CATEGORIES = cpan
-AUTHOR = PETDANCE
+AUTHOR = DWHEELER
 
 DESCRIPTION = Check for POD errors in files
 define BLURB
@@ -9,11 +9,12 @@
   do the heavy lifting.
 endef
 
+DISTFILES += COPYING
+
 PACKAGES = CSWpmtestpod
 CATALOGNAME = pm_testpod
 
-REQUIRED_PKGS = CSWpmiostringy CSWpmpodsimple
-PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpmtestsimple
+RUNTIME_DEP_PKGS += CSWpmpodsimple
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/cpan/Test-Pod/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Test-Pod/trunk/checksums	2010-09-01 14:08:40 UTC (rev 10881)
+++ csw/mgar/pkg/cpan/Test-Pod/trunk/checksums	2010-09-01 14:23:33 UTC (rev 10882)
@@ -1,3 +1 @@
-e422478754ba2207280b326d6d0f2f61  download/CSWpmtestpod.gspec
-d5f47fb2e28a2f88562ba25f639975ca  download/CSWpmtestpod.depend
-2f259135656ac4549b65a4f14f07b7c6  download/Test-Pod-1.26.tar.gz
+02380af5539521524d5df17273a57ae7  Test-Pod-1.44.tar.gz

Added: csw/mgar/pkg/cpan/Test-Pod/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Test-Pod/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Test-Pod/trunk/files/COPYING	2010-09-01 14:23:33 UTC (rev 10882)
@@ -0,0 +1,4 @@
+Copyright 2006-2010, Andy Lester. Some Rights Reserved.
+
+You may use, modify, and distribute this package under the terms as the
+Artistic License v2.0 or GNU Public License v2.0.

Deleted: csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.depend
===================================================================
--- csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.depend	2010-09-01 14:08:40 UTC (rev 10881)
+++ csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.depend	2010-09-01 14:23:33 UTC (rev 10882)
@@ -1,2 +0,0 @@
-P CSWpmiostringy pm_iostringy - I/O on in-core objects like strings and arrays
-P CSWpmpodsimple pm_podsimple - framework for parsing Pod

Deleted: csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.gspec
===================================================================
--- csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.gspec	2010-09-01 14:08:40 UTC (rev 10881)
+++ csw/mgar/pkg/cpan/Test-Pod/trunk/files/CSWpmtestpod.gspec	2010-09-01 14:23:33 UTC (rev 10882)
@@ -1,9 +0,0 @@
-%var            bitname pm_testpod
-%var            pkgname CSWpmtestpod
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright 2004, Andy Lester, All Rights Reserved.
-
-You may use, modify, and distribute this package under the
-same terms as Perl itself.


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

From chninkel at users.sourceforge.net  Wed Sep  1 23:02:03 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 21:02:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10883] csw/mgar/pkg/openssl1/trunk
Message-ID: <E1OquRX-0007QM-S7@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10883
          http://gar.svn.sourceforge.net/gar/?rev=10883&view=rev
Author:   chninkel
Date:     2010-09-01 21:02:03 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssl1: updated to 1.0.0a + several GAR fix

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

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2010-09-01 14:23:33 UTC (rev 10882)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2010-09-01 21:02:03 UTC (rev 10883)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = openssl
-GARVERSION = 1.0.0
+GARVERSION = 1.0.0a
 CATEGORIES = lib
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS
@@ -48,12 +48,29 @@
 PKGFILES_CSWossl1utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.*
 PKGFILES_CSWossl1utils += $(docdir)/openssl1_utils/.*
 
-PROTOTYPE_MODIFIERS = conf
-PROTOTYPE_FILES_conf = $(sysconfdir)/ssl/openssl.cnf.CSW
-PROTOTYPE_CLASS_conf = cswpreserveconf
-PROTOTYPE_PERMS_conf = 0644
 
+PRESERVECONF = $(sysconfdir)/ssl/openssl.cnf
 
+# We use SUN perl, not the opencsw one
+CHECKPKG_OVERRIDES_CSWossl1utils += missing-dependency|CSWperl
+
+CHECKPKG_OVERRIDES_CSWossl1rt += surplus-dependency|CSWcacertificates
+
+# We ship the .a files in the devel package
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
+ifeq ($(GARCH),sparc)
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
+else
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a
+endif
+CHECKPKG_OVERRIDES_CSWossl1devel += surplus-dependency|CSWossl1rt
+
+
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
@@ -71,7 +88,13 @@
 # solaris-pentium_pro-cc and solaris-sparcv9+vis-cc
 PATCHFILES = more_configure_targets.patch
 
+# Since 1.0.0, openssl tries to install x64 libraries in $(prefix)/64 directory
+# we prefer to rely on gar system to take of this so we remove this using this
+# patch
+PATCHFILES += dont_use_slash_64_directory.patch
 
+LICENSE = LICENSE
+
 ##### Build and installation information #####
 
 # The list of instructions set for which we will 
@@ -122,7 +145,7 @@
 include gar/category.mk
 
 
-pre-configure-modulated: 
+pre-configure-modulated:
 	echo " ==> Creating configure script"
 	cd $(WORKSRC) && ln -nf Configure configure
 	@$(MAKECOOKIE)
@@ -158,4 +181,4 @@
 	rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private 
 	@$(MAKECOOKIE)
 
-post-merge: install-certs install-changelog install-doc
+pre-package: install-certs install-changelog install-doc

Modified: csw/mgar/pkg/openssl1/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl1/trunk/checksums	2010-09-01 14:23:33 UTC (rev 10882)
+++ csw/mgar/pkg/openssl1/trunk/checksums	2010-09-01 21:02:03 UTC (rev 10883)
@@ -1,7 +1 @@
-05ace5330714d6cd9c0e076b6ae2518f  CSWossl1rt.checkinstall
-1c3f600eaf942a18ecab3637e1fc32bd  CSWossl1rt.postinstall
-c9de908daad1a31fca20329cb043ad3c  CSWossl1rt.preinstall
-b78faa440d6f6a2a07663de331678648  README.CSW
-904ceefa66b6b7b7e93ae0e9bc58bac8  changelog.CSW
-a8f10e3b109567d6caedf5113411ff4b  more_configure_targets.patch
-89eaa86e25b2845f920ec00ae4c864ed  openssl-1.0.0.tar.gz
+e3873edfffc783624cfbdb65e2249cbd  openssl-1.0.0a.tar.gz

Added: csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch	2010-09-01 21:02:03 UTC (rev 10883)
@@ -0,0 +1,25 @@
+From edf25f4c871ccd0951105e6d575b9d845915d22f Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Wed, 1 Sep 2010 15:40:32 +0200
+Subject: [PATCH] Don't use /64 directory when installing libraries
+
+---
+ Configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Configure b/Configure
+index d59f117..7f38214 100755
+--- a/Configure
++++ b/Configure
+@@ -219,7 +219,7 @@ my %table=(
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-pentium_pro-cc","cc:-fast -xarch=pentium_pro -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
++"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### SPARC Solaris with GNU C setups
+ "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-- 
+1.7.1
+


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

From chninkel at users.sourceforge.net  Wed Sep  1 23:26:09 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 21:26:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10884] csw/mgar/pkg/openssh/trunk
Message-ID: <E1Oquoq-0008Bg-W2@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10884
          http://gar.svn.sourceforge.net/gar/?rev=10884&view=rev
Author:   chninkel
Date:     2010-09-01 21:26:08 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssh: updated to 5.6p1

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/checksums
    csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch

Removed Paths:
-------------
    csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch
    csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch
    csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 21:26:08 UTC (rev 10884)
@@ -13,9 +13,9 @@
 ###### Package information #######
 
 GARNAME = openssh
-GARVERSION = 5.4p1
+GARVERSION = 5.6p1
 GSSKEX_PATCH_VERSION = $(GARVERSION)
-GSSKEX_PATCH_DATE = 20100313
+GSSKEX_PATCH_DATE = 20100901
 CATEGORIES = server
 
 DESCRIPTION = OpenSSH Secure Shell
@@ -45,6 +45,9 @@
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
+# The openssh package installs the server and the client
+CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
+
 ###### Upstream and OpenCSW files information #######
 
 MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/
@@ -73,14 +76,6 @@
 # see https://bugzilla.mindrot.org/show_bug.cgi?id=1457
 PATCHFILES += no_x_forwarding_bug.patch
 
-# Fix an incorrect usage of getcwd under Solaris
-# see https://bugzilla.mindrot.org/show_bug.cgi?id=1739
-PATCHFILES += derelativise_path_bugfix.patch
-
-# AuthorizedKeysFile option value should not be derelativized !!
-# see https://bugzilla.mindrot.org/show_bug.cgi?id=1739
-PATCHFILES += dont_derelativise_authorizedkeysfile_option.patch
-
 # documentation files to install (not a gar variable)
 DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns 
 DOCFILES += README.platform README.privsep README.smartcard README.tun TODO WARNING.RNG    
@@ -131,8 +126,14 @@
 	cd $(WORKSRC) && autoconf
 	@$(MAKECOOKIE)
 
+# kr5config returns the -R/opt/csw/lib/ which is considered not valid by checkpkg
+# manually fixing this until the bug is fixed (see https://www.opencsw.org/mantis/view.php?id=4384 )
+post-configure-modulated:
+	cd $(WORKSRC) && perl -pi -e 's,-R/opt/csw/lib/ ,-R/opt/csw/lib ,' Makefile
+	@$(MAKECOOKIE)
+
 # adding documentation files
-post-merge: merge-config-files merge-doc-files merge-init-files merge-contrib-files
+pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files
 
 merge-contrib-files:
 	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"

Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/checksums	2010-09-01 21:26:08 UTC (rev 10884)
@@ -1,18 +1 @@
-1d3d6d477c09e59c514e637fa3a2f7a4  CSWossh.checkinstall
-0993813fa5c752215f892cb67c86816f  CSWossh.preinstall
-e00106f28a2aef529e097aa182906273  CSWossh.prototype
-39259b734dc10d2b7eb82d2331254d4c  CSWosshclient.prototype
-1d3d6d477c09e59c514e637fa3a2f7a4  CSWosshlpk.checkinstall
-0993813fa5c752215f892cb67c86816f  CSWosshlpk.preinstall
-77b86c30c3257fdf014102c8166fab2d  CSWosshlpk.prototype
-3344f6f17e6d75e8e135b8366e64a7ee  changelog.CSW
-9153031524651a18e7edaed4637aa769  contrib-openssh-lpk-5.2p1-0.3.9.patch
-a5ebb2e3fdaa06c3c9edba55aac5f83b  cswopenssh
-8e765642349b6321d01b33e95304e113  cswopenssh.xml
-704ad1d3216df8de4d44465006c64c39  derelativise_path_bugfix.patch
-4b3e79120b60e8f25be5141eba53cac5  don_t_use_TIOCSCTTY.patch
-72c46751eba8f77b53b1ee7cb801bfd7  dont_derelativise_authorizedkeysfile_option.patch
-ca5403c8e1539d5ced0573f289ed7aef  no_x_forwarding_bug.patch
-10e0b84c84ad0dc9c490480aab36be01  openssh-5.4p1-gsskex-all-20100313.patch
-da10af8a789fa2e83e3635f3a1b76f5e  openssh-5.4p1.tar.gz
-db57ce80e8944213443caa4c52c884e5  sshd.smf_wrapper
+e6ee52e47c768bf0ec42a232b5d18fb0  openssh-5.6p1.tar.gz

Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype	2010-09-01 21:26:08 UTC (rev 10884)
@@ -29,3 +29,4 @@
 d none /opt/csw/share/openssh 0755 root bin
 d none /var/empty
 f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys
+i checkpkg_override=checkpkg_override.CSWossh

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-01 21:26:08 UTC (rev 10884)
@@ -1,3 +1,11 @@
+openssh (5.6p1,REV=2010.09.01) unstable
+
+  * New upstream release.
+  * Removed patch applied upstream (derelativise_path_bugfix.patch 
+  and dont_derelativise_authorizedkeysfile_option.patch).
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 23:25:24 +0200
+
 openssh (5.4p1,REV=2010.03.25) unstable
 
   * Added derelativise_path_bugfix.patch patch to solve a bug in the

Deleted: csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch	2010-09-01 21:26:08 UTC (rev 10884)
@@ -1,11 +0,0 @@
---- openssh-5.4p1/servconf.c.orig	Wed Mar 24 21:56:53 2010
-+++ openssh-5.4p1/servconf.c	Wed Mar 24 21:56:29 2010
-@@ -492,7 +492,7 @@
- 	expanded = tilde_expand_filename(path, getuid());
- 	if (*expanded == '/')
- 		return expanded;
--	if ((cwd = getcwd(NULL, 0)) == NULL)
-+	if ((cwd = getcwd(NULL, PATH_MAX)) == NULL)
- 		fatal("%s: getcwd: %s", __func__, strerror(errno));
- 	xasprintf(&ret, "%s/%s", cwd, expanded);
- 	xfree(cwd);

Deleted: csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch	2010-09-01 21:26:08 UTC (rev 10884)
@@ -1,22 +0,0 @@
---- openssh-5.4p1/servconf.c.orig	2010-03-25 19:10:47.783942371 +0100
-+++ openssh-5.4p1/servconf.c	2010-03-25 19:10:52.526955504 +0100
-@@ -1223,7 +1252,18 @@
- 		charptr = (opcode == sAuthorizedKeysFile) ?
- 		    &options->authorized_keys_file :
- 		    &options->authorized_keys_file2;
--		goto parse_filename;
-+
-+		arg = strdelim(&cp);
-+		if (!arg || *arg == '\0')
-+			fatal("%s line %d: missing file name.",
-+			    filename, linenum);
-+		if (*activep && *charptr == NULL) {
-+			*charptr = xstrdup(arg);
-+			/* increase optional counter */
-+			if (intptr != NULL)
-+				*intptr = *intptr + 1;
-+		}
-+		break;
- 
- 	case sClientAliveInterval:
- 		intptr = &options->client_alive_interval;

Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch	2010-09-01 21:02:03 UTC (rev 10883)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch	2010-09-01 21:26:08 UTC (rev 10884)
@@ -1,2933 +0,0 @@
-diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi
---- openssh-5.4p1.orig/ChangeLog.gssapi	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.4p1/ChangeLog.gssapi	2010-03-13 00:39:22.276624764 +0100
-@@ -0,0 +1,95 @@
-+20090615
-+  - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
-+      sshd.c ]
-+    Fix issues identified by Greg Hudson following a code review
-+	Check return value of gss_indicate_mechs
-+	Protect GSSAPI calls in monitor, so they can only be used if enabled
-+	Check return values of bignum functions in key exchange
-+	Use BN_clear_free to clear other side's DH value
-+	Make ssh_gssapi_id_kex more robust
-+	Only configure kex table pointers if GSSAPI is enabled
-+	Don't leak mechanism list, or gss mechanism list
-+	Cast data.length before printing
-+	If serverkey isn't provided, use an empty string, rather than NULL
-+
-+20090201
-+  - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
-+      ssh_config.5 sshconnet2.c ]
-+    Add support for the GSSAPIClientIdentity option, which allows the user
-+    to specify which GSSAPI identity to use to contact a given server
-+
-+20080404
-+  - [ gss-serv.c ]
-+    Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
-+    been omitted from a previous version of this patch. Reported by Borislav
-+    Stoichkov
-+
-+20070317
-+  - [ gss-serv-krb5.c ]
-+    Remove C99ism, where new_ccname was being declared in the middle of a 
-+    function
-+
-+20061220
-+  - [ servconf.c ]
-+    Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and 
-+    documented, behaviour. Reported by Dan Watson.
-+
-+20060910
-+  - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
-+      ssh-gss.h ]
-+    add support for gss-group14-sha1 key exchange mechanisms
-+  - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
-+    Add GSSAPIStrictAcceptorCheck option to allow the disabling of
-+    acceptor principal checking on multi-homed machines.
-+    <Bugzilla #928>
-+  - [ sshd_config ssh_config ]
-+    Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
-+    configuration files
-+  - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
-+    Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
-+    Limit length of error messages displayed by client
-+
-+20060909
-+  - [ gss-genr.c gss-serv.c ]
-+    move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
-+    only, where they belong 
-+    <Bugzilla #1225>
-+
-+20060829
-+  - [ gss-serv-krb5.c ]
-+    Fix CCAPI credentials cache name when creating KRB5CCNAME environment 
-+    variable
-+
-+20060828
-+  - [ gss-genr.c ]
-+    Avoid Heimdal context freeing problem
-+    <Fixed upstream 20060829>
-+
-+20060818
-+  - [ gss-genr.c ssh-gss.h sshconnect2.c ]
-+    Make sure that SPENGO is disabled 
-+    <Bugzilla #1218 - Fixed upstream 20060818>
-+
-+20060421
-+  - [ gssgenr.c, sshconnect2.c ]
-+    a few type changes (signed versus unsigned, int versus size_t) to
-+    fix compiler errors/warnings 
-+    (from jbasney AT ncsa.uiuc.edu)
-+  - [ kexgssc.c, sshconnect2.c ]
-+    fix uninitialized variable warnings
-+    (from jbasney AT ncsa.uiuc.edu)
-+  - [ gssgenr.c ]
-+    pass oid to gss_display_status (helpful when using GSSAPI mechglue)
-+    (from jbasney AT ncsa.uiuc.edu)
-+    <Bugzilla #1220 >
-+  - [ gss-serv-krb5.c ]
-+    #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
-+    (from jbasney AT ncsa.uiuc.edu)
-+    <Fixed upstream 20060304>
-+  - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c 
-+    add client-side GssapiKeyExchange option
-+    (from jbasney AT ncsa.uiuc.edu)
-+  - [ sshconnect2.c ]
-+    add support for GssapiTrustDns option for gssapi-with-mic
-+    (from jbasney AT ncsa.uiuc.edu)
-+    <gssapi-with-mic support is Bugzilla #1008>
-diff -Nur openssh-5.4p1.orig/Makefile.in openssh-5.4p1/Makefile.in
---- openssh-5.4p1.orig/Makefile.in	2010-02-24 08:18:51.000000000 +0100
-+++ openssh-5.4p1/Makefile.in	2010-03-13 00:39:54.547584984 +0100
-@@ -74,7 +74,7 @@
- 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
- 	kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \
- 	entropy.o gss-genr.o umac.o jpake.o schnorr.o \
--	ssh-pkcs11.o
-+	ssh-pkcs11.o kexgssc.o
- 
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
- 	sshconnect.o sshconnect1.o sshconnect2.o mux.o \
-@@ -88,7 +88,7 @@
- 	auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
- 	monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
- 	auth-krb5.o \
--	auth2-gss.o gss-serv.o gss-serv-krb5.o \
-+	auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
- 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
- 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
- 	roaming_common.o roaming_serv.o
-diff -Nur openssh-5.4p1.orig/auth-krb5.c openssh-5.4p1/auth-krb5.c
---- openssh-5.4p1.orig/auth-krb5.c	2009-12-21 00:49:22.000000000 +0100
-+++ openssh-5.4p1/auth-krb5.c	2010-03-13 00:39:22.287877739 +0100
-@@ -170,8 +170,13 @@
- 
- 	len = strlen(authctxt->krb5_ticket_file) + 6;
- 	authctxt->krb5_ccname = xmalloc(len);
-+#ifdef USE_CCAPI
-+	snprintf(authctxt->krb5_ccname, len, "API:%s",
-+	    authctxt->krb5_ticket_file);
-+#else
- 	snprintf(authctxt->krb5_ccname, len, "FILE:%s",
- 	    authctxt->krb5_ticket_file);
-+#endif
- 
- #ifdef USE_PAM
- 	if (options.use_pam)
-@@ -226,15 +231,22 @@
- #ifndef HEIMDAL
- krb5_error_code
- ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
--	int tmpfd, ret;
-+	int ret;
- 	char ccname[40];
- 	mode_t old_umask;
-+#ifdef USE_CCAPI
-+	char cctemplate[] = "API:krb5cc_%d";
-+#else
-+	char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
-+	int tmpfd;
-+#endif
- 
- 	ret = snprintf(ccname, sizeof(ccname),
--	    "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
-+	    cctemplate, geteuid());
- 	if (ret < 0 || (size_t)ret >= sizeof(ccname))
- 		return ENOMEM;
- 
-+#ifndef USE_CCAPI
- 	old_umask = umask(0177);
- 	tmpfd = mkstemp(ccname + strlen("FILE:"));
- 	umask(old_umask);
-@@ -249,6 +261,7 @@
- 		return errno;
- 	}
- 	close(tmpfd);
-+#endif
- 
- 	return (krb5_cc_resolve(ctx, ccname, ccache));
- }
-diff -Nur openssh-5.4p1.orig/auth.h openssh-5.4p1/auth.h
---- openssh-5.4p1.orig/auth.h	2010-03-04 11:53:35.000000000 +0100
-+++ openssh-5.4p1/auth.h	2010-03-13 00:39:22.290248539 +0100
-@@ -53,6 +53,7 @@
- 	int		 valid;		/* user exists and is allowed to login */
- 	int		 attempt;
- 	int		 failures;
-+	int		 server_caused_failure; 
- 	int		 force_pwchange;
- 	char		*user;		/* username sent by the client */
- 	char		*service;
-diff -Nur openssh-5.4p1.orig/auth2-gss.c openssh-5.4p1/auth2-gss.c
---- openssh-5.4p1.orig/auth2-gss.c	2007-12-02 12:59:45.000000000 +0100
-+++ openssh-5.4p1/auth2-gss.c	2010-03-13 00:39:22.294875029 +0100
-@@ -1,7 +1,7 @@
- /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */
- 
- /*
-- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -52,6 +52,40 @@
- static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
- static void input_gssapi_errtok(int, u_int32_t, void *);
- 
-+/* 
-+ * The 'gssapi_keyex' userauth mechanism.
-+ */
-+static int
-+userauth_gsskeyex(Authctxt *authctxt)
-+{
-+	int authenticated = 0;
-+	Buffer b;
-+	gss_buffer_desc mic, gssbuf;
-+	u_int len;
-+
-+	mic.value = packet_get_string(&len);
-+	mic.length = len;
-+
-+	packet_check_eom();
-+
-+	ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
-+	    "gssapi-keyex");
-+
-+	gssbuf.value = buffer_ptr(&b);
-+	gssbuf.length = buffer_len(&b);
-+
-+	/* gss_kex_context is NULL with privsep, so we can't check it here */
-+	if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, 
-+	    &gssbuf, &mic))))
-+		authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
-+		    authctxt->pw));
-+	
-+	buffer_free(&b);
-+	xfree(mic.value);
-+
-+	return (authenticated);
-+}
-+
- /*
-  * We only support those mechanisms that we know about (ie ones that we know
-  * how to check local user kuserok and the like)
-@@ -102,6 +136,7 @@
- 
- 	if (!present) {
- 		xfree(doid);
-+		authctxt->server_caused_failure = 1;
- 		return (0);
- 	}
- 
-@@ -109,6 +144,7 @@
- 		if (ctxt != NULL)
- 			ssh_gssapi_delete_ctx(&ctxt);
- 		xfree(doid);
-+		authctxt->server_caused_failure = 1;
- 		return (0);
- 	}
- 
-@@ -242,7 +278,8 @@
- 
- 	packet_check_eom();
- 
--	authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
-+	authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
-+	    authctxt->pw));
- 
- 	authctxt->postponed = 0;
- 	dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
-@@ -277,7 +314,8 @@
- 	gssbuf.length = buffer_len(&b);
- 
- 	if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
--		authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
-+		authenticated = 
-+		    PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
- 	else
- 		logit("GSSAPI MIC check failed");
- 
-@@ -292,6 +330,12 @@
- 	userauth_finish(authctxt, authenticated, "gssapi-with-mic");
- }
- 
-+Authmethod method_gsskeyex = {
-+	"gssapi-keyex",
-+	userauth_gsskeyex,
-+	&options.gss_authentication
-+};
-+
- Authmethod method_gssapi = {
- 	"gssapi-with-mic",
- 	userauth_gssapi,
-diff -Nur openssh-5.4p1.orig/auth2.c openssh-5.4p1/auth2.c
---- openssh-5.4p1.orig/auth2.c	2009-06-22 08:11:07.000000000 +0200
-+++ openssh-5.4p1/auth2.c	2010-03-13 00:39:22.298679511 +0100
-@@ -69,6 +69,7 @@
- extern Authmethod method_kbdint;
- extern Authmethod method_hostbased;
- #ifdef GSSAPI
-+extern Authmethod method_gsskeyex;
- extern Authmethod method_gssapi;
- #endif
- #ifdef JPAKE
-@@ -79,6 +80,7 @@
- 	&method_none,
- 	&method_pubkey,
- #ifdef GSSAPI
-+	&method_gsskeyex,
- 	&method_gssapi,
- #endif
- #ifdef JPAKE
-@@ -274,6 +276,7 @@
- #endif
- 
- 	authctxt->postponed = 0;
-+	authctxt->server_caused_failure = 0;
- 
- 	/* try to authenticate user */
- 	m = authmethod_lookup(method);
-@@ -346,7 +349,8 @@
- 	} else {
- 
- 		/* Allow initial try of "none" auth without failure penalty */
--		if (authctxt->attempt > 1 || strcmp(method, "none") != 0)
-+		if (!authctxt->server_caused_failure &&
-+		    (authctxt->attempt > 1 || strcmp(method, "none") != 0))
- 			authctxt->failures++;
- 		if (authctxt->failures >= options.max_authtries) {
- #ifdef SSH_AUDIT_EVENTS
-diff -Nur openssh-5.4p1.orig/clientloop.c openssh-5.4p1/clientloop.c
---- openssh-5.4p1.orig/clientloop.c	2010-01-30 07:28:35.000000000 +0100
-+++ openssh-5.4p1/clientloop.c	2010-03-13 00:39:22.309033482 +0100
-@@ -111,6 +111,10 @@
- #include "msg.h"
- #include "roaming.h"
- 
-+#ifdef GSSAPI
-+#include "ssh-gss.h"
-+#endif
-+
- /* import options */
- extern Options options;
- 
-@@ -1431,6 +1435,13 @@
- 		/* Do channel operations unless rekeying in progress. */
- 		if (!rekeying) {
- 			channel_after_select(readset, writeset);
-+
-+			if (options.gss_renewal_rekey &&
-+			    ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
-+				debug("credentials updated - forcing rekey");
-+				need_rekeying = 1;
-+			}
-+
- 			if (need_rekeying || packet_need_rekeying()) {
- 				debug("need rekeying");
- 				xxx_kex->done = 0;
-diff -Nur openssh-5.4p1.orig/configure.ac openssh-5.4p1/configure.ac
---- openssh-5.4p1.orig/configure.ac	2010-03-05 05:04:35.000000000 +0100
-+++ openssh-5.4p1/configure.ac	2010-03-13 00:39:22.319807465 +0100
-@@ -477,6 +477,30 @@
- 	    [Use tunnel device compatibility to OpenBSD])
- 	AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
- 	    [Prepend the address family to IP tunnel traffic])
-+	AC_MSG_CHECKING(if we have the Security Authorization Session API)
-+	AC_TRY_COMPILE([#include <Security/AuthSession.h>],
-+		[SessionCreate(0, 0);],
-+		[ac_cv_use_security_session_api="yes"
-+		 AC_DEFINE(USE_SECURITY_SESSION_API, 1, 
-+			[platform has the Security Authorization Session API])
-+		 LIBS="$LIBS -framework Security"
-+		 AC_MSG_RESULT(yes)],
-+		[ac_cv_use_security_session_api="no"
-+		 AC_MSG_RESULT(no)])
-+	AC_MSG_CHECKING(if we have an in-memory credentials cache)
-+	AC_TRY_COMPILE(
-+		[#include <Kerberos/Kerberos.h>],
-+		[cc_context_t c;
-+		 (void) cc_initialize (&c, 0, NULL, NULL);],
-+		[AC_DEFINE(USE_CCAPI, 1, 
-+			[platform uses an in-memory credentials cache])
-+		 LIBS="$LIBS -framework Security"
-+		 AC_MSG_RESULT(yes)
-+		 if test "x$ac_cv_use_security_session_api" = "xno"; then
-+			AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***)
-+		fi],
-+		[AC_MSG_RESULT(no)]
-+	)
- 	m4_pattern_allow(AU_IPv)
- 	AC_CHECK_DECL(AU_IPv4, [], 
- 	    AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
-diff -Nur openssh-5.4p1.orig/gss-genr.c openssh-5.4p1/gss-genr.c
---- openssh-5.4p1.orig/gss-genr.c	2009-06-22 08:11:07.000000000 +0200
-+++ openssh-5.4p1/gss-genr.c	2010-03-13 00:39:22.326293909 +0100
-@@ -1,7 +1,7 @@
- /* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */
- 
- /*
-- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -39,12 +39,167 @@
- #include "buffer.h"
- #include "log.h"
- #include "ssh2.h"
-+#include "cipher.h"
-+#include "key.h"
-+#include "kex.h"
-+#include <openssl/evp.h>
- 
- #include "ssh-gss.h"
- 
- extern u_char *session_id2;
- extern u_int session_id2_len;
- 
-+typedef struct {
-+	char *encoded;
-+	gss_OID oid;
-+} ssh_gss_kex_mapping;
-+
-+/*
-+ * XXX - It would be nice to find a more elegant way of handling the
-+ * XXX   passing of the key exchange context to the userauth routines
-+ */
-+
-+Gssctxt *gss_kex_context = NULL;
-+
-+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
-+
-+int 
-+ssh_gssapi_oid_table_ok() {
-+	return (gss_enc2oid != NULL);
-+}
-+
-+/*
-+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
-+ *
-+ * We test mechanisms to ensure that we can use them, to avoid starting
-+ * a key exchange with a bad mechanism
-+ */
-+
-+char *
-+ssh_gssapi_client_mechanisms(const char *host, const char *client) {
-+	gss_OID_set gss_supported;
-+	OM_uint32 min_status;
-+
-+	if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
-+		return NULL;
-+
-+	return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
-+	    host, client));
-+}
-+
-+char *
-+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
-+    const char *host, const char *client) {
-+	Buffer buf;
-+	size_t i;
-+	int oidpos, enclen;
-+	char *mechs, *encoded;
-+	u_char digest[EVP_MAX_MD_SIZE];
-+	char deroid[2];
-+	const EVP_MD *evp_md = EVP_md5();
-+	EVP_MD_CTX md;
-+
-+	if (gss_enc2oid != NULL) {
-+		for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
-+			xfree(gss_enc2oid[i].encoded);
-+		xfree(gss_enc2oid);
-+	}
-+
-+	gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
-+	    (gss_supported->count + 1));
-+
-+	buffer_init(&buf);
-+
-+	oidpos = 0;
-+	for (i = 0; i < gss_supported->count; i++) {
-+		if (gss_supported->elements[i].length < 128 &&
-+		    (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
-+
-+			deroid[0] = SSH_GSS_OIDTYPE;
-+			deroid[1] = gss_supported->elements[i].length;
-+
-+			EVP_DigestInit(&md, evp_md);
-+			EVP_DigestUpdate(&md, deroid, 2);
-+			EVP_DigestUpdate(&md,
-+			    gss_supported->elements[i].elements,
-+			    gss_supported->elements[i].length);
-+			EVP_DigestFinal(&md, digest, NULL);
-+
-+			encoded = xmalloc(EVP_MD_size(evp_md) * 2);
-+			enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
-+			    encoded, EVP_MD_size(evp_md) * 2);
-+
-+			if (oidpos != 0)
-+				buffer_put_char(&buf, ',');
-+
-+			buffer_append(&buf, KEX_GSS_GEX_SHA1_ID,
-+			    sizeof(KEX_GSS_GEX_SHA1_ID) - 1);
-+			buffer_append(&buf, encoded, enclen);
-+			buffer_put_char(&buf, ',');
-+			buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, 
-+			    sizeof(KEX_GSS_GRP1_SHA1_ID) - 1);
-+			buffer_append(&buf, encoded, enclen);
-+			buffer_put_char(&buf, ',');
-+			buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID,
-+			    sizeof(KEX_GSS_GRP14_SHA1_ID) - 1);
-+			buffer_append(&buf, encoded, enclen);
-+
-+			gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
-+			gss_enc2oid[oidpos].encoded = encoded;
-+			oidpos++;
-+		}
-+	}
-+	gss_enc2oid[oidpos].oid = NULL;
-+	gss_enc2oid[oidpos].encoded = NULL;
-+
-+	buffer_put_char(&buf, '\0');
-+
-+	mechs = xmalloc(buffer_len(&buf));
-+	buffer_get(&buf, mechs, buffer_len(&buf));
-+	buffer_free(&buf);
-+
-+	if (strlen(mechs) == 0) {
-+		xfree(mechs);
-+		mechs = NULL;
-+	}
-+	
-+	return (mechs);
-+}
-+
-+gss_OID
-+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
-+	int i = 0;
-+	
-+	switch (kex_type) {
-+	case KEX_GSS_GRP1_SHA1:
-+		if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
-+			return GSS_C_NO_OID;
-+		name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
-+		break;
-+	case KEX_GSS_GRP14_SHA1:
-+		if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
-+			return GSS_C_NO_OID;
-+		name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
-+		break;
-+	case KEX_GSS_GEX_SHA1:
-+		if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
-+			return GSS_C_NO_OID;
-+		name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
-+		break;
-+	default:
-+		return GSS_C_NO_OID;
-+	}
-+
-+	while (gss_enc2oid[i].encoded != NULL &&
-+	    strcmp(name, gss_enc2oid[i].encoded) != 0)
-+		i++;
-+
-+	if (gss_enc2oid[i].oid != NULL && ctx != NULL)
-+		ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
-+
-+	return gss_enc2oid[i].oid;
-+}
-+
- /* Check that the OID in a data stream matches that in the context */
- int
- ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
-@@ -197,7 +352,7 @@
- 	}
- 
- 	ctx->major = gss_init_sec_context(&ctx->minor,
--	    GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
-+	    ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
- 	    GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
- 	    0, NULL, recv_tok, NULL, send_tok, flags, NULL);
- 
-@@ -227,8 +382,42 @@
- }
- 
- OM_uint32
-+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
-+{
-+	gss_buffer_desc gssbuf;
-+	gss_name_t gssname;
-+	OM_uint32 status;
-+	gss_OID_set oidset;
-+
-+	gssbuf.value = (void *) name;
-+	gssbuf.length = strlen(gssbuf.value);
-+
-+	gss_create_empty_oid_set(&status, &oidset);
-+	gss_add_oid_set_member(&status, ctx->oid, &oidset);
-+
-+	ctx->major = gss_import_name(&ctx->minor, &gssbuf,
-+	    GSS_C_NT_USER_NAME, &gssname);
-+
-+	if (!ctx->major)
-+		ctx->major = gss_acquire_cred(&ctx->minor, 
-+		    gssname, 0, oidset, GSS_C_INITIATE, 
-+		    &ctx->client_creds, NULL, NULL);
-+
-+	gss_release_name(&status, &gssname);
-+	gss_release_oid_set(&status, &oidset);
-+
-+	if (ctx->major)
-+		ssh_gssapi_error(ctx);
-+
-+	return(ctx->major);
-+}
-+
-+OM_uint32
- ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
- {
-+	if (ctx == NULL) 
-+		return -1;
-+
- 	if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
- 	    GSS_C_QOP_DEFAULT, buffer, hash)))
- 		ssh_gssapi_error(ctx);
-@@ -236,6 +425,19 @@
- 	return (ctx->major);
- }
- 
-+/* Priviledged when used by server */
-+OM_uint32
-+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
-+{
-+	if (ctx == NULL)
-+		return -1;
-+
-+	ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
-+	    gssbuf, gssmic, NULL);
-+
-+	return (ctx->major);
-+}
-+
- void
- ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
-     const char *context)
-@@ -249,11 +451,16 @@
- }
- 
- int
--ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
-+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, 
-+    const char *client)
- {
- 	gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
- 	OM_uint32 major, minor;
- 	gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
-+	Gssctxt *intctx = NULL;
-+
-+	if (ctx == NULL)
-+		ctx = &intctx;
- 
- 	/* RFC 4462 says we MUST NOT do SPNEGO */
- 	if (oid->length == spnego_oid.length && 
-@@ -263,6 +470,10 @@
- 	ssh_gssapi_build_ctx(ctx);
- 	ssh_gssapi_set_oid(*ctx, oid);
- 	major = ssh_gssapi_import_name(*ctx, host);
-+
-+	if (!GSS_ERROR(major) && client)
-+		major = ssh_gssapi_client_identity(*ctx, client);
-+
- 	if (!GSS_ERROR(major)) {
- 		major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, 
- 		    NULL);
-@@ -272,10 +483,67 @@
- 			    GSS_C_NO_BUFFER);
- 	}
- 
--	if (GSS_ERROR(major)) 
-+	if (GSS_ERROR(major) || intctx != NULL) 
- 		ssh_gssapi_delete_ctx(ctx);
- 
- 	return (!GSS_ERROR(major));
- }
- 
-+int
-+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
-+	static gss_name_t saved_name = GSS_C_NO_NAME;
-+	static OM_uint32 saved_lifetime = 0;
-+	static gss_OID saved_mech = GSS_C_NO_OID;
-+	static gss_name_t name;
-+	static OM_uint32 last_call = 0;
-+	OM_uint32 lifetime, now, major, minor;
-+	int equal;
-+	gss_cred_usage_t usage = GSS_C_INITIATE;
-+	
-+	now = time(NULL);
-+
-+	if (ctxt) {
-+		debug("Rekey has happened - updating saved versions");
-+
-+		if (saved_name != GSS_C_NO_NAME)
-+			gss_release_name(&minor, &saved_name);
-+
-+		major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
-+		    &saved_name, &saved_lifetime, NULL, NULL);
-+
-+		if (!GSS_ERROR(major)) {
-+			saved_mech = ctxt->oid;
-+		        saved_lifetime+= now;
-+		} else {
-+			/* Handle the error */
-+		}
-+		return 0;
-+	}
-+
-+	if (now - last_call < 10)
-+		return 0;
-+
-+	last_call = now;
-+
-+	if (saved_mech == GSS_C_NO_OID)
-+		return 0;
-+	
-+	major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, 
-+	    &name, &lifetime, NULL, NULL);
-+	if (major == GSS_S_CREDENTIALS_EXPIRED)
-+		return 0;
-+	else if (GSS_ERROR(major))
-+		return 0;
-+
-+	major = gss_compare_name(&minor, saved_name, name, &equal);
-+	gss_release_name(&minor, &name);
-+	if (GSS_ERROR(major))
-+		return 0;
-+
-+	if (equal && (saved_lifetime < lifetime + now - 10))
-+		return 1;
-+
-+	return 0;
-+}
-+
- #endif /* GSSAPI */
-diff -Nur openssh-5.4p1.orig/gss-serv-krb5.c openssh-5.4p1/gss-serv-krb5.c
---- openssh-5.4p1.orig/gss-serv-krb5.c	2006-09-01 07:38:36.000000000 +0200
-+++ openssh-5.4p1/gss-serv-krb5.c	2010-03-13 00:39:22.329666310 +0100
-@@ -1,7 +1,7 @@
- /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
- 
- /*
-- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -120,6 +120,7 @@
- 	krb5_principal princ;
- 	OM_uint32 maj_status, min_status;
- 	int len;
-+	const char *new_ccname;
- 
- 	if (client->creds == NULL) {
- 		debug("No credentials stored");
-@@ -168,11 +169,16 @@
- 		return;
- 	}
- 
--	client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
-+	new_ccname = krb5_cc_get_name(krb_context, ccache);
-+
- 	client->store.envvar = "KRB5CCNAME";
--	len = strlen(client->store.filename) + 6;
--	client->store.envval = xmalloc(len);
--	snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
-+#ifdef USE_CCAPI
-+	xasprintf(&client->store.envval, "API:%s", new_ccname);
-+	client->store.filename = NULL;
-+#else
-+	xasprintf(&client->store.envval, "FILE:%s", new_ccname);
-+	client->store.filename = xstrdup(new_ccname);
-+#endif
- 
- #ifdef USE_PAM
- 	if (options.use_pam)
-@@ -184,6 +190,71 @@
- 	return;
- }
- 
-+int
-+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, 
-+    ssh_gssapi_client *client)
-+{
-+	krb5_ccache ccache = NULL;
-+	krb5_principal principal = NULL;
-+	char *name = NULL;
-+	krb5_error_code problem;
-+	OM_uint32 maj_status, min_status;
-+
-+   	if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
-+                logit("krb5_cc_resolve(): %.100s",
-+                    krb5_get_err_text(krb_context, problem));
-+                return 0;
-+       	}
-+	
-+	/* Find out who the principal in this cache is */
-+	if ((problem = krb5_cc_get_principal(krb_context, ccache, 
-+	    &principal))) {
-+		logit("krb5_cc_get_principal(): %.100s",
-+		    krb5_get_err_text(krb_context, problem));
-+		krb5_cc_close(krb_context, ccache);
-+		return 0;
-+	}
-+
-+	if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
-+		logit("krb5_unparse_name(): %.100s",
-+		    krb5_get_err_text(krb_context, problem));
-+		krb5_free_principal(krb_context, principal);
-+		krb5_cc_close(krb_context, ccache);
-+		return 0;
-+	}
-+
-+
-+	if (strcmp(name,client->exportedname.value)!=0) {
-+		debug("Name in local credentials cache differs. Not storing");
-+		krb5_free_principal(krb_context, principal);
-+		krb5_cc_close(krb_context, ccache);
-+		krb5_free_unparsed_name(krb_context, name);
-+		return 0;
-+	}
-+	krb5_free_unparsed_name(krb_context, name);
-+
-+	/* Name matches, so lets get on with it! */
-+
-+	if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
-+		logit("krb5_cc_initialize(): %.100s",
-+		    krb5_get_err_text(krb_context, problem));
-+		krb5_free_principal(krb_context, principal);
-+		krb5_cc_close(krb_context, ccache);
-+		return 0;
-+	}
-+
-+	krb5_free_principal(krb_context, principal);
-+
-+	if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
-+	    ccache))) {
-+		logit("gss_krb5_copy_ccache() failed. Sorry!");
-+		krb5_cc_close(krb_context, ccache);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
- ssh_gssapi_mech gssapi_kerberos_mech = {
- 	"toWM5Slw5Ew8Mqkay+al2g==",
- 	"Kerberos",
-@@ -191,7 +262,8 @@
- 	NULL,
- 	&ssh_gssapi_krb5_userok,
- 	NULL,
--	&ssh_gssapi_krb5_storecreds
-+	&ssh_gssapi_krb5_storecreds,
-+	&ssh_gssapi_krb5_updatecreds
- };
- 
- #endif /* KRB5 */
-diff -Nur openssh-5.4p1.orig/gss-serv.c openssh-5.4p1/gss-serv.c
---- openssh-5.4p1.orig/gss-serv.c	2008-05-19 07:05:07.000000000 +0200
-+++ openssh-5.4p1/gss-serv.c	2010-03-13 00:39:22.335213222 +0100
-@@ -1,7 +1,7 @@
- /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */
- 
- /*
-- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -45,15 +45,20 @@
- #include "channels.h"
- #include "session.h"
- #include "misc.h"
-+#include "servconf.h"
-+#include "uidswap.h"
- 
- #include "ssh-gss.h"
-+#include "monitor_wrap.h"
-+
-+extern ServerOptions options;
- 
- static ssh_gssapi_client gssapi_client =
-     { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
--    GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}};
-+    GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME,  NULL, {NULL, NULL, NULL}, 0, 0};
- 
- ssh_gssapi_mech gssapi_null_mech =
--    { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
-+    { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
- 
- #ifdef KRB5
- extern ssh_gssapi_mech gssapi_kerberos_mech;
-@@ -81,25 +86,32 @@
- 	char lname[MAXHOSTNAMELEN];
- 	gss_OID_set oidset;
- 
--	gss_create_empty_oid_set(&status, &oidset);
--	gss_add_oid_set_member(&status, ctx->oid, &oidset);
-+	if (options.gss_strict_acceptor) {
-+		gss_create_empty_oid_set(&status, &oidset);
-+		gss_add_oid_set_member(&status, ctx->oid, &oidset);
-+
-+		if (gethostname(lname, MAXHOSTNAMELEN)) {
-+			gss_release_oid_set(&status, &oidset);
-+			return (-1);
-+		}
- 
--	if (gethostname(lname, MAXHOSTNAMELEN)) {
--		gss_release_oid_set(&status, &oidset);
--		return (-1);
--	}
-+		if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
-+			gss_release_oid_set(&status, &oidset);
-+			return (ctx->major);
-+		}
-+
-+		if ((ctx->major = gss_acquire_cred(&ctx->minor,
-+		    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, 
-+		    NULL, NULL)))
-+			ssh_gssapi_error(ctx);
- 
--	if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
- 		gss_release_oid_set(&status, &oidset);
- 		return (ctx->major);
-+	} else {
-+		ctx->name = GSS_C_NO_NAME;
-+		ctx->creds = GSS_C_NO_CREDENTIAL;
- 	}
--
--	if ((ctx->major = gss_acquire_cred(&ctx->minor,
--	    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
--		ssh_gssapi_error(ctx);
--
--	gss_release_oid_set(&status, &oidset);
--	return (ctx->major);
-+	return GSS_S_COMPLETE;
- }
- 
- /* Privileged */
-@@ -114,6 +126,29 @@
- }
- 
- /* Unprivileged */
-+char *
-+ssh_gssapi_server_mechanisms() {
-+	gss_OID_set	supported;
-+
-+	ssh_gssapi_supported_oids(&supported);
-+	return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
-+	    NULL, NULL));
-+}
-+
-+/* Unprivileged */
-+int
-+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
-+    const char *dummy) {
-+	Gssctxt *ctx = NULL;
-+	int res;
-+ 
-+	res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
-+	ssh_gssapi_delete_ctx(&ctx);
-+
-+	return (res);
-+}
-+
-+/* Unprivileged */
- void
- ssh_gssapi_supported_oids(gss_OID_set *oidset)
- {
-@@ -123,7 +158,9 @@
- 	gss_OID_set supported;
- 
- 	gss_create_empty_oid_set(&min_status, oidset);
--	gss_indicate_mechs(&min_status, &supported);
-+
-+	if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
-+		return;
- 
- 	while (supported_mechs[i]->name != NULL) {
- 		if (GSS_ERROR(gss_test_oid_set_member(&min_status,
-@@ -247,8 +284,48 @@
- ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
- {
- 	int i = 0;
-+	int equal = 0;
-+	gss_name_t new_name = GSS_C_NO_NAME;
-+	gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
-+
-+	if (options.gss_store_rekey && client->used && ctx->client_creds) {
-+		if (client->mech->oid.length != ctx->oid->length ||
-+		    (memcmp(client->mech->oid.elements,
-+		     ctx->oid->elements, ctx->oid->length) !=0)) {
-+			debug("Rekeyed credentials have different mechanism");
-+			return GSS_S_COMPLETE;
-+		}
-+
-+		if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, 
-+		    ctx->client_creds, ctx->oid, &new_name, 
-+		    NULL, NULL, NULL))) {
-+			ssh_gssapi_error(ctx);
-+			return (ctx->major);
-+		}
-+
-+		ctx->major = gss_compare_name(&ctx->minor, client->name, 
-+		    new_name, &equal);
- 
--	gss_buffer_desc ename;
-+		if (GSS_ERROR(ctx->major)) {
-+			ssh_gssapi_error(ctx);
-+			return (ctx->major);
-+		}
-+ 
-+		if (!equal) {
-+			debug("Rekeyed credentials have different name");
-+			return GSS_S_COMPLETE;
-+		}
-+
-+		debug("Marking rekeyed credentials for export");
-+
-+		gss_release_name(&ctx->minor, &client->name);
-+		gss_release_cred(&ctx->minor, &client->creds);
-+		client->name = new_name;
-+		client->creds = ctx->client_creds;
-+        	ctx->client_creds = GSS_C_NO_CREDENTIAL;
-+		client->updated = 1;
-+		return GSS_S_COMPLETE;
-+	}
- 
- 	client->mech = NULL;
- 
-@@ -263,6 +340,13 @@
- 	if (client->mech == NULL)
- 		return GSS_S_FAILURE;
- 
-+	if (ctx->client_creds &&
-+	    (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
-+	     ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
-+		ssh_gssapi_error(ctx);
-+		return (ctx->major);
-+	}
-+
- 	if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
- 	    &client->displayname, NULL))) {
- 		ssh_gssapi_error(ctx);
-@@ -280,6 +364,8 @@
- 		return (ctx->major);
- 	}
- 
-+	gss_release_buffer(&ctx->minor, &ename);
-+
- 	/* We can't copy this structure, so we just move the pointer to it */
- 	client->creds = ctx->client_creds;
- 	ctx->client_creds = GSS_C_NO_CREDENTIAL;
-@@ -327,7 +413,7 @@
- 
- /* Privileged */
- int
--ssh_gssapi_userok(char *user)
-+ssh_gssapi_userok(char *user, struct passwd *pw)
- {
- 	OM_uint32 lmin;
- 
-@@ -337,9 +423,11 @@
- 		return 0;
- 	}
- 	if (gssapi_client.mech && gssapi_client.mech->userok)
--		if ((*gssapi_client.mech->userok)(&gssapi_client, user))
-+		if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
-+			gssapi_client.used = 1;
-+			gssapi_client.store.owner = pw;
- 			return 1;
--		else {
-+		} else {
- 			/* Destroy delegated credentials if userok fails */
- 			gss_release_buffer(&lmin, &gssapi_client.displayname);
- 			gss_release_buffer(&lmin, &gssapi_client.exportedname);
-@@ -352,14 +440,90 @@
- 	return (0);
- }
- 
--/* Privileged */
--OM_uint32
--ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
-+/* These bits are only used for rekeying. The unpriviledged child is running 
-+ * as the user, the monitor is root.
-+ *
-+ * In the child, we want to :
-+ *    *) Ask the monitor to store our credentials into the store we specify
-+ *    *) If it succeeds, maybe do a PAM update
-+ */
-+
-+/* Stuff for PAM */
-+
-+#ifdef USE_PAM
-+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, 
-+    struct pam_response **resp, void *data)
- {
--	ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
--	    gssbuf, gssmic, NULL);
-+	return (PAM_CONV_ERR);
-+}
-+#endif
- 
--	return (ctx->major);
-+void
-+ssh_gssapi_rekey_creds() {
-+	int ok;
-+	int ret;
-+#ifdef USE_PAM
-+	pam_handle_t *pamh = NULL;
-+	struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
-+	char *envstr;
-+#endif
-+
-+	if (gssapi_client.store.filename == NULL && 
-+	    gssapi_client.store.envval == NULL &&
-+	    gssapi_client.store.envvar == NULL)
-+		return;
-+ 
-+	ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
-+
-+	if (!ok)
-+		return;
-+
-+	debug("Rekeyed credentials stored successfully");
-+
-+	/* Actually managing to play with the ssh pam stack from here will
-+	 * be next to impossible. In any case, we may want different options
-+	 * for rekeying. So, use our own :)
-+	 */
-+#ifdef USE_PAM	
-+	if (!use_privsep) {
-+		debug("Not even going to try and do PAM with privsep disabled");
-+		return;
-+	}
-+
-+	ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
-+ 	    &pamconv, &pamh);
-+	if (ret)
-+		return;
-+
-+	xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, 
-+	    gssapi_client.store.envval);
-+
-+	ret = pam_putenv(pamh, envstr);
-+	if (!ret)
-+		pam_setcred(pamh, PAM_REINITIALIZE_CRED);
-+	pam_end(pamh, PAM_SUCCESS);
-+#endif
-+}
-+
-+int 
-+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
-+	int ok = 0;
-+
-+	/* Check we've got credentials to store */
-+	if (!gssapi_client.updated)
-+		return 0;
-+
-+	gssapi_client.updated = 0;
-+
-+	temporarily_use_uid(gssapi_client.store.owner);
-+	if (gssapi_client.mech && gssapi_client.mech->updatecreds)
-+		ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
-+	else
-+		debug("No update function for this mechanism");
-+
-+	restore_uid();
-+
-+	return ok;
- }
- 
- #endif
-diff -Nur openssh-5.4p1.orig/kex.c openssh-5.4p1/kex.c
---- openssh-5.4p1.orig/kex.c	2010-01-08 06:50:41.000000000 +0100
-+++ openssh-5.4p1/kex.c	2010-03-13 00:39:22.339231004 +0100
-@@ -50,6 +50,10 @@
- #include "monitor.h"
- #include "roaming.h"
- 
-+#ifdef GSSAPI
-+#include "ssh-gss.h"
-+#endif
-+
- #if OPENSSL_VERSION_NUMBER >= 0x00907000L
- # if defined(HAVE_EVP_SHA256)
- # define evp_ssh_sha256 EVP_sha256
-@@ -326,6 +330,20 @@
- 		k->kex_type = KEX_DH_GEX_SHA256;
- 		k->evp_md = evp_ssh_sha256();
- #endif
-+#ifdef GSSAPI
-+	} else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
-+	    sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) {
-+		k->kex_type = KEX_GSS_GEX_SHA1;
-+		k->evp_md = EVP_sha1();
-+	} else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID,
-+	    sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) {
-+		k->kex_type = KEX_GSS_GRP1_SHA1;
-+		k->evp_md = EVP_sha1();
-+	} else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID,
-+	    sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) {
-+		k->kex_type = KEX_GSS_GRP14_SHA1;
-+		k->evp_md = EVP_sha1();
-+#endif
- 	} else
- 		fatal("bad kex alg %s", k->name);
- }
-diff -Nur openssh-5.4p1.orig/kex.h openssh-5.4p1/kex.h
---- openssh-5.4p1.orig/kex.h	2010-02-26 21:55:05.000000000 +0100
-+++ openssh-5.4p1/kex.h	2010-03-13 00:39:22.342872379 +0100
-@@ -67,6 +67,9 @@
- 	KEX_DH_GRP14_SHA1,
- 	KEX_DH_GEX_SHA1,
- 	KEX_DH_GEX_SHA256,
-+	KEX_GSS_GRP1_SHA1,
-+	KEX_GSS_GRP14_SHA1,
-+	KEX_GSS_GEX_SHA1,
- 	KEX_MAX
- };
- 
-@@ -123,6 +126,12 @@
- 	sig_atomic_t done;
- 	int	flags;
- 	const EVP_MD *evp_md;
-+#ifdef GSSAPI
-+	int	gss_deleg_creds;
-+	int	gss_trust_dns;
-+	char    *gss_host;
-+	char	*gss_client;
-+#endif
- 	char	*client_version_string;
- 	char	*server_version_string;
- 	int	(*verify_host_key)(Key *);
-@@ -146,6 +155,11 @@
- void	 kexgex_client(Kex *);
- void	 kexgex_server(Kex *);
- 
-+#ifdef GSSAPI
-+void	kexgss_client(Kex *);
-+void	kexgss_server(Kex *);
-+#endif
-+
- void
- kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
-     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
-diff -Nur openssh-5.4p1.orig/kexgssc.c openssh-5.4p1/kexgssc.c
---- openssh-5.4p1.orig/kexgssc.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.4p1/kexgssc.c	2010-03-13 00:39:22.345386953 +0100
-@@ -0,0 +1,334 @@
-+/*
-+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "includes.h"
-+
-+#ifdef GSSAPI
-+
-+#include "includes.h"
-+
-+#include <openssl/crypto.h>
-+#include <openssl/bn.h>
-+
-+#include <string.h>
-+
-+#include "xmalloc.h"
-+#include "buffer.h"
-+#include "ssh2.h"
-+#include "key.h"
-+#include "cipher.h"
-+#include "kex.h"
-+#include "log.h"
-+#include "packet.h"
-+#include "dh.h"
-+
-+#include "ssh-gss.h"
-+
-+void
-+kexgss_client(Kex *kex) {
-+	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
-+	gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
-+	Gssctxt *ctxt;
-+	OM_uint32 maj_status, min_status, ret_flags;
-+	u_int klen, kout, slen = 0, hashlen, strlen;
-+	DH *dh; 
-+	BIGNUM *dh_server_pub = NULL;
-+	BIGNUM *shared_secret = NULL;
-+	BIGNUM *p = NULL;
-+	BIGNUM *g = NULL;	
-+	u_char *kbuf, *hash;
-+	u_char *serverhostkey = NULL;
-+	u_char *empty = "";
-+	char *msg;
-+	char *lang;
-+	int type = 0;
-+	int first = 1;
-+	int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
-+
-+	/* Initialise our GSSAPI world */	
-+	ssh_gssapi_build_ctx(&ctxt);
-+	if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) 
-+	    == GSS_C_NO_OID)
-+		fatal("Couldn't identify host exchange");
-+
-+	if (ssh_gssapi_import_name(ctxt, kex->gss_host))
-+		fatal("Couldn't import hostname");
-+
-+	if (kex->gss_client && 
-+	    ssh_gssapi_client_identity(ctxt, kex->gss_client))
-+		fatal("Couldn't acquire client credentials");
-+
-+	switch (kex->kex_type) {
-+	case KEX_GSS_GRP1_SHA1:
-+		dh = dh_new_group1();
-+		break;
-+	case KEX_GSS_GRP14_SHA1:
-+		dh = dh_new_group14();
-+		break;
-+	case KEX_GSS_GEX_SHA1:
-+		debug("Doing group exchange\n");
-+		nbits = dh_estimate(kex->we_need * 8);
-+		packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
-+		packet_put_int(min);
-+		packet_put_int(nbits);
-+		packet_put_int(max);
-+
-+		packet_send();
-+
-+		packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
-+
-+		if ((p = BN_new()) == NULL)
-+			fatal("BN_new() failed");
-+		packet_get_bignum2(p);
-+		if ((g = BN_new()) == NULL)
-+			fatal("BN_new() failed");
-+		packet_get_bignum2(g);
-+		packet_check_eom();
-+
-+		if (BN_num_bits(p) < min || BN_num_bits(p) > max)
-+			fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
-+			    min, BN_num_bits(p), max);
-+
-+		dh = dh_new_group(g, p);
-+		break;
-+	default:
-+		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
-+	}
-+	
-+	/* Step 1 - e is dh->pub_key */
-+	dh_gen_key(dh, kex->we_need * 8);
-+
-+	/* This is f, we initialise it now to make life easier */
-+	dh_server_pub = BN_new();
-+	if (dh_server_pub == NULL)
-+		fatal("dh_server_pub == NULL");
-+
-+	token_ptr = GSS_C_NO_BUFFER;
-+			 
-+	do {
-+		debug("Calling gss_init_sec_context");
-+		
-+		maj_status = ssh_gssapi_init_ctx(ctxt,
-+		    kex->gss_deleg_creds, token_ptr, &send_tok,
-+		    &ret_flags);
-+
-+		if (GSS_ERROR(maj_status)) {
-+			if (send_tok.length != 0) {
-+				packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-+				packet_put_string(send_tok.value,
-+				    send_tok.length);
-+			}
-+			fatal("gss_init_context failed");
-+		}
-+
-+		/* If we've got an old receive buffer get rid of it */
-+		if (token_ptr != GSS_C_NO_BUFFER)
-+			xfree(recv_tok.value);
-+
-+		if (maj_status == GSS_S_COMPLETE) {
-+			/* If mutual state flag is not true, kex fails */
-+			if (!(ret_flags & GSS_C_MUTUAL_FLAG))
-+				fatal("Mutual authentication failed");
-+
-+			/* If integ avail flag is not true kex fails */
-+			if (!(ret_flags & GSS_C_INTEG_FLAG))
-+				fatal("Integrity check failed");
-+		}
-+
-+		/* 
-+		 * If we have data to send, then the last message that we
-+		 * received cannot have been a 'complete'. 
-+		 */
-+		if (send_tok.length != 0) {
-+			if (first) {
-+				packet_start(SSH2_MSG_KEXGSS_INIT);
-+				packet_put_string(send_tok.value,
-+				    send_tok.length);
-+				packet_put_bignum2(dh->pub_key);
-+				first = 0;
-+			} else {
-+				packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-+				packet_put_string(send_tok.value,
-+				    send_tok.length);
-+			}
-+			packet_send();
-+			gss_release_buffer(&min_status, &send_tok);
-+
-+			/* If we've sent them data, they should reply */
-+			do {	
-+				type = packet_read();
-+				if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
-+					debug("Received KEXGSS_HOSTKEY");
-+					if (serverhostkey)
-+						fatal("Server host key received more than once");
-+					serverhostkey = 
-+					    packet_get_string(&slen);
-+				}
-+			} while (type == SSH2_MSG_KEXGSS_HOSTKEY);
-+
-+			switch (type) {
-+			case SSH2_MSG_KEXGSS_CONTINUE:
-+				debug("Received GSSAPI_CONTINUE");
-+				if (maj_status == GSS_S_COMPLETE) 
-+					fatal("GSSAPI Continue received from server when complete");
-+				recv_tok.value = packet_get_string(&strlen);
-+				recv_tok.length = strlen; 
-+				break;
-+			case SSH2_MSG_KEXGSS_COMPLETE:
-+				debug("Received GSSAPI_COMPLETE");
-+				packet_get_bignum2(dh_server_pub);
-+				msg_tok.value =  packet_get_string(&strlen);
-+				msg_tok.length = strlen; 
-+
-+				/* Is there a token included? */
-+				if (packet_get_char()) {
-+					recv_tok.value=
-+					    packet_get_string(&strlen);
-+					recv_tok.length = strlen;
-+					/* If we're already complete - protocol error */
-+					if (maj_status == GSS_S_COMPLETE)
-+						packet_disconnect("Protocol error: received token when complete");
-+					} else {
-+						/* No token included */
-+						if (maj_status != GSS_S_COMPLETE)
-+							packet_disconnect("Protocol error: did not receive final token");
-+				}
-+				break;
-+			case SSH2_MSG_KEXGSS_ERROR:
-+				debug("Received Error");
-+				maj_status = packet_get_int();
-+				min_status = packet_get_int();
-+				msg = packet_get_string(NULL);
-+				lang = packet_get_string(NULL);
-+				fatal("GSSAPI Error: \n%.400s",msg);
-+			default:
-+				packet_disconnect("Protocol error: didn't expect packet type %d",
-+		    		type);
-+			}
-+			token_ptr = &recv_tok;
-+		} else {
-+			/* No data, and not complete */
-+			if (maj_status != GSS_S_COMPLETE)
-+				fatal("Not complete, and no token output");
-+		}
-+	} while (maj_status & GSS_S_CONTINUE_NEEDED);
-+
-+	/* 
-+	 * We _must_ have received a COMPLETE message in reply from the 
-+	 * server, which will have set dh_server_pub and msg_tok 
-+	 */
-+
-+	if (type != SSH2_MSG_KEXGSS_COMPLETE)
-+		fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
-+
-+	/* Check f in range [1, p-1] */
-+	if (!dh_pub_is_valid(dh, dh_server_pub))
-+		packet_disconnect("bad server public DH value");
-+
-+	/* compute K=f^x mod p */
-+	klen = DH_size(dh);
-+	kbuf = xmalloc(klen);
-+	kout = DH_compute_key(kbuf, dh_server_pub, dh);
-+	if (kout < 0)
-+		fatal("DH_compute_key: failed");
-+
-+	shared_secret = BN_new();
-+	if (shared_secret == NULL)
-+		fatal("kexgss_client: BN_new failed");
-+
-+	if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
-+		fatal("kexdh_client: BN_bin2bn failed");
-+
-+	memset(kbuf, 0, klen);
-+	xfree(kbuf);
-+
-+	switch (kex->kex_type) {
-+	case KEX_GSS_GRP1_SHA1:
-+	case KEX_GSS_GRP14_SHA1:
-+		kex_dh_hash( kex->client_version_string, 
-+		    kex->server_version_string,
-+		    buffer_ptr(&kex->my), buffer_len(&kex->my),
-+		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
-+		    (serverhostkey ? serverhostkey : empty), slen,
-+		    dh->pub_key,	/* e */
-+		    dh_server_pub,	/* f */
-+		    shared_secret,	/* K */
-+		    &hash, &hashlen
-+		);
-+		break;
-+	case KEX_GSS_GEX_SHA1:
-+		kexgex_hash(
-+		    kex->evp_md,
-+		    kex->client_version_string,
-+		    kex->server_version_string,
-+		    buffer_ptr(&kex->my), buffer_len(&kex->my),
-+		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
-+		    (serverhostkey ? serverhostkey : empty), slen,
-+ 		    min, nbits, max,
-+		    dh->p, dh->g,
-+		    dh->pub_key,
-+		    dh_server_pub,
-+		    shared_secret,
-+		    &hash, &hashlen
-+		);
-+		break;
-+	default:
-+		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
-+	}
-+
-+	gssbuf.value = hash;
-+	gssbuf.length = hashlen;
-+
-+	/* Verify that the hash matches the MIC we just got. */
-+	if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
-+		packet_disconnect("Hash's MIC didn't verify");
-+
-+	xfree(msg_tok.value);
-+
-+	DH_free(dh);
-+	if (serverhostkey)
-+		xfree(serverhostkey);
-+	BN_clear_free(dh_server_pub);
-+
-+	/* save session id */
-+	if (kex->session_id == NULL) {
-+		kex->session_id_len = hashlen;
-+		kex->session_id = xmalloc(kex->session_id_len);
-+		memcpy(kex->session_id, hash, kex->session_id_len);
-+	}
-+
-+	if (kex->gss_deleg_creds)
-+		ssh_gssapi_credentials_updated(ctxt);
-+
-+	if (gss_kex_context == NULL)
-+		gss_kex_context = ctxt;
-+	else
-+		ssh_gssapi_delete_ctx(&ctxt);
-+
-+	kex_derive_keys(kex, hash, hashlen, shared_secret);
-+	BN_clear_free(shared_secret);
-+	kex_finish(kex);
-+}
-+
-+#endif /* GSSAPI */
-diff -Nur openssh-5.4p1.orig/kexgsss.c openssh-5.4p1/kexgsss.c
---- openssh-5.4p1.orig/kexgsss.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.4p1/kexgsss.c	2010-03-13 00:39:22.347367946 +0100
-@@ -0,0 +1,288 @@
-+/*
-+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "includes.h"
-+
-+#ifdef GSSAPI
-+
-+#include <string.h>
-+
-+#include <openssl/crypto.h>
-+#include <openssl/bn.h>
-+
-+#include "xmalloc.h"
-+#include "buffer.h"
-+#include "ssh2.h"
-+#include "key.h"
-+#include "cipher.h"
-+#include "kex.h"
-+#include "log.h"
-+#include "packet.h"
-+#include "dh.h"
-+#include "ssh-gss.h"
-+#include "monitor_wrap.h"
-+#include "servconf.h"
-+
-+extern ServerOptions options;
-+
-+void
-+kexgss_server(Kex *kex)
-+{
-+	OM_uint32 maj_status, min_status;
-+	
-+	/* 
-+	 * Some GSSAPI implementations use the input value of ret_flags (an
-+ 	 * output variable) as a means of triggering mechanism specific 
-+ 	 * features. Initializing it to zero avoids inadvertently 
-+ 	 * activating this non-standard behaviour.
-+	 */
-+
-+	OM_uint32 ret_flags = 0;
-+	gss_buffer_desc gssbuf, recv_tok, msg_tok;
-+	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
-+	Gssctxt *ctxt = NULL;
-+	u_int slen, klen, kout, hashlen;
-+	u_char *kbuf, *hash;
-+	DH *dh;
-+	int min = -1, max = -1, nbits = -1;
-+	BIGNUM *shared_secret = NULL;
-+	BIGNUM *dh_client_pub = NULL;
-+	int type = 0;
-+	gss_OID oid;
-+	char *mechs;
-+
-+	/* Initialise GSSAPI */
-+
-+	/* If we're rekeying, privsep means that some of the private structures
-+	 * in the GSSAPI code are no longer available. This kludges them back
-+	 * into life
-+	 */
-+	if (!ssh_gssapi_oid_table_ok()) 
-+		if ((mechs = ssh_gssapi_server_mechanisms()))
-+			xfree(mechs);
-+
-+	debug2("%s: Identifying %s", __func__, kex->name);
-+	oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
-+	if (oid == GSS_C_NO_OID)
-+	   fatal("Unknown gssapi mechanism");
-+
-+	debug2("%s: Acquiring credentials", __func__);
-+
-+	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
-+		fatal("Unable to acquire credentials for the server");
-+
-+	switch (kex->kex_type) {
-+	case KEX_GSS_GRP1_SHA1:
-+		dh = dh_new_group1();
-+		break;
-+	case KEX_GSS_GRP14_SHA1:
-+		dh = dh_new_group14();
-+		break;
-+	case KEX_GSS_GEX_SHA1:
-+		debug("Doing group exchange");
-+		packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
-+		min = packet_get_int();
-+		nbits = packet_get_int();
-+		max = packet_get_int();
-+		min = MAX(DH_GRP_MIN, min);
-+		max = MIN(DH_GRP_MAX, max);
-+		packet_check_eom();
-+		if (max < min || nbits < min || max < nbits)
-+			fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
-+			    min, nbits, max);
-+		dh = PRIVSEP(choose_dh(min, nbits, max));
-+		if (dh == NULL)
-+			packet_disconnect("Protocol error: no matching group found");
-+
-+		packet_start(SSH2_MSG_KEXGSS_GROUP);
-+		packet_put_bignum2(dh->p);
-+		packet_put_bignum2(dh->g);
-+		packet_send();
-+
-+		packet_write_wait();
-+		break;
-+	default:
-+		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
-+	}
-+
-+	dh_gen_key(dh, kex->we_need * 8);
-+
-+	do {
-+		debug("Wait SSH2_MSG_GSSAPI_INIT");
-+		type = packet_read();
-+		switch(type) {
-+		case SSH2_MSG_KEXGSS_INIT:
-+			if (dh_client_pub != NULL) 
-+				fatal("Received KEXGSS_INIT after initialising");
-+			recv_tok.value = packet_get_string(&slen);
-+			recv_tok.length = slen; 
-+
-+			if ((dh_client_pub = BN_new()) == NULL)
-+				fatal("dh_client_pub == NULL");
-+
-+			packet_get_bignum2(dh_client_pub);
-+
-+			/* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
-+			break;
-+		case SSH2_MSG_KEXGSS_CONTINUE:
-+			recv_tok.value = packet_get_string(&slen);
-+			recv_tok.length = slen; 
-+			break;
-+		default:
-+			packet_disconnect(
-+			    "Protocol error: didn't expect packet type %d",
-+			    type);
-+		}
-+
-+		maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, 
-+		    &send_tok, &ret_flags));
-+
-+		xfree(recv_tok.value);
-+
-+		if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
-+			fatal("Zero length token output when incomplete");
-+
-+		if (dh_client_pub == NULL)
-+			fatal("No client public key");
-+		
-+		if (maj_status & GSS_S_CONTINUE_NEEDED) {
-+			debug("Sending GSSAPI_CONTINUE");
-+			packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-+			packet_put_string(send_tok.value, send_tok.length);
-+			packet_send();
-+			gss_release_buffer(&min_status, &send_tok);
-+		}
-+	} while (maj_status & GSS_S_CONTINUE_NEEDED);
-+
-+	if (GSS_ERROR(maj_status)) {
-+		if (send_tok.length > 0) {
-+			packet_start(SSH2_MSG_KEXGSS_CONTINUE);
-+			packet_put_string(send_tok.value, send_tok.length);
-+			packet_send();
-+		}
-+		fatal("accept_ctx died");
-+	}
-+
-+	if (!(ret_flags & GSS_C_MUTUAL_FLAG))
-+		fatal("Mutual Authentication flag wasn't set");
-+
-+	if (!(ret_flags & GSS_C_INTEG_FLAG))
-+		fatal("Integrity flag wasn't set");
-+	
-+	if (!dh_pub_is_valid(dh, dh_client_pub))
-+		packet_disconnect("bad client public DH value");
-+
-+	klen = DH_size(dh);
-+	kbuf = xmalloc(klen); 
-+	kout = DH_compute_key(kbuf, dh_client_pub, dh);
-+	if (kout < 0)
-+		fatal("DH_compute_key: failed");
-+
-+	shared_secret = BN_new();
-+	if (shared_secret == NULL)
-+		fatal("kexgss_server: BN_new failed");
-+
-+	if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
-+		fatal("kexgss_server: BN_bin2bn failed");
-+
-+	memset(kbuf, 0, klen);
-+	xfree(kbuf);
-+
-+	switch (kex->kex_type) {
-+	case KEX_GSS_GRP1_SHA1:
-+	case KEX_GSS_GRP14_SHA1:
-+		kex_dh_hash(
-+		    kex->client_version_string, kex->server_version_string,
-+		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
-+		    buffer_ptr(&kex->my), buffer_len(&kex->my),
-+		    NULL, 0, /* Change this if we start sending host keys */
-+		    dh_client_pub, dh->pub_key, shared_secret,
-+		    &hash, &hashlen
-+		);
-+		break;
-+	case KEX_GSS_GEX_SHA1:
-+		kexgex_hash(
-+		    kex->evp_md,
-+		    kex->client_version_string, kex->server_version_string,
-+		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
-+		    buffer_ptr(&kex->my), buffer_len(&kex->my),
-+		    NULL, 0,
-+		    min, nbits, max,
-+		    dh->p, dh->g,
-+		    dh_client_pub,
-+		    dh->pub_key,
-+		    shared_secret,
-+		    &hash, &hashlen
-+		);
-+		break;
-+	default:
-+		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
-+	}
-+
-+	BN_clear_free(dh_client_pub);
-+
-+	if (kex->session_id == NULL) {
-+		kex->session_id_len = hashlen;
-+		kex->session_id = xmalloc(kex->session_id_len);
-+		memcpy(kex->session_id, hash, kex->session_id_len);
-+	}
-+
-+	gssbuf.value = hash;
-+	gssbuf.length = hashlen;
-+
-+	if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
-+		fatal("Couldn't get MIC");
-+
-+	packet_start(SSH2_MSG_KEXGSS_COMPLETE);
-+	packet_put_bignum2(dh->pub_key);
-+	packet_put_string(msg_tok.value,msg_tok.length);
-+
-+	if (send_tok.length != 0) {
-+		packet_put_char(1); /* true */
-+		packet_put_string(send_tok.value, send_tok.length);
-+	} else {
-+		packet_put_char(0); /* false */
-+	}
-+	packet_send();
-+
-+	gss_release_buffer(&min_status, &send_tok);
-+	gss_release_buffer(&min_status, &msg_tok);
-+
-+	if (gss_kex_context == NULL)
-+		gss_kex_context = ctxt;
-+	else 
-+		ssh_gssapi_delete_ctx(&ctxt);
-+
-+	DH_free(dh);
-+
-+	kex_derive_keys(kex, hash, hashlen, shared_secret);
-+	BN_clear_free(shared_secret);
-+	kex_finish(kex);
-+
-+	/* If this was a rekey, then save out any delegated credentials we
-+	 * just exchanged.  */
-+	if (options.gss_store_rekey)
-+		ssh_gssapi_rekey_creds();
-+}
-+#endif /* GSSAPI */
-diff -Nur openssh-5.4p1.orig/key.c openssh-5.4p1/key.c
---- openssh-5.4p1.orig/key.c	2010-03-04 11:52:18.000000000 +0100
-+++ openssh-5.4p1/key.c	2010-03-13 00:40:49.216211219 +0100
-@@ -969,7 +969,9 @@
- 		return KEY_RSA_CERT;
- 	} else if (strcmp(name, "ssh-dss-cert-v00 at openssh.com") == 0) {
- 		return KEY_DSA_CERT;
--	}
-+	} else if (strcmp(name, "null") == 0) {
-+		return KEY_NULL;
-+ 	}
- 	debug2("key_type_from_name: unknown key type '%s'", name);
- 	return KEY_UNSPEC;
- }
-diff -Nur openssh-5.4p1.orig/key.h openssh-5.4p1/key.h
---- openssh-5.4p1.orig/key.h	2010-02-26 21:55:05.000000000 +0100
-+++ openssh-5.4p1/key.h	2010-03-13 00:40:17.733623904 +0100
-@@ -37,6 +37,7 @@
- 	KEY_DSA,
- 	KEY_RSA_CERT,
- 	KEY_DSA_CERT,
-+	KEY_NULL,
- 	KEY_UNSPEC
- };
- enum fp_type {
-diff -Nur openssh-5.4p1.orig/monitor.c openssh-5.4p1/monitor.c
---- openssh-5.4p1.orig/monitor.c	2010-03-07 13:05:17.000000000 +0100
-+++ openssh-5.4p1/monitor.c	2010-03-13 00:39:22.367998455 +0100
-@@ -172,6 +172,8 @@
- int mm_answer_gss_accept_ctx(int, Buffer *);
- int mm_answer_gss_userok(int, Buffer *);
- int mm_answer_gss_checkmic(int, Buffer *);
-+int mm_answer_gss_sign(int, Buffer *);
-+int mm_answer_gss_updatecreds(int, Buffer *);
- #endif
- 
- #ifdef SSH_AUDIT_EVENTS
-@@ -241,6 +243,7 @@
-     {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
-     {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
-     {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
-+    {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
- #endif
- #ifdef JPAKE
-     {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata},
-@@ -253,6 +256,12 @@
- };
- 
- struct mon_table mon_dispatch_postauth20[] = {
-+#ifdef GSSAPI
-+    {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
-+    {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
-+    {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
-+    {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
-+#endif
-     {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
-     {MONITOR_REQ_SIGN, 0, mm_answer_sign},
-     {MONITOR_REQ_PTY, 0, mm_answer_pty},
-@@ -357,6 +366,10 @@
- 		/* Permit requests for moduli and signatures */
- 		monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
-+#ifdef GSSAPI
-+		/* and for the GSSAPI key exchange */
-+		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
-+#endif
- 	} else {
- 		mon_dispatch = mon_dispatch_proto15;
- 
-@@ -443,6 +456,10 @@
- 		monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
-+#ifdef GSSAPI
-+		/* and for the GSSAPI key exchange */
-+		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
-+#endif		
- 	} else {
- 		mon_dispatch = mon_dispatch_postauth15;
- 		monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
-@@ -1691,6 +1708,13 @@
- 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
-+#ifdef GSSAPI
-+	if (options.gss_keyex) {
-+		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
-+		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
-+		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
-+	}
-+#endif
- 	kex->server = 1;
- 	kex->hostkey_type = buffer_get_int(m);
- 	kex->kex_type = buffer_get_int(m);
-@@ -1897,6 +1921,9 @@
- 	OM_uint32 major;
- 	u_int len;
- 
-+	if (!options.gss_authentication && !options.gss_keyex)
-+		fatal("In GSSAPI monitor when GSSAPI is disabled");
-+
- 	goid.elements = buffer_get_string(m, &len);
- 	goid.length = len;
- 
-@@ -1924,6 +1951,9 @@
- 	OM_uint32 flags = 0; /* GSI needs this */
- 	u_int len;
- 
-+	if (!options.gss_authentication && !options.gss_keyex)
-+		fatal("In GSSAPI monitor when GSSAPI is disabled");
-+
- 	in.value = buffer_get_string(m, &len);
- 	in.length = len;
- 	major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
-@@ -1941,6 +1971,7 @@
- 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
-+		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
- 	}
- 	return (0);
- }
-@@ -1952,6 +1983,9 @@
- 	OM_uint32 ret;
- 	u_int len;
- 
-+	if (!options.gss_authentication && !options.gss_keyex)
-+		fatal("In GSSAPI monitor when GSSAPI is disabled");
-+
- 	gssbuf.value = buffer_get_string(m, &len);
- 	gssbuf.length = len;
- 	mic.value = buffer_get_string(m, &len);
-@@ -1978,7 +2012,11 @@
- {
- 	int authenticated;
- 
--	authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
-+	if (!options.gss_authentication && !options.gss_keyex)
-+		fatal("In GSSAPI monitor when GSSAPI is disabled");
-+
-+	authenticated = authctxt->valid && 
-+	    ssh_gssapi_userok(authctxt->user, authctxt->pw);
- 
- 	buffer_clear(m);
- 	buffer_put_int(m, authenticated);
-@@ -1991,6 +2029,74 @@
- 	/* Monitor loop will terminate if authenticated */
- 	return (authenticated);
- }
-+
-+int 
-+mm_answer_gss_sign(int socket, Buffer *m)
-+{
-+	gss_buffer_desc data;
-+	gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
-+	OM_uint32 major, minor;
-+	u_int len;
-+
-+	if (!options.gss_authentication && !options.gss_keyex)
-+		fatal("In GSSAPI monitor when GSSAPI is disabled");
-+
-+	data.value = buffer_get_string(m, &len);
-+	data.length = len;
-+	if (data.length != 20) 
-+		fatal("%s: data length incorrect: %d", __func__, 
-+		    (int) data.length);
-+
-+	/* Save the session ID on the first time around */
-+	if (session_id2_len == 0) {
-+		session_id2_len = data.length;
-+		session_id2 = xmalloc(session_id2_len);
-+		memcpy(session_id2, data.value, session_id2_len);
-+	}
-+	major = ssh_gssapi_sign(gsscontext, &data, &hash);
-+
-+	xfree(data.value);
-+
-+	buffer_clear(m);
-+	buffer_put_int(m, major);
-+	buffer_put_string(m, hash.value, hash.length);
-+
-+	mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
-+
-+	gss_release_buffer(&minor, &hash);
-+
-+	/* Turn on getpwnam permissions */
-+	monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
-+	
-+	/* And credential updating, for when rekeying */
-+	monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
-+
-+	return (0);
-+}
-+
-+int
-+mm_answer_gss_updatecreds(int socket, Buffer *m) {
-+	ssh_gssapi_ccache store;
-+	int ok;
-+
-+	store.filename = buffer_get_string(m, NULL);
-+	store.envvar   = buffer_get_string(m, NULL);
-+	store.envval   = buffer_get_string(m, NULL);
-+
-+	ok = ssh_gssapi_update_creds(&store);
-+
-+	xfree(store.filename);
-+	xfree(store.envvar);
-+	xfree(store.envval);
-+
-+	buffer_clear(m);
-+	buffer_put_int(m, ok);
-+
-+	mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
-+
-+	return(0);
-+}
-+
- #endif /* GSSAPI */
- 
- #ifdef JPAKE
-diff -Nur openssh-5.4p1.orig/monitor.h openssh-5.4p1/monitor.h
---- openssh-5.4p1.orig/monitor.h	2008-11-05 06:20:46.000000000 +0100
-+++ openssh-5.4p1/monitor.h	2010-03-13 00:39:22.370058530 +0100
-@@ -53,6 +53,8 @@
- 	MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP,
- 	MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK,
- 	MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC,
-+	MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN,
-+	MONITOR_REQ_GSSUPCREDS, MONITOR_ANS_GSSUPCREDS,
- 	MONITOR_REQ_PAM_START,
- 	MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT,
- 	MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX,
-diff -Nur openssh-5.4p1.orig/monitor_wrap.c openssh-5.4p1/monitor_wrap.c
---- openssh-5.4p1.orig/monitor_wrap.c	2010-03-07 13:05:17.000000000 +0100
-+++ openssh-5.4p1/monitor_wrap.c	2010-03-13 00:39:22.375677054 +0100
-@@ -1231,7 +1231,7 @@
- }
- 
- int
--mm_ssh_gssapi_userok(char *user)
-+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
- {
- 	Buffer m;
- 	int authenticated = 0;
-@@ -1248,6 +1248,51 @@
- 	debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
- 	return (authenticated);
- }
-+
-+OM_uint32
-+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
-+{
-+	Buffer m;
-+	OM_uint32 major;
-+	u_int len;
-+
-+	buffer_init(&m);
-+	buffer_put_string(&m, data->value, data->length);
-+
-+	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m);
-+	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
-+
-+	major = buffer_get_int(&m);
-+	hash->value = buffer_get_string(&m, &len);
-+	hash->length = len;
-+
-+	buffer_free(&m);
-+
-+	return(major);
-+}
-+
-+int
-+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
-+{
-+	Buffer m;
-+	int ok;
-+
-+	buffer_init(&m);
-+
-+	buffer_put_cstring(&m, store->filename ? store->filename : "");
-+	buffer_put_cstring(&m, store->envvar ? store->envvar : "");
-+	buffer_put_cstring(&m, store->envval ? store->envval : "");
-+	
-+	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m);
-+	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m);
-+
-+	ok = buffer_get_int(&m);
-+
-+	buffer_free(&m);
-+	
-+	return (ok);
-+}
-+
- #endif /* GSSAPI */
- 
- #ifdef JPAKE
-diff -Nur openssh-5.4p1.orig/monitor_wrap.h openssh-5.4p1/monitor_wrap.h
---- openssh-5.4p1.orig/monitor_wrap.h	2009-03-05 14:58:22.000000000 +0100
-+++ openssh-5.4p1/monitor_wrap.h	2010-03-13 00:39:22.377770519 +0100
-@@ -57,8 +57,10 @@
- OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
- OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
-    gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
--int mm_ssh_gssapi_userok(char *user);
-+int mm_ssh_gssapi_userok(char *user, struct passwd *);
- OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
-+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
-+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
- #endif
- 
- #ifdef USE_PAM
-diff -Nur openssh-5.4p1.orig/readconf.c openssh-5.4p1/readconf.c
---- openssh-5.4p1.orig/readconf.c	2010-02-11 23:21:03.000000000 +0100
-+++ openssh-5.4p1/readconf.c	2010-03-13 00:39:22.384142845 +0100
-@@ -127,6 +127,7 @@
- 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+	oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
- 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- 	oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
- 	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-@@ -164,10 +165,18 @@
- 	{ "afstokenpassing", oUnsupported },
- #if defined(GSSAPI)
- 	{ "gssapiauthentication", oGssAuthentication },
-+	{ "gssapikeyexchange", oGssKeyEx },
- 	{ "gssapidelegatecredentials", oGssDelegateCreds },
-+	{ "gssapitrustdns", oGssTrustDns },
-+	{ "gssapiclientidentity", oGssClientIdentity },
-+	{ "gssapirenewalforcesrekey", oGssRenewalRekey },
- #else
- 	{ "gssapiauthentication", oUnsupported },
-+	{ "gssapikeyexchange", oUnsupported },
- 	{ "gssapidelegatecredentials", oUnsupported },
-+	{ "gssapitrustdns", oUnsupported },
-+	{ "gssapiclientidentity", oUnsupported },
-+	{ "gssapirenewalforcesrekey", oUnsupported },
- #endif
- 	{ "fallbacktorsh", oDeprecated },
- 	{ "usersh", oDeprecated },
-@@ -456,10 +465,26 @@
- 		intptr = &options->gss_authentication;
- 		goto parse_flag;
- 
-+	case oGssKeyEx:
-+		intptr = &options->gss_keyex;
-+		goto parse_flag;
-+
- 	case oGssDelegateCreds:
- 		intptr = &options->gss_deleg_creds;
- 		goto parse_flag;
- 
-+	case oGssTrustDns:
-+		intptr = &options->gss_trust_dns;
-+		goto parse_flag;
-+
-+	case oGssClientIdentity:
-+		charptr = &options->gss_client_identity;
-+		goto parse_string;
-+
-+	case oGssRenewalRekey:
-+		intptr = &options->gss_renewal_rekey;
-+		goto parse_flag;
-+
- 	case oBatchMode:
- 		intptr = &options->batch_mode;
- 		goto parse_flag;
-@@ -1015,7 +1040,11 @@
- 	options->pubkey_authentication = -1;
- 	options->challenge_response_authentication = -1;
- 	options->gss_authentication = -1;
-+	options->gss_keyex = -1;
- 	options->gss_deleg_creds = -1;
-+	options->gss_trust_dns = -1;
-+	options->gss_renewal_rekey = -1;
-+	options->gss_client_identity = NULL;
- 	options->password_authentication = -1;
- 	options->kbd_interactive_authentication = -1;
- 	options->kbd_interactive_devices = NULL;
-@@ -1107,8 +1136,14 @@
- 		options->challenge_response_authentication = 1;
- 	if (options->gss_authentication == -1)
- 		options->gss_authentication = 0;
-+	if (options->gss_keyex == -1)
-+		options->gss_keyex = 0;
- 	if (options->gss_deleg_creds == -1)
- 		options->gss_deleg_creds = 0;
-+	if (options->gss_trust_dns == -1)
-+		options->gss_trust_dns = 0;
-+	if (options->gss_renewal_rekey == -1)
-+		options->gss_renewal_rekey = 0;
- 	if (options->password_authentication == -1)
- 		options->password_authentication = 1;
- 	if (options->kbd_interactive_authentication == -1)
-diff -Nur openssh-5.4p1.orig/readconf.h openssh-5.4p1/readconf.h
---- openssh-5.4p1.orig/readconf.h	2010-02-11 23:21:03.000000000 +0100
-+++ openssh-5.4p1/readconf.h	2010-03-13 00:39:22.386055410 +0100
-@@ -44,7 +44,11 @@
- 	int     challenge_response_authentication;
- 					/* Try S/Key or TIS, authentication. */
- 	int     gss_authentication;	/* Try GSS authentication */
-+	int     gss_keyex;		/* Try GSS key exchange */
- 	int     gss_deleg_creds;	/* Delegate GSS credentials */
-+	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
-+	int	gss_renewal_rekey;	/* Credential renewal forces rekey */
-+	char    *gss_client_identity;   /* Principal to initiate GSSAPI with */
- 	int     password_authentication;	/* Try password
- 						 * authentication. */
- 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-diff -Nur openssh-5.4p1.orig/servconf.c openssh-5.4p1/servconf.c
---- openssh-5.4p1.orig/servconf.c	2010-03-04 11:53:35.000000000 +0100
-+++ openssh-5.4p1/servconf.c	2010-03-13 00:39:22.394208388 +0100
-@@ -93,7 +93,10 @@
- 	options->kerberos_ticket_cleanup = -1;
- 	options->kerberos_get_afs_token = -1;
- 	options->gss_authentication=-1;
-+	options->gss_keyex = -1;
- 	options->gss_cleanup_creds = -1;
-+	options->gss_strict_acceptor = -1;
-+	options->gss_store_rekey = -1;
- 	options->password_authentication = -1;
- 	options->kbd_interactive_authentication = -1;
- 	options->challenge_response_authentication = -1;
-@@ -214,8 +217,14 @@
- 		options->kerberos_get_afs_token = 0;
- 	if (options->gss_authentication == -1)
- 		options->gss_authentication = 0;
-+	if (options->gss_keyex == -1)
-+		options->gss_keyex = 0;
- 	if (options->gss_cleanup_creds == -1)
- 		options->gss_cleanup_creds = 1;
-+	if (options->gss_strict_acceptor == -1)
-+		options->gss_strict_acceptor = 1;
-+	if (options->gss_store_rekey == -1)
-+		options->gss_store_rekey = 0;
- 	if (options->password_authentication == -1)
- 		options->password_authentication = 1;
- 	if (options->kbd_interactive_authentication == -1)
-@@ -306,7 +315,9 @@
- 	sBanner, sUseDNS, sHostbasedAuthentication,
- 	sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
- 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
--	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
-+	sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
-+	sGssKeyEx, sGssStoreRekey,
-+	sAcceptEnv, sPermitTunnel,
- 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
- 	sUsePrivilegeSeparation, sAllowAgentForwarding,
- 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
-@@ -369,9 +380,15 @@
- #ifdef GSSAPI
- 	{ "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
- 	{ "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
-+	{ "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
-+	{ "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
-+	{ "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
- #else
- 	{ "gssapiauthentication", sUnsupported, SSHCFG_ALL },
- 	{ "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
- #endif
- 	{ "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
- 	{ "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
-@@ -925,10 +942,22 @@
- 		intptr = &options->gss_authentication;
- 		goto parse_flag;
- 
-+	case sGssKeyEx:
-+		intptr = &options->gss_keyex;
-+		goto parse_flag;
-+
- 	case sGssCleanupCreds:
- 		intptr = &options->gss_cleanup_creds;
- 		goto parse_flag;
- 
-+	case sGssStrictAcceptor:
-+		intptr = &options->gss_strict_acceptor;
-+		goto parse_flag;
-+
-+	case sGssStoreRekey:
-+		intptr = &options->gss_store_rekey;
-+		goto parse_flag;
-+
- 	case sPasswordAuthentication:
- 		intptr = &options->password_authentication;
- 		goto parse_flag;
-diff -Nur openssh-5.4p1.orig/servconf.h openssh-5.4p1/servconf.h
---- openssh-5.4p1.orig/servconf.h	2010-03-04 11:53:35.000000000 +0100
-+++ openssh-5.4p1/servconf.h	2010-03-13 00:39:22.397236772 +0100
-@@ -94,7 +94,10 @@
- 	int     kerberos_get_afs_token;		/* If true, try to get AFS token if
- 						 * authenticated with Kerberos. */
- 	int     gss_authentication;	/* If true, permit GSSAPI authentication */
-+	int     gss_keyex;		/* If true, permit GSSAPI key exchange */
- 	int     gss_cleanup_creds;	/* If true, destroy cred cache on logout */
-+	int 	gss_strict_acceptor;	/* If true, restrict the GSSAPI acceptor name */
-+	int 	gss_store_rekey;
- 	int     password_authentication;	/* If true, permit password
- 						 * authentication. */
- 	int     kbd_interactive_authentication;	/* If true, permit */
-diff -Nur openssh-5.4p1.orig/ssh-gss.h openssh-5.4p1/ssh-gss.h
---- openssh-5.4p1.orig/ssh-gss.h	2007-06-12 15:40:39.000000000 +0200
-+++ openssh-5.4p1/ssh-gss.h	2010-03-13 00:39:22.400061752 +0100
-@@ -1,6 +1,6 @@
- /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */
- /*
-- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
-+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -60,10 +60,22 @@
- 
- #define SSH_GSS_OIDTYPE 0x06
- 
-+#define SSH2_MSG_KEXGSS_INIT                            30
-+#define SSH2_MSG_KEXGSS_CONTINUE                        31
-+#define SSH2_MSG_KEXGSS_COMPLETE                        32
-+#define SSH2_MSG_KEXGSS_HOSTKEY                         33
-+#define SSH2_MSG_KEXGSS_ERROR                           34
-+#define SSH2_MSG_KEXGSS_GROUPREQ			40
-+#define SSH2_MSG_KEXGSS_GROUP				41
-+#define KEX_GSS_GRP1_SHA1_ID				"gss-group1-sha1-"
-+#define KEX_GSS_GRP14_SHA1_ID				"gss-group14-sha1-"
-+#define KEX_GSS_GEX_SHA1_ID				"gss-gex-sha1-"
-+
- typedef struct {
- 	char *filename;
- 	char *envvar;
- 	char *envval;
-+	struct passwd *owner;
- 	void *data;
- } ssh_gssapi_ccache;
- 
-@@ -71,8 +83,11 @@
- 	gss_buffer_desc displayname;
- 	gss_buffer_desc exportedname;
- 	gss_cred_id_t creds;
-+	gss_name_t name;
- 	struct ssh_gssapi_mech_struct *mech;
- 	ssh_gssapi_ccache store;
-+	int used;
-+	int updated;
- } ssh_gssapi_client;
- 
- typedef struct ssh_gssapi_mech_struct {
-@@ -83,6 +98,7 @@
- 	int (*userok) (ssh_gssapi_client *, char *);
- 	int (*localname) (ssh_gssapi_client *, char **);
- 	void (*storecreds) (ssh_gssapi_client *);
-+	int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
- } ssh_gssapi_mech;
- 
- typedef struct {
-@@ -93,10 +109,11 @@
- 	gss_OID		oid; /* client */
- 	gss_cred_id_t	creds; /* server */
- 	gss_name_t	client; /* server */
--	gss_cred_id_t	client_creds; /* server */
-+	gss_cred_id_t	client_creds; /* both */
- } Gssctxt;
- 
- extern ssh_gssapi_mech *supported_mechs[];
-+extern Gssctxt *gss_kex_context;
- 
- int  ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
- void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
-@@ -116,16 +133,30 @@
- void ssh_gssapi_delete_ctx(Gssctxt **);
- OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
- void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
--int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
-+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
-+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
-+int ssh_gssapi_credentials_updated(Gssctxt *);
- 
- /* In the server */
-+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, 
-+    const char *);
-+char *ssh_gssapi_client_mechanisms(const char *, const char *);
-+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
-+    const char *);
-+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
-+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, 
-+    const char *);
- OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
--int ssh_gssapi_userok(char *name);
-+int ssh_gssapi_userok(char *name, struct passwd *);
- OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
- void ssh_gssapi_do_child(char ***, u_int *);
- void ssh_gssapi_cleanup_creds(void);
- void ssh_gssapi_storecreds(void);
- 
-+char *ssh_gssapi_server_mechanisms(void);
-+int ssh_gssapi_oid_table_ok();
-+
-+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
- #endif /* GSSAPI */
- 
- #endif /* _SSH_GSS_H */
-diff -Nur openssh-5.4p1.orig/ssh_config openssh-5.4p1/ssh_config
---- openssh-5.4p1.orig/ssh_config	2010-01-12 09:40:27.000000000 +0100
-+++ openssh-5.4p1/ssh_config	2010-03-13 00:39:22.401981567 +0100
-@@ -26,6 +26,8 @@
- #   HostbasedAuthentication no
- #   GSSAPIAuthentication no
- #   GSSAPIDelegateCredentials no
-+#   GSSAPIKeyExchange no
-+#   GSSAPITrustDNS no
- #   BatchMode no
- #   CheckHostIP yes
- #   AddressFamily any
-diff -Nur openssh-5.4p1.orig/ssh_config.5 openssh-5.4p1/ssh_config.5
---- openssh-5.4p1.orig/ssh_config.5	2010-03-05 11:31:12.000000000 +0100
-+++ openssh-5.4p1/ssh_config.5	2010-03-13 00:39:22.405912908 +0100
-@@ -478,11 +478,38 @@
- The default is
- .Dq no .
- Note that this option applies to protocol version 2 only.
-+.It Cm GSSAPIKeyExchange
-+Specifies whether key exchange based on GSSAPI may be used. When using
-+GSSAPI key exchange the server need not have a host key.
-+The default is
-+.Dq no .
-+Note that this option applies to protocol version 2 only.
-+.It Cm GSSAPIClientIdentity
-+If set, specifies the GSSAPI client identity that ssh should use when 
-+connecting to the server. The default is unset, which means that the default 
-+identity will be used.
- .It Cm GSSAPIDelegateCredentials
- Forward (delegate) credentials to the server.
- The default is
- .Dq no .
--Note that this option applies to protocol version 2 only.
-+Note that this option applies to protocol version 2 connections using GSSAPI.
-+.It Cm GSSAPIRenewalForcesRekey
-+If set to 
-+.Dq yes
-+then renewal of the client's GSSAPI credentials will force the rekeying of the
-+ssh connection. With a compatible server, this can delegate the renewed 
-+credentials to a session on the server.
-+The default is
-+.Dq no .
-+.It Cm GSSAPITrustDns
-+Set to 
-+.Dq yes to indicate that the DNS is trusted to securely canonicalize
-+the name of the host being connected to. If 
-+.Dq no, the hostname entered on the
-+command line will be passed untouched to the GSSAPI library.
-+The default is
-+.Dq no .
-+This option only applies to protocol version 2 connections using GSSAPI.
- .It Cm HashKnownHosts
- Indicates that
- .Xr ssh 1
-diff -Nur openssh-5.4p1.orig/sshconnect2.c openssh-5.4p1/sshconnect2.c
---- openssh-5.4p1.orig/sshconnect2.c	2010-02-26 21:55:06.000000000 +0100
-+++ openssh-5.4p1/sshconnect2.c	2010-03-13 00:39:22.414196262 +0100
-@@ -106,9 +106,34 @@
- {
- 	Kex *kex;
- 
-+#ifdef GSSAPI
-+	char *orig = NULL, *gss = NULL;
-+	char *gss_host = NULL;
-+#endif
-+
- 	xxx_host = host;
- 	xxx_hostaddr = hostaddr;
- 
-+#ifdef GSSAPI
-+	if (options.gss_keyex) {
-+		/* Add the GSSAPI mechanisms currently supported on this 
-+		 * client to the key exchange algorithm proposal */
-+		orig = myproposal[PROPOSAL_KEX_ALGS];
-+
-+		if (options.gss_trust_dns)
-+			gss_host = (char *)get_canonical_hostname(1);
-+		else
-+			gss_host = host;
-+
-+		gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
-+		if (gss) {
-+			debug("Offering GSSAPI proposal: %s", gss);
-+			xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
-+			    "%s,%s", gss, orig);
-+		}
-+	}
-+#endif
-+
- 	if (options.ciphers == (char *)-1) {
- 		logit("No valid ciphers for protocol version 2 given, using defaults.");
- 		options.ciphers = NULL;
-@@ -136,6 +161,17 @@
- 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
- 		    options.hostkeyalgorithms;
- 
-+#ifdef GSSAPI
-+	/* If we've got GSSAPI algorithms, then we also support the
-+	 * 'null' hostkey, as a last resort */
-+	if (options.gss_keyex && gss) {
-+		orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
-+		xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], 
-+		    "%s,null", orig);
-+		xfree(gss);
-+	}
-+#endif
-+
- 	if (options.rekey_limit)
- 		packet_set_rekey_limit((u_int32_t)options.rekey_limit);
- 
-@@ -145,10 +181,26 @@
- 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
-+#ifdef GSSAPI
-+	if (options.gss_keyex) {
-+		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
-+		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
-+		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
-+	}
-+#endif
- 	kex->client_version_string=client_version_string;
- 	kex->server_version_string=server_version_string;
- 	kex->verify_host_key=&verify_host_key_callback;
- 
-+#ifdef GSSAPI
-+	if (options.gss_keyex) {
-+		kex->gss_deleg_creds = options.gss_deleg_creds;
-+		kex->gss_trust_dns = options.gss_trust_dns;
-+		kex->gss_client = options.gss_client_identity;
-+		kex->gss_host = gss_host;
-+	}
-+#endif
-+
- 	xxx_kex = kex;
- 
- 	dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
-@@ -243,6 +295,7 @@
- void	input_gssapi_hash(int type, u_int32_t, void *);
- void	input_gssapi_error(int, u_int32_t, void *);
- void	input_gssapi_errtok(int, u_int32_t, void *);
-+int	userauth_gsskeyex(Authctxt *authctxt);
- #endif
- 
- void	userauth(Authctxt *, char *);
-@@ -258,6 +311,10 @@
- 
- Authmethod authmethods[] = {
- #ifdef GSSAPI
-+	{"gssapi-keyex",
-+		userauth_gsskeyex,
-+		&options.gss_authentication,
-+		NULL},
- 	{"gssapi-with-mic",
- 		userauth_gssapi,
- 		NULL,
-@@ -564,19 +621,29 @@
- 	static u_int mech = 0;
- 	OM_uint32 min;
- 	int ok = 0;
-+	const char *gss_host;
-+
-+	if (options.gss_trust_dns)
-+		gss_host = get_canonical_hostname(1);
-+	else
-+		gss_host = authctxt->host;
- 
- 	/* Try one GSSAPI method at a time, rather than sending them all at
- 	 * once. */
- 
- 	if (gss_supported == NULL)
--		gss_indicate_mechs(&min, &gss_supported);
-+		if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
-+			gss_supported = NULL;
-+			return 0;
-+		}
- 
- 	/* Check to see if the mechanism is usable before we offer it */
- 	while (mech < gss_supported->count && !ok) {
- 		/* My DER encoding requires length<128 */
- 		if (gss_supported->elements[mech].length < 128 &&
- 		    ssh_gssapi_check_mechanism(&gssctxt, 
--		    &gss_supported->elements[mech], authctxt->host)) {
-+		    &gss_supported->elements[mech], gss_host, 
-+                    options.gss_client_identity)) {
- 			ok = 1; /* Mechanism works */
- 		} else {
- 			mech++;
-@@ -673,8 +740,8 @@
- {
- 	Authctxt *authctxt = ctxt;
- 	Gssctxt *gssctxt;
--	int oidlen;
--	char *oidv;
-+	u_int oidlen;
-+	u_char *oidv;
- 
- 	if (authctxt == NULL)
- 		fatal("input_gssapi_response: no authentication context");
-@@ -784,6 +851,48 @@
- 	xfree(msg);
- 	xfree(lang);
- }
-+
-+int
-+userauth_gsskeyex(Authctxt *authctxt)
-+{
-+	Buffer b;
-+	gss_buffer_desc gssbuf;
-+	gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
-+	OM_uint32 ms;
-+
-+	static int attempt = 0;
-+	if (attempt++ >= 1)
-+		return (0);
-+
-+	if (gss_kex_context == NULL) {
-+		debug("No valid Key exchange context"); 
-+		return (0);
-+	}
-+
-+	ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service,
-+	    "gssapi-keyex");
-+
-+	gssbuf.value = buffer_ptr(&b);
-+	gssbuf.length = buffer_len(&b);
-+
-+	if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
-+		buffer_free(&b);
-+		return (0);
-+	}
-+
-+	packet_start(SSH2_MSG_USERAUTH_REQUEST);
-+	packet_put_cstring(authctxt->server_user);
-+	packet_put_cstring(authctxt->service);
-+	packet_put_cstring(authctxt->method->name);
-+	packet_put_string(mic.value, mic.length);
-+	packet_send();
-+
-+	buffer_free(&b);
-+	gss_release_buffer(&ms, &mic);
-+
-+	return (1);
-+}
-+
- #endif /* GSSAPI */
- 
- int
-diff -Nur openssh-5.4p1.orig/sshd.c openssh-5.4p1/sshd.c
---- openssh-5.4p1.orig/sshd.c	2010-03-07 13:05:17.000000000 +0100
-+++ openssh-5.4p1/sshd.c	2010-03-13 00:39:22.423749423 +0100
-@@ -120,6 +120,10 @@
- #include "roaming.h"
- #include "version.h"
- 
-+#ifdef USE_SECURITY_SESSION_API
-+#include <Security/AuthSession.h>
-+#endif
-+
- #ifdef LIBWRAP
- #include <tcpd.h>
- #include <syslog.h>
-@@ -1577,10 +1581,13 @@
- 		logit("Disabling protocol version 1. Could not load host key");
- 		options.protocol &= ~SSH_PROTO_1;
- 	}
-+#ifndef GSSAPI
-+	/* The GSSAPI key exchange can run without a host key */
- 	if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
- 		logit("Disabling protocol version 2. Could not load host key");
- 		options.protocol &= ~SSH_PROTO_2;
- 	}
-+#endif
- 	if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
- 		logit("sshd: no hostkeys available -- exiting.");
- 		exit(1);
-@@ -1909,6 +1916,60 @@
- 	/* Log the connection. */
- 	verbose("Connection from %.500s port %d", remote_ip, remote_port);
- 
-+#ifdef USE_SECURITY_SESSION_API
-+	/*
-+	 * Create a new security session for use by the new user login if
-+	 * the current session is the root session or we are not launched
-+	 * by inetd (eg: debugging mode or server mode).  We do not
-+	 * necessarily need to create a session if we are launched from
-+	 * inetd because Panther xinetd will create a session for us.
-+	 *
-+	 * The only case where this logic will fail is if there is an
-+	 * inetd running in a non-root session which is not creating
-+	 * new sessions for us.  Then all the users will end up in the
-+	 * same session (bad).
-+	 *
-+	 * When the client exits, the session will be destroyed for us
-+	 * automatically.
-+	 *
-+	 * We must create the session before any credentials are stored
-+	 * (including AFS pags, which happens a few lines below).
-+	 */
-+	{
-+		OSStatus err = 0;
-+		SecuritySessionId sid = 0;
-+		SessionAttributeBits sattrs = 0;
-+
-+		err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
-+		if (err)
-+			error("SessionGetInfo() failed with error %.8X",
-+			    (unsigned) err);
-+		else
-+			debug("Current Session ID is %.8X / Session Attributes are %.8X",
-+			    (unsigned) sid, (unsigned) sattrs);
-+
-+		if (inetd_flag && !(sattrs & sessionIsRoot))
-+			debug("Running in inetd mode in a non-root session... "
-+			    "assuming inetd created the session for us.");
-+		else {
-+			debug("Creating new security session...");
-+			err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
-+			if (err)
-+				error("SessionCreate() failed with error %.8X",
-+				    (unsigned) err);
-+
-+			err = SessionGetInfo(callerSecuritySession, &sid, 
-+			    &sattrs);
-+			if (err)
-+				error("SessionGetInfo() failed with error %.8X",
-+				    (unsigned) err);
-+			else
-+				debug("New Session ID is %.8X / Session Attributes are %.8X",
-+				    (unsigned) sid, (unsigned) sattrs);
-+		}
-+	}
-+#endif
-+
- 	/*
- 	 * We don't want to listen forever unless the other side
- 	 * successfully authenticates itself.  So we set up an alarm which is
-@@ -2287,12 +2348,61 @@
- 
- 	myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
- 
-+#ifdef GSSAPI
-+	{
-+	char *orig;
-+	char *gss = NULL;
-+	char *newstr = NULL;
-+	orig = myproposal[PROPOSAL_KEX_ALGS];
-+
-+	/* 
-+	 * If we don't have a host key, then there's no point advertising
-+	 * the other key exchange algorithms
-+	 */
-+
-+	if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
-+		orig = NULL;
-+
-+	if (options.gss_keyex)
-+		gss = ssh_gssapi_server_mechanisms();
-+	else
-+		gss = NULL;
-+
-+	if (gss && orig)
-+		xasprintf(&newstr, "%s,%s", gss, orig);
-+	else if (gss)
-+		newstr = gss;
-+	else if (orig)
-+		newstr = orig;
-+
-+	/* 
-+	 * If we've got GSSAPI mechanisms, then we've got the 'null' host
-+	 * key alg, but we can't tell people about it unless its the only
-+  	 * host key algorithm we support
-+	 */
-+	if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
-+		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
-+
-+	if (newstr)
-+		myproposal[PROPOSAL_KEX_ALGS] = newstr;
-+	else
-+		fatal("No supported key exchange algorithms");
-+	}
-+#endif
-+
- 	/* start key exchange */
- 	kex = kex_setup(myproposal);
- 	kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
- 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
-+#ifdef GSSAPI
-+	if (options.gss_keyex) {
-+		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
-+		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
-+		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
-+	}
-+#endif
- 	kex->server = 1;
- 	kex->client_version_string=client_version_string;
- 	kex->server_version_string=server_version_string;
-diff -Nur openssh-5.4p1.orig/sshd_config openssh-5.4p1/sshd_config
---- openssh-5.4p1.orig/sshd_config	2009-10-11 12:51:09.000000000 +0200
-+++ openssh-5.4p1/sshd_config	2010-03-13 00:39:22.426530018 +0100
-@@ -71,6 +71,8 @@
- # GSSAPI options
- #GSSAPIAuthentication no
- #GSSAPICleanupCredentials yes
-+#GSSAPIStrictAcceptorCheck yes
-+#GSSAPIKeyExchange no
- 
- # Set this to 'yes' to enable PAM authentication, account processing, 
- # and session processing. If this is enabled, PAM authentication will 
-diff -Nur openssh-5.4p1.orig/sshd_config.5 openssh-5.4p1/sshd_config.5
---- openssh-5.4p1.orig/sshd_config.5	2010-03-05 00:41:45.000000000 +0100
-+++ openssh-5.4p1/sshd_config.5	2010-03-13 00:39:22.430994501 +0100
-@@ -379,12 +379,40 @@
- The default is
- .Dq no .
- Note that this option applies to protocol version 2 only.
-+.It Cm GSSAPIKeyExchange
-+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
-+doesn't rely on ssh keys to verify host identity.
-+The default is
-+.Dq no .
-+Note that this option applies to protocol version 2 only.
- .It Cm GSSAPICleanupCredentials
- Specifies whether to automatically destroy the user's credentials cache
- on logout.
- The default is
- .Dq yes .
- Note that this option applies to protocol version 2 only.
-+.It Cm GSSAPIStrictAcceptorCheck
-+Determines whether to be strict about the identity of the GSSAPI acceptor 
-+a client authenticates against. If
-+.Dq yes
-+then the client must authenticate against the
-+.Pa host
-+service on the current hostname. If 
-+.Dq no
-+then the client may authenticate against any service key stored in the 
-+machine's default store. This facility is provided to assist with operation 
-+on multi homed machines. 
-+The default is
-+.Dq yes .
-+Note that this option applies only to protocol version 2 GSSAPI connections,
-+and setting it to 
-+.Dq no
-+may only work with recent Kerberos GSSAPI libraries.
-+.It Cm GSSAPIStoreCredentialsOnRekey
-+Controls whether the user's GSSAPI credentials should be updated following a 
-+successful connection rekeying. This option can be used to accepted renewed 
-+or updated credentials from a compatible client. The default is
-+.Dq no .
- .It Cm HostbasedAuthentication
- Specifies whether rhosts or /etc/hosts.equiv authentication together
- with successful public key client host authentication is allowed

Copied: csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch (from rev 10847, csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch	2010-09-01 21:26:08 UTC (rev 10884)
@@ -0,0 +1,2933 @@
+diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi
+--- openssh-5.4p1.orig/ChangeLog.gssapi	1970-01-01 01:00:00.000000000 +0100
++++ openssh-5.4p1/ChangeLog.gssapi	2010-03-13 00:39:22.276624764 +0100
+@@ -0,0 +1,95 @@
++20090615
++  - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
++      sshd.c ]
++    Fix issues identified by Greg Hudson following a code review
++	Check return value of gss_indicate_mechs
++	Protect GSSAPI calls in monitor, so they can only be used if enabled
++	Check return values of bignum functions in key exchange
++	Use BN_clear_free to clear other side's DH value
++	Make ssh_gssapi_id_kex more robust
++	Only configure kex table pointers if GSSAPI is enabled
++	Don't leak mechanism list, or gss mechanism list
++	Cast data.length before printing
++	If serverkey isn't provided, use an empty string, rather than NULL
++
++20090201
++  - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
++      ssh_config.5 sshconnet2.c ]
++    Add support for the GSSAPIClientIdentity option, which allows the user
++    to specify which GSSAPI identity to use to contact a given server
++
++20080404
++  - [ gss-serv.c ]
++    Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
++    been omitted from a previous version of this patch. Reported by Borislav
++    Stoichkov
++
++20070317
++  - [ gss-serv-krb5.c ]
++    Remove C99ism, where new_ccname was being declared in the middle of a 
++    function
++
++20061220
++  - [ servconf.c ]
++    Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and 
++    documented, behaviour. Reported by Dan Watson.
++
++20060910
++  - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
++      ssh-gss.h ]
++    add support for gss-group14-sha1 key exchange mechanisms
++  - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
++    Add GSSAPIStrictAcceptorCheck option to allow the disabling of
++    acceptor principal checking on multi-homed machines.
++    <Bugzilla #928>
++  - [ sshd_config ssh_config ]
++    Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
++    configuration files
++  - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
++    Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
++    Limit length of error messages displayed by client
++
++20060909
++  - [ gss-genr.c gss-serv.c ]
++    move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
++    only, where they belong 
++    <Bugzilla #1225>
++
++20060829
++  - [ gss-serv-krb5.c ]
++    Fix CCAPI credentials cache name when creating KRB5CCNAME environment 
++    variable
++
++20060828
++  - [ gss-genr.c ]
++    Avoid Heimdal context freeing problem
++    <Fixed upstream 20060829>
++
++20060818
++  - [ gss-genr.c ssh-gss.h sshconnect2.c ]
++    Make sure that SPENGO is disabled 
++    <Bugzilla #1218 - Fixed upstream 20060818>
++
++20060421
++  - [ gssgenr.c, sshconnect2.c ]
++    a few type changes (signed versus unsigned, int versus size_t) to
++    fix compiler errors/warnings 
++    (from jbasney AT ncsa.uiuc.edu)
++  - [ kexgssc.c, sshconnect2.c ]
++    fix uninitialized variable warnings
++    (from jbasney AT ncsa.uiuc.edu)
++  - [ gssgenr.c ]
++    pass oid to gss_display_status (helpful when using GSSAPI mechglue)
++    (from jbasney AT ncsa.uiuc.edu)
++    <Bugzilla #1220 >
++  - [ gss-serv-krb5.c ]
++    #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H

@@ Diff output truncated at 100000 characters. @@

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

From wahwah at users.sourceforge.net  Wed Sep  1 23:36:04 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 01 Sep 2010 21:36:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[10885] csw/mgar/gar/v2/lib/python
Message-ID: <E1OquyS-0003WW-PL@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10885
          http://gar.svn.sourceforge.net/gar/?rev=10885&view=rev
Author:   wahwah
Date:     2010-09-01 21:36:04 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
mGAR v2: checkpkg, better handling of the deprecated libraries error.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/dependency_checks_test.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-09-01 21:26:08 UTC (rev 10884)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -695,7 +695,8 @@
     return self.runpath_sanitize_cache[runpath]
 
 
-  def ResolveSoname(self, runpath_list, soname, isalist, path_list, binary_path):
+  def ResolveSoname(self, runpath_list, soname, isalist,
+                    path_list, binary_path):
     """Emulates ldd behavior, minimal implementation.
 
     runpath: e.g. ["/opt/csw/lib/$ISALIST", "/usr/lib"]
@@ -717,8 +718,9 @@
       # in the path_list.
       for expanded_p in expanded_p_list:
         original_paths_by_expanded_paths[expanded_p] = p
-    # logging.debug("%s: looking for %s in %s",
-    #     soname, runpath_list, original_paths_by_expanded_paths.keys())
+    logging.debug(
+        "%s: looking for %s in %s",
+        soname, runpath_list, original_paths_by_expanded_paths.keys())
     for runpath_expanded in runpath_list:
       if runpath_expanded in original_paths_by_expanded_paths:
         # logging.debug("Found %s",

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-09-01 21:26:08 UTC (rev 10884)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -463,5 +463,23 @@
     self.assertTrue(expected, checkpkg.SliceList(l, s))
 
 
+class LddEmulartorUnitTest(unittest.TestCase):
+
+  def setUp(self):
+    self.pkgmap_mocker = mox.Mox()
+    self.e = checkpkg.LddEmulator()
+
+  def testResolveSoname_1(self):
+    # runpath_list, soname, isalist, path_list, binary_path
+    runpath_list = ["/opt/csw/bdb47/lib", "/opt/csw/lib"]
+    soname = "foo.so.1"
+    path_list = ["/opt/csw/lib", "/opt/csw/bdb47/lib", "/usr/lib"]
+    binary_path = "unused"
+    isalist = ["amd64"]
+    result = self.e.ResolveSoname(runpath_list, soname, isalist,
+                                  path_list, binary_path)
+    self.assertEqual("/opt/csw/bdb47/lib", result)
+
+
 if __name__ == '__main__':
   unittest.main()

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-09-01 21:26:08 UTC (rev 10884)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -30,6 +30,77 @@
 
 PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"])
 
+def ProcessSoname(
+    ldd_emulator,
+    soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger,
+    error_mgr,
+    pkgname, messenger):
+  """This is not an ideal name for a function.
+
+  Returns:
+    orphan_sonames
+  """
+  orphan_sonames = []
+  required_deps = []
+  resolved = False
+  path_list = path_and_pkg_by_basename[soname].keys()
+  runpath_tuple = (
+      tuple(binary_info["runpath"])
+      + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
+  runpath_history = []
+  alternative_deps = set()
+  first_lib = None
+  for runpath in runpath_tuple:
+    runpath = ldd_emulator.SanitizeRunpath(runpath)
+    runpath_list = ldd_emulator.ExpandRunpath(runpath, isalist, binary_path)
+    runpath_list = ldd_emulator.Emulate64BitSymlinks(runpath_list)
+    # To accumulate all the runpaths that we were looking at
+    runpath_history += runpath_list
+    resolved_path = ldd_emulator.ResolveSoname(runpath_list,
+                                               soname,
+                                               isalist,
+                                               path_list,
+                                               binary_path)
+    if resolved_path:
+      resolved = True
+      req_pkgs = path_and_pkg_by_basename[soname][resolved_path]
+      reason = ("provides %s/%s needed by %s"
+                % (resolved_path, soname, binary_info["path"]))
+      # Looking for deprecated libraries.  However, only alerting if the
+      # deprecated library is the first one found in the RPATH.  For example,
+      # libdb-4.7.so is found in CSWbdb and CSWbdb47, and it's important to
+      # throw an error if the RPATH is ("/opt/csw/lib", "/opt/csw/bdb47/lib"),
+      # and not to throw an error if RPATH is ("/opt/csw/bdb47/lib",
+      # "/opt/csw/lib")
+      if not first_lib:
+        first_lib = (resolved_path, soname)
+        for bad_path, bad_soname, msg in DEPRECATED_LIBRARY_LOCATIONS:
+          if resolved_path == bad_path and soname == bad_soname:
+            logger.debug("Bad lib found: %s/%s", bad_path, bad_soname)
+            error_mgr.ReportError(
+                pkgname,
+                "deprecated-library",
+                ("%s %s %s/%s"
+                 % (binary_info["path"], msg, resolved_path, soname)))
+      for req_pkg in req_pkgs:
+        alternative_deps.add((req_pkg, reason))
+  required_deps.append(list(alternative_deps))
+  if not resolved:
+    orphan_sonames.append((soname, binary_info["path"]))
+    if path_list:
+      path_msg = "was available at the following paths: %s." % path_list
+    else:
+      path_msg = ("was not present on the filesystem, "
+                  "nor in the packages under examination.")
+    if soname not in ALLOWED_ORPHAN_SONAMES:
+      messenger.Message(
+          "%s could not be resolved for %s, with rpath %s, expanded to %s, "
+          "while the file %s"
+          % (soname, binary_info["path"],
+             runpath_tuple, runpath_history, path_msg))
+  return orphan_sonames, required_deps
+
+
 def Libraries(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename,
               pkg_by_path):
   """Checks shared libraries.
@@ -49,66 +120,20 @@
   """
   pkgname = pkg_data["basic_stats"]["pkgname"]
   logger.debug("Libraries(): pkgname = %s", repr(pkgname))
+  isalist = pkg_data["isalist"]
+  ldd_emulator = checkpkg.LddEmulator()
   orphan_sonames = []
   required_deps = []
-  isalist = pkg_data["isalist"]
-  ldd_emulator = checkpkg.LddEmulator()
   for binary_info in pkg_data["binaries_dump_info"]:
     binary_path, binary_basename = os.path.split(binary_info["path"])
     for soname in binary_info["needed sonames"]:
-      resolved = False
-      path_list = path_and_pkg_by_basename[soname].keys()
-      # logger.debug("%s @ %s: looking for %s in %s",
-      #              soname,
-      #              binary_info["path"],
-      #              binary_info["runpath"],
-      #              path_list)
-      runpath_tuple = (tuple(binary_info["runpath"])
-                      + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
-      runpath_history = []
-      alternative_deps = set()
-      for runpath in runpath_tuple:
-        runpath = ldd_emulator.SanitizeRunpath(runpath)
-        runpath_list = ldd_emulator.ExpandRunpath(runpath, isalist, binary_path)
-        runpath_list = ldd_emulator.Emulate64BitSymlinks(runpath_list)
-        # To accumulate all the runpaths that we were looking at
-        runpath_history += runpath_list
-        resolved_path = ldd_emulator.ResolveSoname(runpath_list,
-                                                   soname,
-                                                   isalist,
-                                                   path_list,
-                                                   binary_path)
-        if resolved_path:
-          resolved = True
-          req_pkgs = path_and_pkg_by_basename[soname][resolved_path]
-          reason = ("provides %s/%s needed by %s"
-                    % (resolved_path, soname, binary_info["path"]))
-          # Looking for deprecated libraries.
-          for bad_path, bad_soname, msg in DEPRECATED_LIBRARY_LOCATIONS:
-            if resolved_path == bad_path and soname == bad_soname:
-              logger.debug("Bad lib found: %s/%s", bad_path, bad_soname)
-              error_mgr.ReportError(
-                  pkgname,
-                  "deprecated-library",
-                  ("%s %s %s/%s"
-                   % (binary_info["path"], msg, resolved_path, soname)))
-          for req_pkg in req_pkgs:
-            alternative_deps.add((req_pkg, reason))
-      # print "alternative_deps:", alternative_deps
-      required_deps.append(list(alternative_deps))
-      if not resolved:
-        orphan_sonames.append((soname, binary_info["path"]))
-        if path_list:
-          path_msg = "was available at the following paths: %s." % path_list
-        else:
-          path_msg = ("was not present on the filesystem, "
-                      "nor in the packages under examination.")
-        if soname not in ALLOWED_ORPHAN_SONAMES:
-          messenger.Message(
-              "%s could not be resolved for %s, with rpath %s, expanded to %s, "
-              "while the file %s"
-              % (soname, binary_info["path"],
-                 runpath_tuple, runpath_history, path_msg))
+      orphan_sonames_tmp, required_deps_tmp = ProcessSoname(
+          ldd_emulator,
+          soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger,
+          error_mgr,
+          pkgname, messenger)
+      orphan_sonames.extend(orphan_sonames_tmp)
+      required_deps.extend(required_deps_tmp)
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
     if soname not in ALLOWED_ORPHAN_SONAMES:

Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2010-09-01 21:26:08 UTC (rev 10884)
+++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -325,7 +325,9 @@
         checkpkg.SetCheckInterface)
     self.pkg_data = copy.deepcopy(sudo_stats)
 
-  def testOne(self):
+  def testLibrariesRpathOrder(self):
+    # pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename,
+    # pkg_by_path
     pass
 
 

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-09-01 21:26:08 UTC (rev 10884)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -466,6 +466,66 @@
     self.pkg_data = [self.pkg_data]
 
 
+class TestDeprecatedLibraries_GoodRpath(CheckpkgUnitTestHelper, unittest.TestCase):
+  FUNCTION_NAME = 'SetCheckLibraries'
+  def CheckpkgTest(self):
+    binaries_dump_info = self.pkg_data["binaries_dump_info"]
+    binaries_dump_info[0]["runpath"] = ("/opt/csw/bdb47/lib", "/opt/csw/lib",)
+    binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"]
+    self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", ""))
+    self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
+    self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({
+       u'/opt/csw/bdb47/lib':         [u'CSWbad'],
+       u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'],
+       u'/opt/csw/lib':               [u'CSWgood'],
+       u'/opt/csw/lib/sparcv9':       [u'CSWgood'],
+    })
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/man').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv8').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv9').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/doc').AndReturn(["CSWcommon"])
+    # There should be no error here, since /opt/csw/bdb47/lib is first in the RPATH.
+    self.pkg_data = [self.pkg_data]
+
+
+class TestDeprecatedLibraries_BadRpath(CheckpkgUnitTestHelper, unittest.TestCase):
+  FUNCTION_NAME = 'SetCheckLibraries'
+  def CheckpkgTest(self):
+    binaries_dump_info = self.pkg_data["binaries_dump_info"]
+    binaries_dump_info[0]["runpath"] = ("/opt/csw/lib", "/opt/csw/bdb47/lib",)
+    binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"]
+    self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", ""))
+    self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
+    self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({
+       u'/opt/csw/bdb47/lib':         [u'CSWbad'],
+       u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'],
+       u'/opt/csw/lib':               [u'CSWgood'],
+       u'/opt/csw/lib/sparcv9':       [u'CSWgood'],
+    })
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/man').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv8').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv9').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/doc').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.ReportError(
+        'CSWrsync',
+        'deprecated-library',
+        u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location '
+        u'/opt/csw/lib/libdb-4.7.so')
+    self.pkg_data = [self.pkg_data]
+
+
 class TestSetCheckLibmLinking(CheckpkgUnitTestHelper, unittest.TestCase):
   FUNCTION_NAME = 'SetCheckLibraries'
   def CheckpkgTest(self):

Added: csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py	2010-09-01 21:36:04 UTC (rev 10885)
@@ -0,0 +1,605 @@
+import datetime
+pkgstats = [{'bad_paths': {},
+  'basic_stats': {'catalogname': 'apr_util',
+                  'md5_sum': 'e19f2b377884db51cc20a88ff06c8eb7',
+                  'parsed_basename': {'arch': 'sparc',
+                                      'catalogname': 'apr_util',
+                                      'full_version_string': '1.3.9,REV=2010.08.27',
+                                      'osrel': 'SunOS5.9',
+                                      'revision_info': {'REV': '2010.08.27'},
+                                      'vendortag': 'CSW',
+                                      'version': '1.3.9',
+                                      'version_info': {'major version': '1',
+                                                       'minor version': '3',
+                                                       'patchlevel': '9'}},
+                  'pkg_basename': 'apr_util-1.3.9,REV=2010.08.27-SunOS5.9-sparc-CSW.pkg.gz',
+                  'pkg_path': '/tmp/pkg_bKg13A/apr_util-1.3.9,REV=2010.08.27-SunOS5.9-sparc-CSW.pkg.gz',
+                  'pkgname': 'CSWar-util',
+                  'stats_version': 9L},
+  'binaries': ['opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so',
+               'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so',
+               'opt/csw/lib/apr-util-1/apr_dbm_db-1.so',
+               'opt/csw/lib/apr-util-1/apr_ldap-1.so',
+               'opt/csw/lib/libaprutil-1.so.0.3.9'],
+  'binaries_dump_info': [{'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'apr_dbd_odbc-1.so',
+                          'needed sonames': ('libodbc.so.1', 'libc.so.1'),
+                          'path': 'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so',
+                          'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'),
+                          'soname': 'apr_dbd_odbc-1.so'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'apr_dbd_sqlite3-1.so',
+                          'needed sonames': ('libsqlite3.so.0',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so',
+                          'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'),
+                          'soname': 'apr_dbd_sqlite3-1.so'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'apr_dbm_db-1.so',
+                          'needed sonames': ('libdb-4.7.so', 'libc.so.1'),
+                          'path': 'opt/csw/lib/apr-util-1/apr_dbm_db-1.so',
+                          'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'),
+                          'soname': 'apr_dbm_db-1.so'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'apr_ldap-1.so',
+                          'needed sonames': ('libldap-2.4.so.2',
+                                             'libgen.so.1',
+                                             'libnet.so',
+                                             'libsasl2.so.2',
+                                             'libdl.so.1',
+                                             'libnsl.so.1',
+                                             'libresolv.so.2',
+                                             'libsocket.so.1',
+                                             'libssl.so.0.9.8',
+                                             'libcrypto.so.0.9.8',
+                                             'liblber-2.4.so.2',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/apr-util-1/apr_ldap-1.so',
+                          'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'),
+                          'soname': 'apr_ldap-1.so'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libaprutil-1.so.0.3.9',
+                          'needed sonames': ('libexpat.so.1',
+                                             'libiconv.so.2',
+                                             'libapr-1.so.0',
+                                             'libuuid.so.1',
+                                             'libsendfile.so.1',
+                                             'librt.so.1',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libpthread.so.1',
+                                             'libdl.so.1',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/libaprutil-1.so.0.3.9',
+                          'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'),
+                          'soname': 'libaprutil-1.so.0'}],
+  'depends': [('CSWcommon',
+               'CSWcommon common - common files and dirs for CSW packages '),
+              ('CSWapr', 'CSWapr apr - Apache Portable Runtime '),
+              ('CSWiconv', 'CSWiconv libiconv - GNU iconv library '),
+              ('CSWsqlite3rt',
+               'CSWsqlite3rt sqlite3_rt - An embeddable SQL engine in a C library runtime '),
+              ('CSWunixodbc',
+               'CSWunixodbc unixodbc - ODBC drivers for Unix systems '),
+              ('CSWexpat', 'CSWexpat expat - XML Parser Toolkit '),
+              ('CSWbdb47',
+               'CSWbdb47 berkeleydb47 - BerkeleyDB 4.7 embedded database libraries and utilities '),
+              ('CSWoldaprt',
+               'CSWoldaprt openldap_rt - OpenLDAP runtime libraries '),
+              ('CSWosslrt',
+               'CSWosslrt openssl_rt - Openssl runtime libraries '),
+              ('CSWsasl',
+               'CSWsasl sasl - Simple Authentication and Security Layer '),
+              ('CSWlibnet',
+               'CSWlibnet libnet - the libnet packet construction library ')],
+  'files_metadata': [{'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_ldap_option.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_memcache.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_dbd.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_sdbm.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apu_want.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_rmm.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_uri.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_ldap_rebind.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_ldap_url.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_reslist.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_anylock.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_date.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_thread_pool.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_hooks.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_dbm.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_optional.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_strmatch.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_queue.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_base64.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_ldap.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_ldap_init.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_optional_hooks.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_sha1.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_uuid.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_xml.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_xlate.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apu.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_md5.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apu_version.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_md4.h'},
+                     {'mime_type': 'text/x-c; charset=us-ascii',
+                      'path': 'opt/csw/include/apr_buckets.h'},
+                     {'mime_type': 'text/plain; charset=us-ascii',
+                      'path': 'opt/csw/lib/aprutil.exp'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/libaprutil-1.so.0.3.9'},
+                     {'mime_type': 'text/plain; charset=us-ascii',
+                      'path': 'opt/csw/lib/pkgconfig/apr-util-1.pc'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/apr-util-1/apr_ldap-1.so'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/apr-util-1/apr_dbm_db-1.so'},
+                     {'mime_type': 'text/plain; charset=us-ascii',
+                      'path': 'opt/csw/share/doc/apr_util/license'},
+                     {'mime_type': 'text/x-shellscript; charset=us-ascii',
+                      'path': 'opt/csw/bin/apu-1-config'}],
+  'isalist': ('sparcv9+vis2',
+              'sparcv9+vis',
+              'sparcv9',
+              'sparcv8plus+vis2',
+              'sparcv8plus+vis',
+              'sparcv8plus',
+              'sparcv8',
+              'sparcv8-fsmuld',
+              'sparcv7',
+              'sparc'),
+  'mtime': datetime.datetime(2010, 8, 27, 11, 0, 10),
+  'overrides': [],
+  'pkgchk': {'return_code': 0,
+             'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory',
+                              '/var/tmp/aaaIGaO6g/CSWar-util'],
+             'stdout_lines': ['Checking uninstalled stream format package <CSWar-util> from </tmp/pkg_bKg13A/apr_util-1.3.9,REV=2010.08.27-SunOS5.9-sparc-CSW.pkg>',
+                              '## Checking control scripts.',
+                              '## Checking package objects.',
+                              '## Checking is complete.']},
+  'pkginfo': {'ARCH': 'sparc',
+              'CATEGORY': 'application',
+              'CLASSES': 'none',
+              'EMAIL': 'maciej at opencsw.org',
+              'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+              'NAME': 'apr_util - Apache Portable Runtime Utilities',
+              'OPENCSW_BUNDLE': 'apr-util',
+              'OPENCSW_CATALOGNAME': 'apr_util',
+              'OPENCSW_MODE64': '32',
+              'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/apr-util/trunk at 10822',
+              'PKG': 'CSWar-util',
+              'PSTAMP': 'maciej at testing9s-20100827130000',
+              'VENDOR': 'http://apache.crihan.fr/dist/apr/ packaged for CSW by Maciej Blizinski',
+              'VERSION': '1.3.9,REV=2010.08.27',
+              'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'},
+  'pkgmap': [{'class': None,
+              'group': None,
+              'line': ': 1 0',
+              'mode': None,
+              'path': None,
+              'type': '1',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/bin/apu-1-config 0755 root bin 6437 35894 1282906794',
+              'mode': '0755',
+              'path': '/opt/csw/bin/apu-1-config',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_anylock.h 0644 root bin 5050 35768 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_anylock.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_base64.h 0644 root bin 3823 57460 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_base64.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_buckets.h 0644 root bin 60020 64941 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_buckets.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_date.h 0644 root bin 3554 13649 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_date.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_dbd.h 0644 root bin 24093 4453 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_dbd.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_dbm.h 0644 root bin 8599 26734 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_dbm.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_hooks.h 0644 root bin 8585 47295 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_hooks.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_ldap.h 0644 root bin 5704 7247 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_ldap.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_ldap_init.h 0644 root bin 5780 10710 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_ldap_init.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_ldap_option.h 0644 root bin 8604 41864 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_ldap_option.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_ldap_rebind.h 0644 root bin 3168 62596 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_ldap_rebind.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_ldap_url.h 0644 root bin 3799 32681 1282906791',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_ldap_url.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_md4.h 0644 root bin 4525 42434 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_md4.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_md5.h 0644 root bin 5573 519 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_md5.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_memcache.h 0644 root bin 17072 60128 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_memcache.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_optional.h 0644 root bin 2780 34306 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_optional.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_optional_hooks.h 0644 root bin 3869 64111 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_optional_hooks.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_queue.h 0644 root bin 4082 16636 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_queue.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_reslist.h 0644 root bin 6326 56986 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_reslist.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_rmm.h 0644 root bin 4778 15266 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_rmm.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_sdbm.h 0644 root bin 6113 34421 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_sdbm.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_sha1.h 0644 root bin 3884 57845 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_sha1.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_strmatch.h 0644 root bin 2677 28267 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_strmatch.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_thread_pool.h 0644 root bin 11104 60025 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_thread_pool.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_uri.h 0644 root bin 6589 55175 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_uri.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_uuid.h 0644 root bin 2102 40269 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_uuid.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_xlate.h 0644 root bin 6408 789 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_xlate.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apr_xml.h 0644 root bin 12357 61173 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apr_xml.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apu.h 0644 root bin 3560 23891 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apu.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apu_version.h 0644 root bin 4126 11796 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apu_version.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/include/apu_want.h 0644 root bin 1483 49830 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/include/apu_want.h',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/lib/apr-util-1 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/lib/apr-util-1',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so 0755 root bin 30580 5683 1282906789',
+              'mode': '0755',
+              'path': '/opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/apr-util-1/apr_dbd_odbc.so=apr_dbd_odbc-1.so',
+              'mode': None,
+              'path': '/opt/csw/lib/apr-util-1/apr_dbd_odbc.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so 0755 root bin 18044 2829 1282906788',
+              'mode': '0755',
+              'path': '/opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so=apr_dbd_sqlite3-1.so',
+              'mode': None,
+              'path': '/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/apr-util-1/apr_dbm_db-1.so 0755 root bin 9764 59811 1282906789',
+              'mode': '0755',
+              'path': '/opt/csw/lib/apr-util-1/apr_dbm_db-1.so',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/apr-util-1/apr_dbm_db.so=apr_dbm_db-1.so',
+              'mode': None,
+              'path': '/opt/csw/lib/apr-util-1/apr_dbm_db.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/apr-util-1/apr_ldap-1.so 0755 root bin 17916 9844 1282906790',
+              'mode': '0755',
+              'path': '/opt/csw/lib/apr-util-1/apr_ldap-1.so',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/apr-util-1/apr_ldap.so=apr_ldap-1.so',
+              'mode': None,
+              'path': '/opt/csw/lib/apr-util-1/apr_ldap.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/aprutil.exp 0644 root bin 5442 19740 1282906793',
+              'mode': '0644',
+              'path': '/opt/csw/lib/aprutil.exp',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libaprutil-1.so=libaprutil-1.so.0.3.9',
+              'mode': None,
+              'path': '/opt/csw/lib/libaprutil-1.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libaprutil-1.so.0=libaprutil-1.so.0.3.9',
+              'mode': None,
+              'path': '/opt/csw/lib/libaprutil-1.so.0',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/libaprutil-1.so.0.3.9 0755 root bin 272120 38251 1282906792',
+              'mode': '0755',
+              'path': '/opt/csw/lib/libaprutil-1.so.0.3.9',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/lib/pkgconfig 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/lib/pkgconfig',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/pkgconfig/apr-util-1.pc 0644 root bin 371 32716 1282906792',
+              'mode': '0644',
+              'path': '/opt/csw/lib/pkgconfig/apr-util-1.pc',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/doc/apr_util 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/doc/apr_util',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/doc/apr_util/license 0644 root bin 21179 51077 1282906796',
+              'mode': '0644',
+              'path': '/opt/csw/share/doc/apr_util/license',
+              'type': 'f',
+              'user': 'root'},
+             {'class': None,
+              'group': None,
+              'line': '1 i copyright 72 6789 1282906796',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i depend 614 54845 1282906800',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i pkginfo 528 44388 1282906809',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None}]}]
+


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

From wahwah at users.sourceforge.net  Wed Sep  1 23:42:06 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 01 Sep 2010 21:42:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10886] csw/mgar/pkg/python/trunk
Message-ID: <E1Oqv4I-0003gb-L4@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10886
          http://gar.svn.sourceforge.net/gar/?rev=10886&view=rev
Author:   wahwah
Date:     2010-09-01 21:42:06 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
python: Version bump to 2.6.6

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

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2010-09-01 21:36:04 UTC (rev 10885)
+++ csw/mgar/pkg/python/trunk/Makefile	2010-09-01 21:42:06 UTC (rev 10886)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = Python
-GARVERSION = 2.6.5
+GARVERSION = 2.6.6
 CATEGORIES = lang
 
 # Known issues:
@@ -9,6 +9,8 @@
 # - No 64-bit build
 # - ctypes module doesn't compile
 #   - http://forums.sun.com/thread.jspa?threadID=5148204
+#   - http://bugs.python.org/issue4902
+#     - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S
 
 SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION)
 
@@ -44,10 +46,12 @@
 PATCHFILES += site.diff
 PATCHFILES += python-config-in.diff
 PATCHFILES += setup.diff
+PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch
 
 # Test for sunaudiodev fails.
 SKIPTEST = 1
 
+EXTRA_INC += $(prefix)/bdb47/include
 EXTRA_LIB += $(prefix)/bdb47/lib
 
 BASECFLAGS = $(CFLAGS)
@@ -134,12 +138,18 @@
 # These won't be fixed.
 CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0
 CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0
-# Amusingly, now the overrides file contains the bad data.
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python
 
-# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-April/000648.html
-CHECKPKG_OVERRIDES_CSWpython-tk += linked-against-discouraged-library|_tkinter.so|libX11.so.4
+# This is an exception, since these are original Python packages.
+CHECKPKG_OVERRIDES_CSWpython-test  += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-test  += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython-tk    += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-tk    += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWidle         += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWidle         += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython-devel += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython       += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython       += catalogname-does-not-start-with-py_
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2010-09-01 21:36:04 UTC (rev 10885)
+++ csw/mgar/pkg/python/trunk/checksums	2010-09-01 21:42:06 UTC (rev 10886)
@@ -1,4 +1,5 @@
-6bef0417e71a1a1737ccf5750420fdb3  Python-2.6.5.tar.bz2
+62c1cbc3527d042195699edd2f4993b7  0001-FFI_DEFAULT_ABI-to-use-__i386.patch
+cf4e6881bb84a7ce6089e4a307f71f14  Python-2.6.6.tar.bz2
 42dd6523beb94a805d5764ae1276091c  faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  libpython2.5.so.1.0-isa-i386
 a87896c48b2f61b32053e6d02b07b022  libpython2.5.so.1.0-isa-sparcv8

Added: csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch
===================================================================
--- csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch	2010-09-01 21:42:06 UTC (rev 10886)
@@ -0,0 +1,29 @@
+From a793e4025581c9840eb053d57368aa74cb8e3e87 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 20 May 2010 18:07:22 +0200
+Subject: [PATCH] FFI_DEFAULT_ABI to use __i386
+
+---
+ Modules/_ctypes/libffi/src/x86/ffitarget.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/_ctypes/libffi/src/x86/ffitarget.h b/Modules/_ctypes/libffi/src/x86/ffitarget.h
+index 8178d06..d54d210 100644
+--- a/Modules/_ctypes/libffi/src/x86/ffitarget.h
++++ b/Modules/_ctypes/libffi/src/x86/ffitarget.h
+@@ -54,10 +54,10 @@ typedef enum ffi_abi {
+ #endif
+ 
+   /* ---- Intel x86 and AMD x86-64 - */
+-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
++#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
+   FFI_SYSV,
+   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+   FFI_DEFAULT_ABI = FFI_SYSV,
+ #else
+   FFI_DEFAULT_ABI = FFI_UNIX64,
+-- 
+1.7.1
+


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

From chninkel at users.sourceforge.net  Thu Sep  2 00:43:27 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 22:43:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10887] csw/mgar/pkg/openssh/trunk
Message-ID: <E1Oqw1f-0005Qr-5k@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10887
          http://gar.svn.sourceforge.net/gar/?rev=10887&view=rev
Author:   chninkel
Date:     2010-09-01 22:43:26 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssh: switched to dynamic prototype

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

Removed Paths:
-------------
    csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
    csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
    csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 22:43:26 UTC (rev 10887)
@@ -45,6 +45,36 @@
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
+PKGFILES_CSWossh = $(sbindir)/.*
+PKGFILES_CSWossh += $(docdir)/openssh/.*
+PKGFILES_CSWossh += $(mandir)/man5/sshd_config.5
+PKGFILES_CSWossh += $(mandir)/man8/sftp-server.8
+PKGFILES_CSWossh += $(mandir)/man8/sshd.8
+PKGFILES_CSWossh += $(libexecdir)/sftp-server
+PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
+PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
+PKGFILES_CSWossh += /var/empty
+PKGFILES_CSWossh += /etc$(prefix)/init.d/cswopenssh
+PKGFILES_CSWossh += /var$(prefix)/svc/manifest/network/cswopenssh.xml
+
+PKGFILES_CSWosshclient = $(bindir)/.*
+PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
+PKGFILES_CSWosshclient += $(mandir)/man1/.*
+PKGFILES_CSWosshclient += $(mandir)/man5/ssh_config.5
+PKGFILES_CSWosshclient += $(mandir)/man8/ssh-keysign.8
+PKGFILES_CSWosshclient += $(libexecdir)/ssh-keysign
+PKGFILES_CSWosshclient += $(sysconfdir)/ssh/ssh_config.CSW
+
+PROTOTYPE_MODIFIERS = setuid
+PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
+PROTOTYPE_PERMS_setuid = 4711
+
+
+PRESERVECONF = /opt/csw/etc/ssh/sshd_config
+PRESERVECONF += /opt/csw/etc/ssh/ssh_config
+PRESERVECONF += /opt/csw/etc/ssh/moduli
+INITSMF = /etc/opt/csw/init.d/cswopenssh
+
 # The openssh package installs the server and the client
 CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
 
@@ -56,9 +86,8 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWossh.prototype CSWossh.preinstall CSWossh.checkinstall
-DISTFILES += CSWosshlpk.prototype CSWosshlpk.preinstall CSWosshlpk.checkinstall
-DISTFILES += CSWosshclient.prototype
+DISTFILES += CSWossh.preinstall CSWossh.checkinstall
+DISTFILES += CSWosshlpk.preinstall CSWosshlpk.checkinstall
 DISTFILES += changelog.CSW
 
 DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
@@ -78,12 +107,13 @@
 
 # documentation files to install (not a gar variable)
 DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns 
-DOCFILES += README.platform README.privsep README.smartcard README.tun TODO WARNING.RNG    
+DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG    
 
 # we're using conf handling class from the cswclassutils package
 RUNTIME_DEP_PKGS += CSWcswclassutils
 
 
+
 ##### Build and installation information #####
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -133,11 +163,12 @@
 	@$(MAKECOOKIE)
 
 # adding documentation files
-pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files
+pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories
 
 merge-contrib-files:
 	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
 	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
+	chmod -x "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
 
 merge-init-files:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh"
@@ -149,19 +180,17 @@
 	for DOCDIR in $(foreach _PKG,$(PACKAGES),$(call catalogname,$(_PKG))); do \
 		ginstall -d $(PKGROOT)/$(docdir)/$$DOCDIR; \
 		(cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$DOCDIR/); \
+		(cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \
 		ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \
 	done
 	@$(MAKECOOKIE)
 
 merge-config-files:
-	ginstall $(PKGROOT)/$(sysconfdir)/ssh/ssh_config $(PKGROOT)/$(sysconfdir)/ssh/ssh_config.CSW 
-	ginstall $(PKGROOT)/$(sysconfdir)/ssh/moduli $(PKGROOT)/$(sysconfdir)/ssh/moduli.CSW 
 	# we change some default value in the server config file
-	sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' \
-		-e 's,/usr/libexec/,/opt/csw/libexec/,g' \
-		-e 's,^ *# *UsePAM *.*,UsePAM yes,g' \
-		-e 's,^ *# *PrintMotd *.*,PrintMotd no,g' \
-	       	-e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config" > "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW
+	perl -pi -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
+	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
 	@$(MAKECOOKIE)
 
-
+merge-special-directories:
+	ginstall -d $(PKGROOT)/var/empty
+	ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh

Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype	2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype	2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,32 +0,0 @@
-d none /opt/csw/etc/pkg/CSWossh 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswopenssh 0755 root bin
-d none /opt/csw/etc/ssh 0755 root bin
-f cswpreserveconf /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
-f cswpreserveconf /opt/csw/etc/ssh/moduli.CSW 0644 root bin
-d none /opt/csw/libexec 0755 root bin
-f none /opt/csw/libexec/sftp-server 0755 root bin
-f none /opt/csw/sbin/sshd 0755 root bin
-f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin
-d none /opt/csw/share/doc/openssh 0755 root bin
-f none /opt/csw/share/doc/openssh/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/openssh/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh/license=LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh/README 0644 root bin
-f none /opt/csw/share/doc/openssh/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh/WARNING.RNG 0644 root bin
-f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin
-f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
-f none /opt/csw/share/man/man8/sshd.8 0644 root bin
-d none /opt/csw/share/openssh 0755 root bin
-d none /var/empty
-f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys
-i checkpkg_override=checkpkg_override.CSWossh

Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype	2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype	2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,40 +0,0 @@
-f none /opt/csw/bin/scp 0755 root bin
-f none /opt/csw/bin/sftp 0755 root bin
-s none /opt/csw/bin/slogin=./ssh
-f none /opt/csw/bin/ssh 0755 root bin
-f none /opt/csw/bin/ssh-add 0755 root bin
-f none /opt/csw/bin/ssh-agent 0755 root bin
-f none /opt/csw/bin/ssh-copy-id 0755 root bin
-f none /opt/csw/bin/ssh-keygen 0755 root bin
-f none /opt/csw/bin/ssh-keyscan 0755 root bin
-d none /opt/csw/etc/ssh 0755 root bin
-f cswpreserveconf /opt/csw/etc/ssh/ssh_config.CSW 0644 root bin
-d none /opt/csw/libexec 0755 root bin
-f none /opt/csw/libexec/ssh-keysign 4711 root bin
-d none /opt/csw/share/doc/openssh_client 0755 root bin
-f none /opt/csw/share/doc/openssh_client/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/openssh_client/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh_client/license=LICENCE
-f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh_client/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh_client/WARNING.RNG 0644 root bin
-f none /opt/csw/share/man/man1/scp.1 0644 root bin
-f none /opt/csw/share/man/man1/sftp.1 0644 root bin
-s none /opt/csw/share/man/man1/slogin.1=./ssh.1
-f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-copy-id.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh.1 0644 root bin
-f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin
-f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin

Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype	2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype	2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,36 +0,0 @@
-d none /opt/csw/etc/pkg/CSWosshlpk 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswopenssh 0755 root bin
-f cswpreserveconf /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
-f cswpreserveconf /opt/csw/etc/ssh/moduli.CSW 0644 root bin
-d none /opt/csw/libexec 0755 root bin
-f none /opt/csw/libexec/sftp-server 0755 root bin
-f none /opt/csw/sbin/sshd 0755 root bin
-f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin
-f none /opt/csw/share/Ssh.bin 0644 root bin
-d none /opt/csw/share/doc/openssh_lpk 0755 root bin
-f none /opt/csw/share/doc/openssh_lpk/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh_lpk/license=LICENCE
-f none /opt/csw/share/doc/openssh_lpk/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.smartcard 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/WARNING.RNG 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/openssh-lpk_openldap.schema 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/openssh-lpk_sun.schema 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/lpk-user-example.txt 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.lpk 0644 root bin
-f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin
-f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
-f none /opt/csw/share/man/man8/sshd.8 0644 root bin
-d none /opt/csw/share/openssh 0755 root bin
-d none /var/empty
-f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-01 22:43:26 UTC (rev 10887)
@@ -3,6 +3,7 @@
   * New upstream release.
   * Removed patch applied upstream (derelativise_path_bugfix.patch 
   and dont_derelativise_authorizedkeysfile_option.patch).
+  * [Build system] Switched to dynamic prototype.
 
  -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 23:25:24 +0200
 


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

From chninkel at users.sourceforge.net  Thu Sep  2 00:45:15 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 01 Sep 2010 22:45:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10888] csw/mgar/pkg/openssh/trunk
Message-ID: <E1Oqw3P-0005VC-KC@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10888
          http://gar.svn.sourceforge.net/gar/?rev=10888&view=rev
Author:   chninkel
Date:     2010-09-01 22:45:15 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssh: readded openssh gsskex patch

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 22:43:26 UTC (rev 10887)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-01 22:45:15 UTC (rev 10888)
@@ -15,7 +15,7 @@
 GARNAME = openssh
 GARVERSION = 5.6p1
 GSSKEX_PATCH_VERSION = $(GARVERSION)
-GSSKEX_PATCH_DATE = 20100901
+GSSKEX_PATCH_DATE = 20100902
 CATEGORIES = server
 
 DESCRIPTION = OpenSSH Secure Shell

Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch	2010-09-01 22:45:15 UTC (rev 10888)
@@ -0,0 +1,2933 @@
+diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi
+--- openssh-5.4p1.orig/ChangeLog.gssapi	1970-01-01 01:00:00.000000000 +0100
++++ openssh-5.4p1/ChangeLog.gssapi	2010-03-13 00:39:22.276624764 +0100
+@@ -0,0 +1,95 @@
++20090615
++  - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
++      sshd.c ]
++    Fix issues identified by Greg Hudson following a code review
++	Check return value of gss_indicate_mechs
++	Protect GSSAPI calls in monitor, so they can only be used if enabled
++	Check return values of bignum functions in key exchange
++	Use BN_clear_free to clear other side's DH value
++	Make ssh_gssapi_id_kex more robust
++	Only configure kex table pointers if GSSAPI is enabled
++	Don't leak mechanism list, or gss mechanism list
++	Cast data.length before printing
++	If serverkey isn't provided, use an empty string, rather than NULL
++
++20090201
++  - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
++      ssh_config.5 sshconnet2.c ]
++    Add support for the GSSAPIClientIdentity option, which allows the user
++    to specify which GSSAPI identity to use to contact a given server
++
++20080404
++  - [ gss-serv.c ]
++    Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
++    been omitted from a previous version of this patch. Reported by Borislav
++    Stoichkov
++
++20070317
++  - [ gss-serv-krb5.c ]
++    Remove C99ism, where new_ccname was being declared in the middle of a 
++    function
++
++20061220
++  - [ servconf.c ]
++    Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and 
++    documented, behaviour. Reported by Dan Watson.
++
++20060910
++  - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
++      ssh-gss.h ]
++    add support for gss-group14-sha1 key exchange mechanisms
++  - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
++    Add GSSAPIStrictAcceptorCheck option to allow the disabling of
++    acceptor principal checking on multi-homed machines.
++    <Bugzilla #928>
++  - [ sshd_config ssh_config ]
++    Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
++    configuration files
++  - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
++    Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
++    Limit length of error messages displayed by client
++
++20060909
++  - [ gss-genr.c gss-serv.c ]
++    move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
++    only, where they belong 
++    <Bugzilla #1225>
++
++20060829
++  - [ gss-serv-krb5.c ]
++    Fix CCAPI credentials cache name when creating KRB5CCNAME environment 
++    variable
++
++20060828
++  - [ gss-genr.c ]
++    Avoid Heimdal context freeing problem
++    <Fixed upstream 20060829>
++
++20060818
++  - [ gss-genr.c ssh-gss.h sshconnect2.c ]
++    Make sure that SPENGO is disabled 
++    <Bugzilla #1218 - Fixed upstream 20060818>
++
++20060421
++  - [ gssgenr.c, sshconnect2.c ]
++    a few type changes (signed versus unsigned, int versus size_t) to
++    fix compiler errors/warnings 
++    (from jbasney AT ncsa.uiuc.edu)
++  - [ kexgssc.c, sshconnect2.c ]
++    fix uninitialized variable warnings
++    (from jbasney AT ncsa.uiuc.edu)
++  - [ gssgenr.c ]
++    pass oid to gss_display_status (helpful when using GSSAPI mechglue)
++    (from jbasney AT ncsa.uiuc.edu)
++    <Bugzilla #1220 >
++  - [ gss-serv-krb5.c ]
++    #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
++    (from jbasney AT ncsa.uiuc.edu)
++    <Fixed upstream 20060304>
++  - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c 
++    add client-side GssapiKeyExchange option
++    (from jbasney AT ncsa.uiuc.edu)
++  - [ sshconnect2.c ]
++    add support for GssapiTrustDns option for gssapi-with-mic
++    (from jbasney AT ncsa.uiuc.edu)
++    <gssapi-with-mic support is Bugzilla #1008>
+diff -Nur openssh-5.4p1.orig/Makefile.in openssh-5.4p1/Makefile.in
+--- openssh-5.4p1.orig/Makefile.in	2010-02-24 08:18:51.000000000 +0100
++++ openssh-5.4p1/Makefile.in	2010-03-13 00:39:54.547584984 +0100
+@@ -74,7 +74,7 @@
+ 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
+ 	kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \
+ 	entropy.o gss-genr.o umac.o jpake.o schnorr.o \
+-	ssh-pkcs11.o
++	ssh-pkcs11.o kexgssc.o
+ 
+ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ 	sshconnect.o sshconnect1.o sshconnect2.o mux.o \
+@@ -88,7 +88,7 @@
+ 	auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
+ 	monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
+ 	auth-krb5.o \
+-	auth2-gss.o gss-serv.o gss-serv-krb5.o \
++	auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
+ 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+ 	roaming_common.o roaming_serv.o
+diff -Nur openssh-5.4p1.orig/auth-krb5.c openssh-5.4p1/auth-krb5.c
+--- openssh-5.4p1.orig/auth-krb5.c	2009-12-21 00:49:22.000000000 +0100
++++ openssh-5.4p1/auth-krb5.c	2010-03-13 00:39:22.287877739 +0100
+@@ -170,8 +170,13 @@
+ 
+ 	len = strlen(authctxt->krb5_ticket_file) + 6;
+ 	authctxt->krb5_ccname = xmalloc(len);
++#ifdef USE_CCAPI
++	snprintf(authctxt->krb5_ccname, len, "API:%s",
++	    authctxt->krb5_ticket_file);
++#else
+ 	snprintf(authctxt->krb5_ccname, len, "FILE:%s",
+ 	    authctxt->krb5_ticket_file);
++#endif
+ 
+ #ifdef USE_PAM
+ 	if (options.use_pam)
+@@ -226,15 +231,22 @@
+ #ifndef HEIMDAL
+ krb5_error_code
+ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
+-	int tmpfd, ret;
++	int ret;
+ 	char ccname[40];
+ 	mode_t old_umask;
++#ifdef USE_CCAPI
++	char cctemplate[] = "API:krb5cc_%d";
++#else
++	char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
++	int tmpfd;
++#endif
+ 
+ 	ret = snprintf(ccname, sizeof(ccname),
+-	    "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
++	    cctemplate, geteuid());
+ 	if (ret < 0 || (size_t)ret >= sizeof(ccname))
+ 		return ENOMEM;
+ 
++#ifndef USE_CCAPI
+ 	old_umask = umask(0177);
+ 	tmpfd = mkstemp(ccname + strlen("FILE:"));
+ 	umask(old_umask);
+@@ -249,6 +261,7 @@
+ 		return errno;
+ 	}
+ 	close(tmpfd);
++#endif
+ 
+ 	return (krb5_cc_resolve(ctx, ccname, ccache));
+ }
+diff -Nur openssh-5.4p1.orig/auth.h openssh-5.4p1/auth.h
+--- openssh-5.4p1.orig/auth.h	2010-03-04 11:53:35.000000000 +0100
++++ openssh-5.4p1/auth.h	2010-03-13 00:39:22.290248539 +0100
+@@ -53,6 +53,7 @@
+ 	int		 valid;		/* user exists and is allowed to login */
+ 	int		 attempt;
+ 	int		 failures;
++	int		 server_caused_failure; 
+ 	int		 force_pwchange;
+ 	char		*user;		/* username sent by the client */
+ 	char		*service;
+diff -Nur openssh-5.4p1.orig/auth2-gss.c openssh-5.4p1/auth2-gss.c
+--- openssh-5.4p1.orig/auth2-gss.c	2007-12-02 12:59:45.000000000 +0100
++++ openssh-5.4p1/auth2-gss.c	2010-03-13 00:39:22.294875029 +0100
+@@ -1,7 +1,7 @@
+ /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */
+ 
+ /*
+- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -52,6 +52,40 @@
+ static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
+ static void input_gssapi_errtok(int, u_int32_t, void *);
+ 
++/* 
++ * The 'gssapi_keyex' userauth mechanism.
++ */
++static int
++userauth_gsskeyex(Authctxt *authctxt)
++{
++	int authenticated = 0;
++	Buffer b;
++	gss_buffer_desc mic, gssbuf;
++	u_int len;
++
++	mic.value = packet_get_string(&len);
++	mic.length = len;
++
++	packet_check_eom();
++
++	ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
++	    "gssapi-keyex");
++
++	gssbuf.value = buffer_ptr(&b);
++	gssbuf.length = buffer_len(&b);
++
++	/* gss_kex_context is NULL with privsep, so we can't check it here */
++	if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, 
++	    &gssbuf, &mic))))
++		authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
++		    authctxt->pw));
++	
++	buffer_free(&b);
++	xfree(mic.value);
++
++	return (authenticated);
++}
++
+ /*
+  * We only support those mechanisms that we know about (ie ones that we know
+  * how to check local user kuserok and the like)
+@@ -102,6 +136,7 @@
+ 
+ 	if (!present) {
+ 		xfree(doid);
++		authctxt->server_caused_failure = 1;
+ 		return (0);
+ 	}
+ 
+@@ -109,6 +144,7 @@
+ 		if (ctxt != NULL)
+ 			ssh_gssapi_delete_ctx(&ctxt);
+ 		xfree(doid);
++		authctxt->server_caused_failure = 1;
+ 		return (0);
+ 	}
+ 
+@@ -242,7 +278,8 @@
+ 
+ 	packet_check_eom();
+ 
+-	authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
++	authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
++	    authctxt->pw));
+ 
+ 	authctxt->postponed = 0;
+ 	dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
+@@ -277,7 +314,8 @@
+ 	gssbuf.length = buffer_len(&b);
+ 
+ 	if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
+-		authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
++		authenticated = 
++		    PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
+ 	else
+ 		logit("GSSAPI MIC check failed");
+ 
+@@ -292,6 +330,12 @@
+ 	userauth_finish(authctxt, authenticated, "gssapi-with-mic");
+ }
+ 
++Authmethod method_gsskeyex = {
++	"gssapi-keyex",
++	userauth_gsskeyex,
++	&options.gss_authentication
++};
++
+ Authmethod method_gssapi = {
+ 	"gssapi-with-mic",
+ 	userauth_gssapi,
+diff -Nur openssh-5.4p1.orig/auth2.c openssh-5.4p1/auth2.c
+--- openssh-5.4p1.orig/auth2.c	2009-06-22 08:11:07.000000000 +0200
++++ openssh-5.4p1/auth2.c	2010-03-13 00:39:22.298679511 +0100
+@@ -69,6 +69,7 @@
+ extern Authmethod method_kbdint;
+ extern Authmethod method_hostbased;
+ #ifdef GSSAPI
++extern Authmethod method_gsskeyex;
+ extern Authmethod method_gssapi;
+ #endif
+ #ifdef JPAKE
+@@ -79,6 +80,7 @@
+ 	&method_none,
+ 	&method_pubkey,
+ #ifdef GSSAPI
++	&method_gsskeyex,
+ 	&method_gssapi,
+ #endif
+ #ifdef JPAKE
+@@ -274,6 +276,7 @@
+ #endif
+ 
+ 	authctxt->postponed = 0;
++	authctxt->server_caused_failure = 0;
+ 
+ 	/* try to authenticate user */
+ 	m = authmethod_lookup(method);
+@@ -346,7 +349,8 @@
+ 	} else {
+ 
+ 		/* Allow initial try of "none" auth without failure penalty */
+-		if (authctxt->attempt > 1 || strcmp(method, "none") != 0)
++		if (!authctxt->server_caused_failure &&
++		    (authctxt->attempt > 1 || strcmp(method, "none") != 0))
+ 			authctxt->failures++;
+ 		if (authctxt->failures >= options.max_authtries) {
+ #ifdef SSH_AUDIT_EVENTS
+diff -Nur openssh-5.4p1.orig/clientloop.c openssh-5.4p1/clientloop.c
+--- openssh-5.4p1.orig/clientloop.c	2010-01-30 07:28:35.000000000 +0100
++++ openssh-5.4p1/clientloop.c	2010-03-13 00:39:22.309033482 +0100
+@@ -111,6 +111,10 @@
+ #include "msg.h"
+ #include "roaming.h"
+ 
++#ifdef GSSAPI
++#include "ssh-gss.h"
++#endif
++
+ /* import options */
+ extern Options options;
+ 
+@@ -1431,6 +1435,13 @@
+ 		/* Do channel operations unless rekeying in progress. */
+ 		if (!rekeying) {
+ 			channel_after_select(readset, writeset);
++
++			if (options.gss_renewal_rekey &&
++			    ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
++				debug("credentials updated - forcing rekey");
++				need_rekeying = 1;
++			}
++
+ 			if (need_rekeying || packet_need_rekeying()) {
+ 				debug("need rekeying");
+ 				xxx_kex->done = 0;
+diff -Nur openssh-5.4p1.orig/configure.ac openssh-5.4p1/configure.ac
+--- openssh-5.4p1.orig/configure.ac	2010-03-05 05:04:35.000000000 +0100
++++ openssh-5.4p1/configure.ac	2010-03-13 00:39:22.319807465 +0100
+@@ -477,6 +477,30 @@
+ 	    [Use tunnel device compatibility to OpenBSD])
+ 	AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
+ 	    [Prepend the address family to IP tunnel traffic])
++	AC_MSG_CHECKING(if we have the Security Authorization Session API)
++	AC_TRY_COMPILE([#include <Security/AuthSession.h>],
++		[SessionCreate(0, 0);],
++		[ac_cv_use_security_session_api="yes"
++		 AC_DEFINE(USE_SECURITY_SESSION_API, 1, 
++			[platform has the Security Authorization Session API])
++		 LIBS="$LIBS -framework Security"
++		 AC_MSG_RESULT(yes)],
++		[ac_cv_use_security_session_api="no"
++		 AC_MSG_RESULT(no)])
++	AC_MSG_CHECKING(if we have an in-memory credentials cache)
++	AC_TRY_COMPILE(
++		[#include <Kerberos/Kerberos.h>],
++		[cc_context_t c;
++		 (void) cc_initialize (&c, 0, NULL, NULL);],
++		[AC_DEFINE(USE_CCAPI, 1, 
++			[platform uses an in-memory credentials cache])
++		 LIBS="$LIBS -framework Security"
++		 AC_MSG_RESULT(yes)
++		 if test "x$ac_cv_use_security_session_api" = "xno"; then
++			AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***)
++		fi],
++		[AC_MSG_RESULT(no)]
++	)
+ 	m4_pattern_allow(AU_IPv)
+ 	AC_CHECK_DECL(AU_IPv4, [], 
+ 	    AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
+diff -Nur openssh-5.4p1.orig/gss-genr.c openssh-5.4p1/gss-genr.c
+--- openssh-5.4p1.orig/gss-genr.c	2009-06-22 08:11:07.000000000 +0200
++++ openssh-5.4p1/gss-genr.c	2010-03-13 00:39:22.326293909 +0100
+@@ -1,7 +1,7 @@
+ /* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */
+ 
+ /*
+- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -39,12 +39,167 @@
+ #include "buffer.h"
+ #include "log.h"
+ #include "ssh2.h"
++#include "cipher.h"
++#include "key.h"
++#include "kex.h"
++#include <openssl/evp.h>
+ 
+ #include "ssh-gss.h"
+ 
+ extern u_char *session_id2;
+ extern u_int session_id2_len;
+ 
++typedef struct {
++	char *encoded;
++	gss_OID oid;
++} ssh_gss_kex_mapping;
++
++/*
++ * XXX - It would be nice to find a more elegant way of handling the
++ * XXX   passing of the key exchange context to the userauth routines
++ */
++
++Gssctxt *gss_kex_context = NULL;
++
++static ssh_gss_kex_mapping *gss_enc2oid = NULL;
++
++int 
++ssh_gssapi_oid_table_ok() {
++	return (gss_enc2oid != NULL);
++}
++
++/*
++ * Return a list of the gss-group1-sha1 mechanisms supported by this program
++ *
++ * We test mechanisms to ensure that we can use them, to avoid starting
++ * a key exchange with a bad mechanism
++ */
++
++char *
++ssh_gssapi_client_mechanisms(const char *host, const char *client) {
++	gss_OID_set gss_supported;
++	OM_uint32 min_status;
++
++	if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
++		return NULL;
++
++	return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
++	    host, client));
++}
++
++char *
++ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
++    const char *host, const char *client) {
++	Buffer buf;
++	size_t i;
++	int oidpos, enclen;
++	char *mechs, *encoded;
++	u_char digest[EVP_MAX_MD_SIZE];
++	char deroid[2];
++	const EVP_MD *evp_md = EVP_md5();
++	EVP_MD_CTX md;
++
++	if (gss_enc2oid != NULL) {
++		for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
++			xfree(gss_enc2oid[i].encoded);
++		xfree(gss_enc2oid);
++	}
++
++	gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
++	    (gss_supported->count + 1));
++
++	buffer_init(&buf);
++
++	oidpos = 0;
++	for (i = 0; i < gss_supported->count; i++) {
++		if (gss_supported->elements[i].length < 128 &&
++		    (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
++
++			deroid[0] = SSH_GSS_OIDTYPE;
++			deroid[1] = gss_supported->elements[i].length;
++
++			EVP_DigestInit(&md, evp_md);
++			EVP_DigestUpdate(&md, deroid, 2);
++			EVP_DigestUpdate(&md,
++			    gss_supported->elements[i].elements,
++			    gss_supported->elements[i].length);
++			EVP_DigestFinal(&md, digest, NULL);
++
++			encoded = xmalloc(EVP_MD_size(evp_md) * 2);
++			enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
++			    encoded, EVP_MD_size(evp_md) * 2);
++
++			if (oidpos != 0)
++				buffer_put_char(&buf, ',');
++
++			buffer_append(&buf, KEX_GSS_GEX_SHA1_ID,
++			    sizeof(KEX_GSS_GEX_SHA1_ID) - 1);
++			buffer_append(&buf, encoded, enclen);
++			buffer_put_char(&buf, ',');
++			buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, 
++			    sizeof(KEX_GSS_GRP1_SHA1_ID) - 1);
++			buffer_append(&buf, encoded, enclen);
++			buffer_put_char(&buf, ',');
++			buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID,
++			    sizeof(KEX_GSS_GRP14_SHA1_ID) - 1);
++			buffer_append(&buf, encoded, enclen);
++
++			gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
++			gss_enc2oid[oidpos].encoded = encoded;
++			oidpos++;
++		}
++	}
++	gss_enc2oid[oidpos].oid = NULL;
++	gss_enc2oid[oidpos].encoded = NULL;
++
++	buffer_put_char(&buf, '\0');
++
++	mechs = xmalloc(buffer_len(&buf));
++	buffer_get(&buf, mechs, buffer_len(&buf));
++	buffer_free(&buf);
++
++	if (strlen(mechs) == 0) {
++		xfree(mechs);
++		mechs = NULL;
++	}
++	
++	return (mechs);
++}
++
++gss_OID
++ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
++	int i = 0;
++	
++	switch (kex_type) {
++	case KEX_GSS_GRP1_SHA1:
++		if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
++			return GSS_C_NO_OID;
++		name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
++		break;
++	case KEX_GSS_GRP14_SHA1:
++		if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
++			return GSS_C_NO_OID;
++		name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
++		break;
++	case KEX_GSS_GEX_SHA1:
++		if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
++			return GSS_C_NO_OID;
++		name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
++		break;
++	default:
++		return GSS_C_NO_OID;
++	}
++
++	while (gss_enc2oid[i].encoded != NULL &&
++	    strcmp(name, gss_enc2oid[i].encoded) != 0)
++		i++;
++
++	if (gss_enc2oid[i].oid != NULL && ctx != NULL)
++		ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
++
++	return gss_enc2oid[i].oid;
++}
++
+ /* Check that the OID in a data stream matches that in the context */
+ int
+ ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
+@@ -197,7 +352,7 @@
+ 	}
+ 
+ 	ctx->major = gss_init_sec_context(&ctx->minor,
+-	    GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
++	    ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
+ 	    GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
+ 	    0, NULL, recv_tok, NULL, send_tok, flags, NULL);
+ 
+@@ -227,8 +382,42 @@
+ }
+ 
+ OM_uint32
++ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
++{
++	gss_buffer_desc gssbuf;
++	gss_name_t gssname;
++	OM_uint32 status;
++	gss_OID_set oidset;
++
++	gssbuf.value = (void *) name;
++	gssbuf.length = strlen(gssbuf.value);
++
++	gss_create_empty_oid_set(&status, &oidset);
++	gss_add_oid_set_member(&status, ctx->oid, &oidset);
++
++	ctx->major = gss_import_name(&ctx->minor, &gssbuf,
++	    GSS_C_NT_USER_NAME, &gssname);
++
++	if (!ctx->major)
++		ctx->major = gss_acquire_cred(&ctx->minor, 
++		    gssname, 0, oidset, GSS_C_INITIATE, 
++		    &ctx->client_creds, NULL, NULL);
++
++	gss_release_name(&status, &gssname);
++	gss_release_oid_set(&status, &oidset);
++
++	if (ctx->major)
++		ssh_gssapi_error(ctx);
++
++	return(ctx->major);
++}
++
++OM_uint32
+ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
+ {
++	if (ctx == NULL) 
++		return -1;
++
+ 	if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
+ 	    GSS_C_QOP_DEFAULT, buffer, hash)))
+ 		ssh_gssapi_error(ctx);
+@@ -236,6 +425,19 @@
+ 	return (ctx->major);
+ }
+ 
++/* Priviledged when used by server */
++OM_uint32
++ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
++{
++	if (ctx == NULL)
++		return -1;
++
++	ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
++	    gssbuf, gssmic, NULL);
++
++	return (ctx->major);
++}
++
+ void
+ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
+     const char *context)
+@@ -249,11 +451,16 @@
+ }
+ 
+ int
+-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
++ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, 
++    const char *client)
+ {
+ 	gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+ 	OM_uint32 major, minor;
+ 	gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
++	Gssctxt *intctx = NULL;
++
++	if (ctx == NULL)
++		ctx = &intctx;
+ 
+ 	/* RFC 4462 says we MUST NOT do SPNEGO */
+ 	if (oid->length == spnego_oid.length && 
+@@ -263,6 +470,10 @@
+ 	ssh_gssapi_build_ctx(ctx);
+ 	ssh_gssapi_set_oid(*ctx, oid);
+ 	major = ssh_gssapi_import_name(*ctx, host);
++
++	if (!GSS_ERROR(major) && client)
++		major = ssh_gssapi_client_identity(*ctx, client);
++
+ 	if (!GSS_ERROR(major)) {
+ 		major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, 
+ 		    NULL);
+@@ -272,10 +483,67 @@
+ 			    GSS_C_NO_BUFFER);
+ 	}
+ 
+-	if (GSS_ERROR(major)) 
++	if (GSS_ERROR(major) || intctx != NULL) 
+ 		ssh_gssapi_delete_ctx(ctx);
+ 
+ 	return (!GSS_ERROR(major));
+ }
+ 
++int
++ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
++	static gss_name_t saved_name = GSS_C_NO_NAME;
++	static OM_uint32 saved_lifetime = 0;
++	static gss_OID saved_mech = GSS_C_NO_OID;
++	static gss_name_t name;
++	static OM_uint32 last_call = 0;
++	OM_uint32 lifetime, now, major, minor;
++	int equal;
++	gss_cred_usage_t usage = GSS_C_INITIATE;
++	
++	now = time(NULL);
++
++	if (ctxt) {
++		debug("Rekey has happened - updating saved versions");
++
++		if (saved_name != GSS_C_NO_NAME)
++			gss_release_name(&minor, &saved_name);
++
++		major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
++		    &saved_name, &saved_lifetime, NULL, NULL);
++
++		if (!GSS_ERROR(major)) {
++			saved_mech = ctxt->oid;
++		        saved_lifetime+= now;
++		} else {
++			/* Handle the error */
++		}
++		return 0;
++	}
++
++	if (now - last_call < 10)
++		return 0;
++
++	last_call = now;
++
++	if (saved_mech == GSS_C_NO_OID)
++		return 0;
++	
++	major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, 
++	    &name, &lifetime, NULL, NULL);
++	if (major == GSS_S_CREDENTIALS_EXPIRED)
++		return 0;
++	else if (GSS_ERROR(major))
++		return 0;
++
++	major = gss_compare_name(&minor, saved_name, name, &equal);
++	gss_release_name(&minor, &name);
++	if (GSS_ERROR(major))
++		return 0;
++
++	if (equal && (saved_lifetime < lifetime + now - 10))
++		return 1;
++
++	return 0;
++}
++
+ #endif /* GSSAPI */
+diff -Nur openssh-5.4p1.orig/gss-serv-krb5.c openssh-5.4p1/gss-serv-krb5.c
+--- openssh-5.4p1.orig/gss-serv-krb5.c	2006-09-01 07:38:36.000000000 +0200
++++ openssh-5.4p1/gss-serv-krb5.c	2010-03-13 00:39:22.329666310 +0100
+@@ -1,7 +1,7 @@
+ /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
+ 
+ /*
+- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -120,6 +120,7 @@
+ 	krb5_principal princ;
+ 	OM_uint32 maj_status, min_status;
+ 	int len;
++	const char *new_ccname;
+ 
+ 	if (client->creds == NULL) {
+ 		debug("No credentials stored");
+@@ -168,11 +169,16 @@
+ 		return;
+ 	}
+ 
+-	client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
++	new_ccname = krb5_cc_get_name(krb_context, ccache);
++
+ 	client->store.envvar = "KRB5CCNAME";
+-	len = strlen(client->store.filename) + 6;
+-	client->store.envval = xmalloc(len);
+-	snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
++#ifdef USE_CCAPI
++	xasprintf(&client->store.envval, "API:%s", new_ccname);
++	client->store.filename = NULL;
++#else
++	xasprintf(&client->store.envval, "FILE:%s", new_ccname);
++	client->store.filename = xstrdup(new_ccname);
++#endif
+ 
+ #ifdef USE_PAM
+ 	if (options.use_pam)
+@@ -184,6 +190,71 @@
+ 	return;
+ }
+ 
++int
++ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, 
++    ssh_gssapi_client *client)
++{
++	krb5_ccache ccache = NULL;
++	krb5_principal principal = NULL;
++	char *name = NULL;
++	krb5_error_code problem;
++	OM_uint32 maj_status, min_status;
++
++   	if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
++                logit("krb5_cc_resolve(): %.100s",
++                    krb5_get_err_text(krb_context, problem));
++                return 0;
++       	}
++	
++	/* Find out who the principal in this cache is */
++	if ((problem = krb5_cc_get_principal(krb_context, ccache, 
++	    &principal))) {
++		logit("krb5_cc_get_principal(): %.100s",
++		    krb5_get_err_text(krb_context, problem));
++		krb5_cc_close(krb_context, ccache);
++		return 0;
++	}
++
++	if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
++		logit("krb5_unparse_name(): %.100s",
++		    krb5_get_err_text(krb_context, problem));
++		krb5_free_principal(krb_context, principal);
++		krb5_cc_close(krb_context, ccache);
++		return 0;
++	}
++
++
++	if (strcmp(name,client->exportedname.value)!=0) {
++		debug("Name in local credentials cache differs. Not storing");
++		krb5_free_principal(krb_context, principal);
++		krb5_cc_close(krb_context, ccache);
++		krb5_free_unparsed_name(krb_context, name);
++		return 0;
++	}
++	krb5_free_unparsed_name(krb_context, name);
++
++	/* Name matches, so lets get on with it! */
++
++	if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
++		logit("krb5_cc_initialize(): %.100s",
++		    krb5_get_err_text(krb_context, problem));
++		krb5_free_principal(krb_context, principal);
++		krb5_cc_close(krb_context, ccache);
++		return 0;
++	}
++
++	krb5_free_principal(krb_context, principal);
++
++	if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
++	    ccache))) {
++		logit("gss_krb5_copy_ccache() failed. Sorry!");
++		krb5_cc_close(krb_context, ccache);
++		return 0;
++	}
++
++	return 1;
++}
++
+ ssh_gssapi_mech gssapi_kerberos_mech = {
+ 	"toWM5Slw5Ew8Mqkay+al2g==",
+ 	"Kerberos",
+@@ -191,7 +262,8 @@
+ 	NULL,
+ 	&ssh_gssapi_krb5_userok,
+ 	NULL,
+-	&ssh_gssapi_krb5_storecreds
++	&ssh_gssapi_krb5_storecreds,
++	&ssh_gssapi_krb5_updatecreds
+ };
+ 
+ #endif /* KRB5 */
+diff -Nur openssh-5.4p1.orig/gss-serv.c openssh-5.4p1/gss-serv.c
+--- openssh-5.4p1.orig/gss-serv.c	2008-05-19 07:05:07.000000000 +0200
++++ openssh-5.4p1/gss-serv.c	2010-03-13 00:39:22.335213222 +0100
+@@ -1,7 +1,7 @@
+ /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */
+ 
+ /*
+- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -45,15 +45,20 @@
+ #include "channels.h"
+ #include "session.h"
+ #include "misc.h"
++#include "servconf.h"
++#include "uidswap.h"
+ 
+ #include "ssh-gss.h"
++#include "monitor_wrap.h"
++
++extern ServerOptions options;
+ 
+ static ssh_gssapi_client gssapi_client =
+     { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
+-    GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}};
++    GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME,  NULL, {NULL, NULL, NULL}, 0, 0};
+ 
+ ssh_gssapi_mech gssapi_null_mech =
+-    { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
++    { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
+ 
+ #ifdef KRB5
+ extern ssh_gssapi_mech gssapi_kerberos_mech;
+@@ -81,25 +86,32 @@
+ 	char lname[MAXHOSTNAMELEN];
+ 	gss_OID_set oidset;
+ 
+-	gss_create_empty_oid_set(&status, &oidset);
+-	gss_add_oid_set_member(&status, ctx->oid, &oidset);
++	if (options.gss_strict_acceptor) {
++		gss_create_empty_oid_set(&status, &oidset);
++		gss_add_oid_set_member(&status, ctx->oid, &oidset);
++
++		if (gethostname(lname, MAXHOSTNAMELEN)) {
++			gss_release_oid_set(&status, &oidset);
++			return (-1);
++		}
+ 
+-	if (gethostname(lname, MAXHOSTNAMELEN)) {
+-		gss_release_oid_set(&status, &oidset);
+-		return (-1);
+-	}
++		if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
++			gss_release_oid_set(&status, &oidset);
++			return (ctx->major);
++		}
++
++		if ((ctx->major = gss_acquire_cred(&ctx->minor,
++		    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, 
++		    NULL, NULL)))
++			ssh_gssapi_error(ctx);
+ 
+-	if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
+ 		gss_release_oid_set(&status, &oidset);
+ 		return (ctx->major);
++	} else {
++		ctx->name = GSS_C_NO_NAME;
++		ctx->creds = GSS_C_NO_CREDENTIAL;
+ 	}
+-
+-	if ((ctx->major = gss_acquire_cred(&ctx->minor,
+-	    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
+-		ssh_gssapi_error(ctx);
+-
+-	gss_release_oid_set(&status, &oidset);
+-	return (ctx->major);
++	return GSS_S_COMPLETE;
+ }
+ 
+ /* Privileged */
+@@ -114,6 +126,29 @@
+ }
+ 
+ /* Unprivileged */
++char *
++ssh_gssapi_server_mechanisms() {
++	gss_OID_set	supported;
++
++	ssh_gssapi_supported_oids(&supported);
++	return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
++	    NULL, NULL));
++}
++
++/* Unprivileged */
++int
++ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
++    const char *dummy) {
++	Gssctxt *ctx = NULL;
++	int res;
++ 
++	res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
++	ssh_gssapi_delete_ctx(&ctx);
++
++	return (res);
++}
++
++/* Unprivileged */
+ void
+ ssh_gssapi_supported_oids(gss_OID_set *oidset)
+ {
+@@ -123,7 +158,9 @@
+ 	gss_OID_set supported;
+ 
+ 	gss_create_empty_oid_set(&min_status, oidset);
+-	gss_indicate_mechs(&min_status, &supported);
++
++	if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
++		return;
+ 
+ 	while (supported_mechs[i]->name != NULL) {
+ 		if (GSS_ERROR(gss_test_oid_set_member(&min_status,
+@@ -247,8 +284,48 @@
+ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
+ {
+ 	int i = 0;
++	int equal = 0;
++	gss_name_t new_name = GSS_C_NO_NAME;
++	gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
++
++	if (options.gss_store_rekey && client->used && ctx->client_creds) {
++		if (client->mech->oid.length != ctx->oid->length ||
++		    (memcmp(client->mech->oid.elements,
++		     ctx->oid->elements, ctx->oid->length) !=0)) {
++			debug("Rekeyed credentials have different mechanism");
++			return GSS_S_COMPLETE;
++		}
++
++		if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, 
++		    ctx->client_creds, ctx->oid, &new_name, 
++		    NULL, NULL, NULL))) {
++			ssh_gssapi_error(ctx);
++			return (ctx->major);
++		}
++
++		ctx->major = gss_compare_name(&ctx->minor, client->name, 
++		    new_name, &equal);
+ 
+-	gss_buffer_desc ename;
++		if (GSS_ERROR(ctx->major)) {
++			ssh_gssapi_error(ctx);
++			return (ctx->major);
++		}
++ 
++		if (!equal) {
++			debug("Rekeyed credentials have different name");
++			return GSS_S_COMPLETE;
++		}
++
++		debug("Marking rekeyed credentials for export");
++
++		gss_release_name(&ctx->minor, &client->name);
++		gss_release_cred(&ctx->minor, &client->creds);
++		client->name = new_name;
++		client->creds = ctx->client_creds;
++        	ctx->client_creds = GSS_C_NO_CREDENTIAL;
++		client->updated = 1;
++		return GSS_S_COMPLETE;
++	}
+ 
+ 	client->mech = NULL;
+ 
+@@ -263,6 +340,13 @@
+ 	if (client->mech == NULL)
+ 		return GSS_S_FAILURE;
+ 
++	if (ctx->client_creds &&
++	    (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
++	     ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
++		ssh_gssapi_error(ctx);
++		return (ctx->major);
++	}
++
+ 	if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
+ 	    &client->displayname, NULL))) {
+ 		ssh_gssapi_error(ctx);
+@@ -280,6 +364,8 @@
+ 		return (ctx->major);
+ 	}
+ 
++	gss_release_buffer(&ctx->minor, &ename);
++
+ 	/* We can't copy this structure, so we just move the pointer to it */
+ 	client->creds = ctx->client_creds;
+ 	ctx->client_creds = GSS_C_NO_CREDENTIAL;
+@@ -327,7 +413,7 @@
+ 
+ /* Privileged */
+ int
+-ssh_gssapi_userok(char *user)
++ssh_gssapi_userok(char *user, struct passwd *pw)
+ {
+ 	OM_uint32 lmin;
+ 
+@@ -337,9 +423,11 @@
+ 		return 0;
+ 	}
+ 	if (gssapi_client.mech && gssapi_client.mech->userok)
+-		if ((*gssapi_client.mech->userok)(&gssapi_client, user))
++		if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
++			gssapi_client.used = 1;
++			gssapi_client.store.owner = pw;
+ 			return 1;
+-		else {
++		} else {
+ 			/* Destroy delegated credentials if userok fails */
+ 			gss_release_buffer(&lmin, &gssapi_client.displayname);
+ 			gss_release_buffer(&lmin, &gssapi_client.exportedname);
+@@ -352,14 +440,90 @@
+ 	return (0);
+ }
+ 
+-/* Privileged */
+-OM_uint32
+-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
++/* These bits are only used for rekeying. The unpriviledged child is running 
++ * as the user, the monitor is root.
++ *
++ * In the child, we want to :
++ *    *) Ask the monitor to store our credentials into the store we specify
++ *    *) If it succeeds, maybe do a PAM update
++ */
++
++/* Stuff for PAM */
++
++#ifdef USE_PAM
++static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, 
++    struct pam_response **resp, void *data)
+ {
+-	ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
+-	    gssbuf, gssmic, NULL);
++	return (PAM_CONV_ERR);
++}
++#endif
+ 
+-	return (ctx->major);
++void
++ssh_gssapi_rekey_creds() {
++	int ok;
++	int ret;
++#ifdef USE_PAM
++	pam_handle_t *pamh = NULL;
++	struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
++	char *envstr;
++#endif
++
++	if (gssapi_client.store.filename == NULL && 
++	    gssapi_client.store.envval == NULL &&
++	    gssapi_client.store.envvar == NULL)
++		return;
++ 
++	ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
++
++	if (!ok)
++		return;
++
++	debug("Rekeyed credentials stored successfully");
++
++	/* Actually managing to play with the ssh pam stack from here will
++	 * be next to impossible. In any case, we may want different options
++	 * for rekeying. So, use our own :)
++	 */
++#ifdef USE_PAM	
++	if (!use_privsep) {
++		debug("Not even going to try and do PAM with privsep disabled");
++		return;
++	}
++
++	ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
++ 	    &pamconv, &pamh);
++	if (ret)
++		return;
++
++	xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, 
++	    gssapi_client.store.envval);
++
++	ret = pam_putenv(pamh, envstr);
++	if (!ret)
++		pam_setcred(pamh, PAM_REINITIALIZE_CRED);
++	pam_end(pamh, PAM_SUCCESS);
++#endif
++}
++
++int 
++ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
++	int ok = 0;
++
++	/* Check we've got credentials to store */
++	if (!gssapi_client.updated)
++		return 0;
++
++	gssapi_client.updated = 0;
++
++	temporarily_use_uid(gssapi_client.store.owner);
++	if (gssapi_client.mech && gssapi_client.mech->updatecreds)
++		ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
++	else
++		debug("No update function for this mechanism");
++
++	restore_uid();
++
++	return ok;
+ }
+ 
+ #endif
+diff -Nur openssh-5.4p1.orig/kex.c openssh-5.4p1/kex.c
+--- openssh-5.4p1.orig/kex.c	2010-01-08 06:50:41.000000000 +0100
++++ openssh-5.4p1/kex.c	2010-03-13 00:39:22.339231004 +0100
+@@ -50,6 +50,10 @@
+ #include "monitor.h"
+ #include "roaming.h"
+ 
++#ifdef GSSAPI
++#include "ssh-gss.h"
++#endif
++
+ #if OPENSSL_VERSION_NUMBER >= 0x00907000L
+ # if defined(HAVE_EVP_SHA256)
+ # define evp_ssh_sha256 EVP_sha256
+@@ -326,6 +330,20 @@
+ 		k->kex_type = KEX_DH_GEX_SHA256;
+ 		k->evp_md = evp_ssh_sha256();
+ #endif
++#ifdef GSSAPI
++	} else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
++	    sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) {
++		k->kex_type = KEX_GSS_GEX_SHA1;
++		k->evp_md = EVP_sha1();
++	} else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID,
++	    sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) {
++		k->kex_type = KEX_GSS_GRP1_SHA1;
++		k->evp_md = EVP_sha1();
++	} else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID,
++	    sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) {
++		k->kex_type = KEX_GSS_GRP14_SHA1;
++		k->evp_md = EVP_sha1();
++#endif
+ 	} else
+ 		fatal("bad kex alg %s", k->name);
+ }
+diff -Nur openssh-5.4p1.orig/kex.h openssh-5.4p1/kex.h
+--- openssh-5.4p1.orig/kex.h	2010-02-26 21:55:05.000000000 +0100
++++ openssh-5.4p1/kex.h	2010-03-13 00:39:22.342872379 +0100
+@@ -67,6 +67,9 @@
+ 	KEX_DH_GRP14_SHA1,
+ 	KEX_DH_GEX_SHA1,
+ 	KEX_DH_GEX_SHA256,
++	KEX_GSS_GRP1_SHA1,
++	KEX_GSS_GRP14_SHA1,
++	KEX_GSS_GEX_SHA1,
+ 	KEX_MAX
+ };
+ 
+@@ -123,6 +126,12 @@
+ 	sig_atomic_t done;
+ 	int	flags;
+ 	const EVP_MD *evp_md;
++#ifdef GSSAPI
++	int	gss_deleg_creds;
++	int	gss_trust_dns;
++	char    *gss_host;
++	char	*gss_client;
++#endif
+ 	char	*client_version_string;
+ 	char	*server_version_string;
+ 	int	(*verify_host_key)(Key *);
+@@ -146,6 +155,11 @@
+ void	 kexgex_client(Kex *);
+ void	 kexgex_server(Kex *);
+ 
++#ifdef GSSAPI
++void	kexgss_client(Kex *);
++void	kexgss_server(Kex *);
++#endif
++
+ void
+ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
+     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
+diff -Nur openssh-5.4p1.orig/kexgssc.c openssh-5.4p1/kexgssc.c
+--- openssh-5.4p1.orig/kexgssc.c	1970-01-01 01:00:00.000000000 +0100
++++ openssh-5.4p1/kexgssc.c	2010-03-13 00:39:22.345386953 +0100
+@@ -0,0 +1,334 @@
++/*
++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "includes.h"
++
++#ifdef GSSAPI
++
++#include "includes.h"
++
++#include <openssl/crypto.h>
++#include <openssl/bn.h>
++
++#include <string.h>
++
++#include "xmalloc.h"
++#include "buffer.h"
++#include "ssh2.h"
++#include "key.h"
++#include "cipher.h"
++#include "kex.h"
++#include "log.h"
++#include "packet.h"
++#include "dh.h"
++
++#include "ssh-gss.h"
++
++void
++kexgss_client(Kex *kex) {
++	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
++	gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
++	Gssctxt *ctxt;
++	OM_uint32 maj_status, min_status, ret_flags;
++	u_int klen, kout, slen = 0, hashlen, strlen;
++	DH *dh; 
++	BIGNUM *dh_server_pub = NULL;
++	BIGNUM *shared_secret = NULL;
++	BIGNUM *p = NULL;
++	BIGNUM *g = NULL;	
++	u_char *kbuf, *hash;
++	u_char *serverhostkey = NULL;
++	u_char *empty = "";
++	char *msg;
++	char *lang;
++	int type = 0;
++	int first = 1;
++	int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
++
++	/* Initialise our GSSAPI world */	
++	ssh_gssapi_build_ctx(&ctxt);
++	if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) 
++	    == GSS_C_NO_OID)
++		fatal("Couldn't identify host exchange");
++
++	if (ssh_gssapi_import_name(ctxt, kex->gss_host))
++		fatal("Couldn't import hostname");
++
++	if (kex->gss_client && 
++	    ssh_gssapi_client_identity(ctxt, kex->gss_client))
++		fatal("Couldn't acquire client credentials");
++
++	switch (kex->kex_type) {
++	case KEX_GSS_GRP1_SHA1:
++		dh = dh_new_group1();
++		break;
++	case KEX_GSS_GRP14_SHA1:
++		dh = dh_new_group14();
++		break;
++	case KEX_GSS_GEX_SHA1:
++		debug("Doing group exchange\n");
++		nbits = dh_estimate(kex->we_need * 8);
++		packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
++		packet_put_int(min);
++		packet_put_int(nbits);
++		packet_put_int(max);
++
++		packet_send();
++
++		packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
++
++		if ((p = BN_new()) == NULL)
++			fatal("BN_new() failed");
++		packet_get_bignum2(p);
++		if ((g = BN_new()) == NULL)
++			fatal("BN_new() failed");
++		packet_get_bignum2(g);
++		packet_check_eom();
++
++		if (BN_num_bits(p) < min || BN_num_bits(p) > max)
++			fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
++			    min, BN_num_bits(p), max);
++
++		dh = dh_new_group(g, p);
++		break;
++	default:
++		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
++	}
++	
++	/* Step 1 - e is dh->pub_key */
++	dh_gen_key(dh, kex->we_need * 8);
++
++	/* This is f, we initialise it now to make life easier */
++	dh_server_pub = BN_new();
++	if (dh_server_pub == NULL)
++		fatal("dh_server_pub == NULL");
++
++	token_ptr = GSS_C_NO_BUFFER;
++			 
++	do {
++		debug("Calling gss_init_sec_context");
++		
++		maj_status = ssh_gssapi_init_ctx(ctxt,
++		    kex->gss_deleg_creds, token_ptr, &send_tok,
++		    &ret_flags);
++
++		if (GSS_ERROR(maj_status)) {
++			if (send_tok.length != 0) {
++				packet_start(SSH2_MSG_KEXGSS_CONTINUE);
++				packet_put_string(send_tok.value,
++				    send_tok.length);
++			}
++			fatal("gss_init_context failed");
++		}
++
++		/* If we've got an old receive buffer get rid of it */
++		if (token_ptr != GSS_C_NO_BUFFER)
++			xfree(recv_tok.value);
++
++		if (maj_status == GSS_S_COMPLETE) {
++			/* If mutual state flag is not true, kex fails */
++			if (!(ret_flags & GSS_C_MUTUAL_FLAG))
++				fatal("Mutual authentication failed");
++
++			/* If integ avail flag is not true kex fails */
++			if (!(ret_flags & GSS_C_INTEG_FLAG))
++				fatal("Integrity check failed");
++		}
++
++		/* 
++		 * If we have data to send, then the last message that we
++		 * received cannot have been a 'complete'. 
++		 */
++		if (send_tok.length != 0) {
++			if (first) {
++				packet_start(SSH2_MSG_KEXGSS_INIT);
++				packet_put_string(send_tok.value,
++				    send_tok.length);
++				packet_put_bignum2(dh->pub_key);
++				first = 0;
++			} else {
++				packet_start(SSH2_MSG_KEXGSS_CONTINUE);
++				packet_put_string(send_tok.value,
++				    send_tok.length);
++			}
++			packet_send();
++			gss_release_buffer(&min_status, &send_tok);
++
++			/* If we've sent them data, they should reply */
++			do {	
++				type = packet_read();
++				if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
++					debug("Received KEXGSS_HOSTKEY");
++					if (serverhostkey)
++						fatal("Server host key received more than once");
++					serverhostkey = 
++					    packet_get_string(&slen);
++				}
++			} while (type == SSH2_MSG_KEXGSS_HOSTKEY);
++
++			switch (type) {
++			case SSH2_MSG_KEXGSS_CONTINUE:
++				debug("Received GSSAPI_CONTINUE");
++				if (maj_status == GSS_S_COMPLETE) 
++					fatal("GSSAPI Continue received from server when complete");
++				recv_tok.value = packet_get_string(&strlen);
++				recv_tok.length = strlen; 
++				break;
++			case SSH2_MSG_KEXGSS_COMPLETE:
++				debug("Received GSSAPI_COMPLETE");
++				packet_get_bignum2(dh_server_pub);
++				msg_tok.value =  packet_get_string(&strlen);
++				msg_tok.length = strlen; 
++
++				/* Is there a token included? */
++				if (packet_get_char()) {
++					recv_tok.value=
++					    packet_get_string(&strlen);
++					recv_tok.length = strlen;
++					/* If we're already complete - protocol error */
++					if (maj_status == GSS_S_COMPLETE)
++						packet_disconnect("Protocol error: received token when complete");
++					} else {
++						/* No token included */
++						if (maj_status != GSS_S_COMPLETE)
++							packet_disconnect("Protocol error: did not receive final token");
++				}
++				break;
++			case SSH2_MSG_KEXGSS_ERROR:
++				debug("Received Error");
++				maj_status = packet_get_int();
++				min_status = packet_get_int();
++				msg = packet_get_string(NULL);
++				lang = packet_get_string(NULL);
++				fatal("GSSAPI Error: \n%.400s",msg);
++			default:
++				packet_disconnect("Protocol error: didn't expect packet type %d",
++		    		type);
++			}
++			token_ptr = &recv_tok;
++		} else {
++			/* No data, and not complete */
++			if (maj_status != GSS_S_COMPLETE)
++				fatal("Not complete, and no token output");
++		}
++	} while (maj_status & GSS_S_CONTINUE_NEEDED);
++
++	/* 
++	 * We _must_ have received a COMPLETE message in reply from the 
++	 * server, which will have set dh_server_pub and msg_tok 
++	 */
++
++	if (type != SSH2_MSG_KEXGSS_COMPLETE)
++		fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
++
++	/* Check f in range [1, p-1] */
++	if (!dh_pub_is_valid(dh, dh_server_pub))
++		packet_disconnect("bad server public DH value");
++
++	/* compute K=f^x mod p */
++	klen = DH_size(dh);
++	kbuf = xmalloc(klen);
++	kout = DH_compute_key(kbuf, dh_server_pub, dh);
++	if (kout < 0)
++		fatal("DH_compute_key: failed");
++
++	shared_secret = BN_new();
++	if (shared_secret == NULL)
++		fatal("kexgss_client: BN_new failed");
++
++	if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
++		fatal("kexdh_client: BN_bin2bn failed");
++
++	memset(kbuf, 0, klen);
++	xfree(kbuf);
++
++	switch (kex->kex_type) {
++	case KEX_GSS_GRP1_SHA1:
++	case KEX_GSS_GRP14_SHA1:
++		kex_dh_hash( kex->client_version_string, 
++		    kex->server_version_string,
++		    buffer_ptr(&kex->my), buffer_len(&kex->my),
++		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
++		    (serverhostkey ? serverhostkey : empty), slen,
++		    dh->pub_key,	/* e */
++		    dh_server_pub,	/* f */
++		    shared_secret,	/* K */
++		    &hash, &hashlen
++		);
++		break;
++	case KEX_GSS_GEX_SHA1:
++		kexgex_hash(
++		    kex->evp_md,
++		    kex->client_version_string,
++		    kex->server_version_string,
++		    buffer_ptr(&kex->my), buffer_len(&kex->my),
++		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
++		    (serverhostkey ? serverhostkey : empty), slen,
++ 		    min, nbits, max,
++		    dh->p, dh->g,
++		    dh->pub_key,
++		    dh_server_pub,
++		    shared_secret,
++		    &hash, &hashlen
++		);
++		break;
++	default:
++		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
++	}
++
++	gssbuf.value = hash;
++	gssbuf.length = hashlen;
++
++	/* Verify that the hash matches the MIC we just got. */
++	if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
++		packet_disconnect("Hash's MIC didn't verify");
++
++	xfree(msg_tok.value);
++
++	DH_free(dh);
++	if (serverhostkey)
++		xfree(serverhostkey);
++	BN_clear_free(dh_server_pub);
++
++	/* save session id */
++	if (kex->session_id == NULL) {
++		kex->session_id_len = hashlen;
++		kex->session_id = xmalloc(kex->session_id_len);
++		memcpy(kex->session_id, hash, kex->session_id_len);
++	}
++
++	if (kex->gss_deleg_creds)
++		ssh_gssapi_credentials_updated(ctxt);
++
++	if (gss_kex_context == NULL)
++		gss_kex_context = ctxt;
++	else
++		ssh_gssapi_delete_ctx(&ctxt);
++
++	kex_derive_keys(kex, hash, hashlen, shared_secret);
++	BN_clear_free(shared_secret);
++	kex_finish(kex);
++}
++
++#endif /* GSSAPI */
+diff -Nur openssh-5.4p1.orig/kexgsss.c openssh-5.4p1/kexgsss.c
+--- openssh-5.4p1.orig/kexgsss.c	1970-01-01 01:00:00.000000000 +0100
++++ openssh-5.4p1/kexgsss.c	2010-03-13 00:39:22.347367946 +0100
+@@ -0,0 +1,288 @@
++/*
++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "includes.h"
++
++#ifdef GSSAPI
++
++#include <string.h>
++
++#include <openssl/crypto.h>
++#include <openssl/bn.h>
++
++#include "xmalloc.h"
++#include "buffer.h"
++#include "ssh2.h"
++#include "key.h"
++#include "cipher.h"
++#include "kex.h"
++#include "log.h"
++#include "packet.h"
++#include "dh.h"
++#include "ssh-gss.h"
++#include "monitor_wrap.h"
++#include "servconf.h"
++
++extern ServerOptions options;
++
++void
++kexgss_server(Kex *kex)
++{
++	OM_uint32 maj_status, min_status;
++	
++	/* 
++	 * Some GSSAPI implementations use the input value of ret_flags (an
++ 	 * output variable) as a means of triggering mechanism specific 
++ 	 * features. Initializing it to zero avoids inadvertently 
++ 	 * activating this non-standard behaviour.
++	 */
++
++	OM_uint32 ret_flags = 0;
++	gss_buffer_desc gssbuf, recv_tok, msg_tok;
++	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
++	Gssctxt *ctxt = NULL;
++	u_int slen, klen, kout, hashlen;
++	u_char *kbuf, *hash;
++	DH *dh;
++	int min = -1, max = -1, nbits = -1;
++	BIGNUM *shared_secret = NULL;
++	BIGNUM *dh_client_pub = NULL;
++	int type = 0;
++	gss_OID oid;
++	char *mechs;
++
++	/* Initialise GSSAPI */
++
++	/* If we're rekeying, privsep means that some of the private structures
++	 * in the GSSAPI code are no longer available. This kludges them back
++	 * into life
++	 */
++	if (!ssh_gssapi_oid_table_ok()) 
++		if ((mechs = ssh_gssapi_server_mechanisms()))
++			xfree(mechs);
++
++	debug2("%s: Identifying %s", __func__, kex->name);
++	oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
++	if (oid == GSS_C_NO_OID)
++	   fatal("Unknown gssapi mechanism");
++
++	debug2("%s: Acquiring credentials", __func__);
++
++	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
++		fatal("Unable to acquire credentials for the server");
++
++	switch (kex->kex_type) {
++	case KEX_GSS_GRP1_SHA1:
++		dh = dh_new_group1();
++		break;
++	case KEX_GSS_GRP14_SHA1:
++		dh = dh_new_group14();
++		break;
++	case KEX_GSS_GEX_SHA1:
++		debug("Doing group exchange");
++		packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
++		min = packet_get_int();
++		nbits = packet_get_int();
++		max = packet_get_int();
++		min = MAX(DH_GRP_MIN, min);
++		max = MIN(DH_GRP_MAX, max);
++		packet_check_eom();
++		if (max < min || nbits < min || max < nbits)
++			fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
++			    min, nbits, max);
++		dh = PRIVSEP(choose_dh(min, nbits, max));
++		if (dh == NULL)
++			packet_disconnect("Protocol error: no matching group found");
++
++		packet_start(SSH2_MSG_KEXGSS_GROUP);
++		packet_put_bignum2(dh->p);
++		packet_put_bignum2(dh->g);
++		packet_send();
++
++		packet_write_wait();
++		break;
++	default:
++		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
++	}
++
++	dh_gen_key(dh, kex->we_need * 8);
++
++	do {
++		debug("Wait SSH2_MSG_GSSAPI_INIT");
++		type = packet_read();
++		switch(type) {
++		case SSH2_MSG_KEXGSS_INIT:
++			if (dh_client_pub != NULL) 
++				fatal("Received KEXGSS_INIT after initialising");
++			recv_tok.value = packet_get_string(&slen);
++			recv_tok.length = slen; 
++
++			if ((dh_client_pub = BN_new()) == NULL)
++				fatal("dh_client_pub == NULL");
++
++			packet_get_bignum2(dh_client_pub);
++
++			/* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
++			break;
++		case SSH2_MSG_KEXGSS_CONTINUE:
++			recv_tok.value = packet_get_string(&slen);
++			recv_tok.length = slen; 
++			break;
++		default:
++			packet_disconnect(
++			    "Protocol error: didn't expect packet type %d",
++			    type);
++		}
++
++		maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, 
++		    &send_tok, &ret_flags));
++
++		xfree(recv_tok.value);
++
++		if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
++			fatal("Zero length token output when incomplete");
++
++		if (dh_client_pub == NULL)
++			fatal("No client public key");
++		
++		if (maj_status & GSS_S_CONTINUE_NEEDED) {
++			debug("Sending GSSAPI_CONTINUE");
++			packet_start(SSH2_MSG_KEXGSS_CONTINUE);
++			packet_put_string(send_tok.value, send_tok.length);
++			packet_send();
++			gss_release_buffer(&min_status, &send_tok);
++		}
++	} while (maj_status & GSS_S_CONTINUE_NEEDED);
++
++	if (GSS_ERROR(maj_status)) {
++		if (send_tok.length > 0) {
++			packet_start(SSH2_MSG_KEXGSS_CONTINUE);
++			packet_put_string(send_tok.value, send_tok.length);
++			packet_send();
++		}
++		fatal("accept_ctx died");
++	}
++
++	if (!(ret_flags & GSS_C_MUTUAL_FLAG))
++		fatal("Mutual Authentication flag wasn't set");
++
++	if (!(ret_flags & GSS_C_INTEG_FLAG))
++		fatal("Integrity flag wasn't set");
++	
++	if (!dh_pub_is_valid(dh, dh_client_pub))
++		packet_disconnect("bad client public DH value");
++
++	klen = DH_size(dh);
++	kbuf = xmalloc(klen); 
++	kout = DH_compute_key(kbuf, dh_client_pub, dh);
++	if (kout < 0)
++		fatal("DH_compute_key: failed");
++
++	shared_secret = BN_new();
++	if (shared_secret == NULL)
++		fatal("kexgss_server: BN_new failed");
++
++	if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
++		fatal("kexgss_server: BN_bin2bn failed");
++
++	memset(kbuf, 0, klen);
++	xfree(kbuf);
++
++	switch (kex->kex_type) {
++	case KEX_GSS_GRP1_SHA1:
++	case KEX_GSS_GRP14_SHA1:
++		kex_dh_hash(
++		    kex->client_version_string, kex->server_version_string,
++		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
++		    buffer_ptr(&kex->my), buffer_len(&kex->my),
++		    NULL, 0, /* Change this if we start sending host keys */
++		    dh_client_pub, dh->pub_key, shared_secret,
++		    &hash, &hashlen
++		);
++		break;
++	case KEX_GSS_GEX_SHA1:
++		kexgex_hash(
++		    kex->evp_md,
++		    kex->client_version_string, kex->server_version_string,
++		    buffer_ptr(&kex->peer), buffer_len(&kex->peer),
++		    buffer_ptr(&kex->my), buffer_len(&kex->my),
++		    NULL, 0,
++		    min, nbits, max,
++		    dh->p, dh->g,
++		    dh_client_pub,
++		    dh->pub_key,
++		    shared_secret,
++		    &hash, &hashlen
++		);
++		break;
++	default:
++		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
++	}
++
++	BN_clear_free(dh_client_pub);
++
++	if (kex->session_id == NULL) {
++		kex->session_id_len = hashlen;
++		kex->session_id = xmalloc(kex->session_id_len);
++		memcpy(kex->session_id, hash, kex->session_id_len);
++	}
++
++	gssbuf.value = hash;
++	gssbuf.length = hashlen;
++
++	if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
++		fatal("Couldn't get MIC");
++
++	packet_start(SSH2_MSG_KEXGSS_COMPLETE);
++	packet_put_bignum2(dh->pub_key);
++	packet_put_string(msg_tok.value,msg_tok.length);
++
++	if (send_tok.length != 0) {
++		packet_put_char(1); /* true */
++		packet_put_string(send_tok.value, send_tok.length);
++	} else {
++		packet_put_char(0); /* false */
++	}
++	packet_send();
++
++	gss_release_buffer(&min_status, &send_tok);
++	gss_release_buffer(&min_status, &msg_tok);
++
++	if (gss_kex_context == NULL)
++		gss_kex_context = ctxt;
++	else 
++		ssh_gssapi_delete_ctx(&ctxt);
++
++	DH_free(dh);
++
++	kex_derive_keys(kex, hash, hashlen, shared_secret);
++	BN_clear_free(shared_secret);
++	kex_finish(kex);
++
++	/* If this was a rekey, then save out any delegated credentials we
++	 * just exchanged.  */
++	if (options.gss_store_rekey)
++		ssh_gssapi_rekey_creds();
++}
++#endif /* GSSAPI */
+diff -Nur openssh-5.4p1.orig/key.c openssh-5.4p1/key.c
+--- openssh-5.4p1.orig/key.c	2010-03-04 11:52:18.000000000 +0100
++++ openssh-5.4p1/key.c	2010-03-13 00:40:49.216211219 +0100
+@@ -969,7 +969,9 @@
+ 		return KEY_RSA_CERT;
+ 	} else if (strcmp(name, "ssh-dss-cert-v00 at openssh.com") == 0) {
+ 		return KEY_DSA_CERT;
+-	}
++	} else if (strcmp(name, "null") == 0) {
++		return KEY_NULL;
++ 	}
+ 	debug2("key_type_from_name: unknown key type '%s'", name);
+ 	return KEY_UNSPEC;
+ }
+diff -Nur openssh-5.4p1.orig/key.h openssh-5.4p1/key.h
+--- openssh-5.4p1.orig/key.h	2010-02-26 21:55:05.000000000 +0100
++++ openssh-5.4p1/key.h	2010-03-13 00:40:17.733623904 +0100
+@@ -37,6 +37,7 @@
+ 	KEY_DSA_CERT,
+ 	KEY_RSA_CERT_V00,
+ 	KEY_DSA_CERT_V00,
++	KEY_NULL,
+ 	KEY_UNSPEC
+ };
+ enum fp_type {
+diff -Nur openssh-5.4p1.orig/monitor.c openssh-5.4p1/monitor.c
+--- openssh-5.4p1.orig/monitor.c	2010-03-07 13:05:17.000000000 +0100
++++ openssh-5.4p1/monitor.c	2010-03-13 00:39:22.367998455 +0100
+@@ -172,6 +172,8 @@
+ int mm_answer_gss_accept_ctx(int, Buffer *);
+ int mm_answer_gss_userok(int, Buffer *);
+ int mm_answer_gss_checkmic(int, Buffer *);
++int mm_answer_gss_sign(int, Buffer *);
++int mm_answer_gss_updatecreds(int, Buffer *);
+ #endif
+ 
+ #ifdef SSH_AUDIT_EVENTS
+@@ -241,6 +243,7 @@
+     {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
+     {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
+     {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
++    {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
+ #endif
+ #ifdef JPAKE
+     {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata},
+@@ -253,6 +256,12 @@
+ };
+ 
+ struct mon_table mon_dispatch_postauth20[] = {
++#ifdef GSSAPI
++    {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
++    {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
++    {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
++    {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
++#endif
+     {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
+     {MONITOR_REQ_SIGN, 0, mm_answer_sign},
+     {MONITOR_REQ_PTY, 0, mm_answer_pty},
+@@ -357,6 +366,10 @@
+ 		/* Permit requests for moduli and signatures */
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
++#ifdef GSSAPI
++		/* and for the GSSAPI key exchange */
++		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
++#endif
+ 	} else {
+ 		mon_dispatch = mon_dispatch_proto15;
+ 
+@@ -443,6 +456,10 @@
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
++#ifdef GSSAPI
++		/* and for the GSSAPI key exchange */
++		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
++#endif		
+ 	} else {
+ 		mon_dispatch = mon_dispatch_postauth15;
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
+@@ -1691,6 +1708,13 @@
+ 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
+ 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
+ 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
++#ifdef GSSAPI
++	if (options.gss_keyex) {
++		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
++		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
++		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
++	}
++#endif
+ 	kex->server = 1;
+ 	kex->hostkey_type = buffer_get_int(m);
+ 	kex->kex_type = buffer_get_int(m);
+@@ -1897,6 +1921,9 @@
+ 	OM_uint32 major;
+ 	u_int len;
+ 
++	if (!options.gss_authentication && !options.gss_keyex)
++		fatal("In GSSAPI monitor when GSSAPI is disabled");
++
+ 	goid.elements = buffer_get_string(m, &len);
+ 	goid.length = len;
+ 
+@@ -1924,6 +1951,9 @@
+ 	OM_uint32 flags = 0; /* GSI needs this */
+ 	u_int len;
+ 
++	if (!options.gss_authentication && !options.gss_keyex)
++		fatal("In GSSAPI monitor when GSSAPI is disabled");
++
+ 	in.value = buffer_get_string(m, &len);
+ 	in.length = len;
+ 	major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
+@@ -1941,6 +1971,7 @@
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
++		monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
+ 	}
+ 	return (0);
+ }
+@@ -1952,6 +1983,9 @@
+ 	OM_uint32 ret;
+ 	u_int len;
+ 
++	if (!options.gss_authentication && !options.gss_keyex)
++		fatal("In GSSAPI monitor when GSSAPI is disabled");
++
+ 	gssbuf.value = buffer_get_string(m, &len);
+ 	gssbuf.length = len;
+ 	mic.value = buffer_get_string(m, &len);
+@@ -1978,7 +2012,11 @@
+ {
+ 	int authenticated;
+ 
+-	authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
++	if (!options.gss_authentication && !options.gss_keyex)
++		fatal("In GSSAPI monitor when GSSAPI is disabled");
++
++	authenticated = authctxt->valid && 
++	    ssh_gssapi_userok(authctxt->user, authctxt->pw);
+ 
+ 	buffer_clear(m);
+ 	buffer_put_int(m, authenticated);
+@@ -1991,6 +2029,74 @@
+ 	/* Monitor loop will terminate if authenticated */
+ 	return (authenticated);
+ }
++
++int 
++mm_answer_gss_sign(int socket, Buffer *m)
++{
++	gss_buffer_desc data;
++	gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
++	OM_uint32 major, minor;
++	u_int len;
++
++	if (!options.gss_authentication && !options.gss_keyex)
++		fatal("In GSSAPI monitor when GSSAPI is disabled");
++
++	data.value = buffer_get_string(m, &len);
++	data.length = len;
++	if (data.length != 20) 
++		fatal("%s: data length incorrect: %d", __func__, 
++		    (int) data.length);
++
++	/* Save the session ID on the first time around */
++	if (session_id2_len == 0) {
++		session_id2_len = data.length;
++		session_id2 = xmalloc(session_id2_len);
++		memcpy(session_id2, data.value, session_id2_len);
++	}
++	major = ssh_gssapi_sign(gsscontext, &data, &hash);
++
++	xfree(data.value);
++
++	buffer_clear(m);
++	buffer_put_int(m, major);
++	buffer_put_string(m, hash.value, hash.length);
++
++	mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
++
++	gss_release_buffer(&minor, &hash);
++
++	/* Turn on getpwnam permissions */
++	monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
++	
++	/* And credential updating, for when rekeying */
++	monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
++
++	return (0);
++}
++
++int
++mm_answer_gss_updatecreds(int socket, Buffer *m) {
++	ssh_gssapi_ccache store;
++	int ok;
++
++	store.filename = buffer_get_string(m, NULL);
++	store.envvar   = buffer_get_string(m, NULL);
++	store.envval   = buffer_get_string(m, NULL);
++
++	ok = ssh_gssapi_update_creds(&store);
++
++	xfree(store.filename);
++	xfree(store.envvar);
++	xfree(store.envval);
++
++	buffer_clear(m);
++	buffer_put_int(m, ok);
++
++	mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
++
++	return(0);
++}
++
+ #endif /* GSSAPI */
+ 
+ #ifdef JPAKE
+diff -Nur openssh-5.4p1.orig/monitor.h openssh-5.4p1/monitor.h
+--- openssh-5.4p1.orig/monitor.h	2008-11-05 06:20:46.000000000 +0100
++++ openssh-5.4p1/monitor.h	2010-03-13 00:39:22.370058530 +0100
+@@ -53,6 +53,8 @@
+ 	MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP,
+ 	MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK,
+ 	MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC,
++	MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN,
++	MONITOR_REQ_GSSUPCREDS, MONITOR_ANS_GSSUPCREDS,
+ 	MONITOR_REQ_PAM_START,
+ 	MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT,
+ 	MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX,
+diff -Nur openssh-5.4p1.orig/monitor_wrap.c openssh-5.4p1/monitor_wrap.c
+--- openssh-5.4p1.orig/monitor_wrap.c	2010-03-07 13:05:17.000000000 +0100
++++ openssh-5.4p1/monitor_wrap.c	2010-03-13 00:39:22.375677054 +0100
+@@ -1231,7 +1231,7 @@
+ }
+ 
+ int
+-mm_ssh_gssapi_userok(char *user)
++mm_ssh_gssapi_userok(char *user, struct passwd *pw)
+ {
+ 	Buffer m;
+ 	int authenticated = 0;
+@@ -1248,6 +1248,51 @@
+ 	debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
+ 	return (authenticated);
+ }
++
++OM_uint32
++mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
++{
++	Buffer m;
++	OM_uint32 major;
++	u_int len;
++
++	buffer_init(&m);
++	buffer_put_string(&m, data->value, data->length);
++
++	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m);
++	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
++
++	major = buffer_get_int(&m);
++	hash->value = buffer_get_string(&m, &len);
++	hash->length = len;
++
++	buffer_free(&m);
++
++	return(major);
++}
++
++int
++mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
++{
++	Buffer m;
++	int ok;
++
++	buffer_init(&m);
++
++	buffer_put_cstring(&m, store->filename ? store->filename : "");
++	buffer_put_cstring(&m, store->envvar ? store->envvar : "");
++	buffer_put_cstring(&m, store->envval ? store->envval : "");
++	
++	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m);
++	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m);
++
++	ok = buffer_get_int(&m);
++
++	buffer_free(&m);
++	
++	return (ok);
++}
++
+ #endif /* GSSAPI */
+ 
+ #ifdef JPAKE
+diff -Nur openssh-5.4p1.orig/monitor_wrap.h openssh-5.4p1/monitor_wrap.h
+--- openssh-5.4p1.orig/monitor_wrap.h	2009-03-05 14:58:22.000000000 +0100
++++ openssh-5.4p1/monitor_wrap.h	2010-03-13 00:39:22.377770519 +0100
+@@ -57,8 +57,10 @@
+ OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
+ OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
+    gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
+-int mm_ssh_gssapi_userok(char *user);
++int mm_ssh_gssapi_userok(char *user, struct passwd *);
+ OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
++OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
++int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
+ #endif
+ 
+ #ifdef USE_PAM
+diff -Nur openssh-5.4p1.orig/readconf.c openssh-5.4p1/readconf.c
+--- openssh-5.4p1.orig/readconf.c	2010-02-11 23:21:03.000000000 +0100
++++ openssh-5.4p1/readconf.c	2010-03-13 00:39:22.384142845 +0100
+@@ -127,6 +127,7 @@
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
+ 	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
+@@ -164,10 +165,18 @@
+ 	{ "afstokenpassing", oUnsupported },
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
++	{ "gssapikeyexchange", oGssKeyEx },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
++	{ "gssapiclientidentity", oGssClientIdentity },
++	{ "gssapirenewalforcesrekey", oGssRenewalRekey },
+ #else
+ 	{ "gssapiauthentication", oUnsupported },
++	{ "gssapikeyexchange", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
++	{ "gssapiclientidentity", oUnsupported },
++	{ "gssapirenewalforcesrekey", oUnsupported },
+ #endif
+ 	{ "fallbacktorsh", oDeprecated },
+ 	{ "usersh", oDeprecated },
+@@ -456,10 +465,26 @@
+ 		intptr = &options->gss_authentication;
+ 		goto parse_flag;
+ 
++	case oGssKeyEx:
++		intptr = &options->gss_keyex;
++		goto parse_flag;
++
+ 	case oGssDelegateCreds:
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
++	case oGssClientIdentity:
++		charptr = &options->gss_client_identity;
++		goto parse_string;
++
++	case oGssRenewalRekey:
++		intptr = &options->gss_renewal_rekey;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1015,7 +1040,11 @@
+ 	options->pubkey_authentication = -1;
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
++	options->gss_keyex = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
++	options->gss_renewal_rekey = -1;
++	options->gss_client_identity = NULL;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -1107,8 +1136,14 @@
+ 		options->challenge_response_authentication = 1;
+ 	if (options->gss_authentication == -1)
+ 		options->gss_authentication = 0;
++	if (options->gss_keyex == -1)
++		options->gss_keyex = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
++	if (options->gss_renewal_rekey == -1)
++		options->gss_renewal_rekey = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+diff -Nur openssh-5.4p1.orig/readconf.h openssh-5.4p1/readconf.h
+--- openssh-5.4p1.orig/readconf.h	2010-02-11 23:21:03.000000000 +0100
++++ openssh-5.4p1/readconf.h	2010-03-13 00:39:22.386055410 +0100
+@@ -44,7 +44,11 @@
+ 	int     challenge_response_authentication;
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
++	int     gss_keyex;		/* Try GSS key exchange */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
++	int	gss_renewal_rekey;	/* Credential renewal forces rekey */
++	char    *gss_client_identity;   /* Principal to initiate GSSAPI with */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+diff -Nur openssh-5.4p1.orig/servconf.c openssh-5.4p1/servconf.c
+--- openssh-5.4p1.orig/servconf.c	2010-03-04 11:53:35.000000000 +0100
++++ openssh-5.4p1/servconf.c	2010-03-13 00:39:22.394208388 +0100
+@@ -93,7 +93,10 @@
+ 	options->kerberos_ticket_cleanup = -1;
+ 	options->kerberos_get_afs_token = -1;
+ 	options->gss_authentication=-1;
++	options->gss_keyex = -1;
+ 	options->gss_cleanup_creds = -1;
++	options->gss_strict_acceptor = -1;
++	options->gss_store_rekey = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->challenge_response_authentication = -1;
+@@ -214,8 +217,14 @@
+ 		options->kerberos_get_afs_token = 0;
+ 	if (options->gss_authentication == -1)
+ 		options->gss_authentication = 0;
++	if (options->gss_keyex == -1)
++		options->gss_keyex = 0;
+ 	if (options->gss_cleanup_creds == -1)
+ 		options->gss_cleanup_creds = 1;
++	if (options->gss_strict_acceptor == -1)
++		options->gss_strict_acceptor = 1;
++	if (options->gss_store_rekey == -1)
++		options->gss_store_rekey = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+@@ -306,7 +315,9 @@
+ 	sBanner, sUseDNS, sHostbasedAuthentication,
+ 	sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
+ 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
+-	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
++	sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
++	sGssKeyEx, sGssStoreRekey,
++	sAcceptEnv, sPermitTunnel,
+ 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
+ 	sUsePrivilegeSeparation, sAllowAgentForwarding,
+ 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
+@@ -369,9 +380,15 @@
+ #ifdef GSSAPI
+ 	{ "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
+ 	{ "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
++	{ "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
++	{ "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
++	{ "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
+ #else
+ 	{ "gssapiauthentication", sUnsupported, SSHCFG_ALL },
+ 	{ "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
++	{ "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
++	{ "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
++	{ "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
+ #endif
+ 	{ "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
+ 	{ "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
+@@ -925,10 +942,22 @@
+ 		intptr = &options->gss_authentication;
+ 		goto parse_flag;
+ 
++	case sGssKeyEx:
++		intptr = &options->gss_keyex;
++		goto parse_flag;
++
+ 	case sGssCleanupCreds:
+ 		intptr = &options->gss_cleanup_creds;
+ 		goto parse_flag;
+ 
++	case sGssStrictAcceptor:
++		intptr = &options->gss_strict_acceptor;
++		goto parse_flag;
++
++	case sGssStoreRekey:
++		intptr = &options->gss_store_rekey;
++		goto parse_flag;
++
+ 	case sPasswordAuthentication:
+ 		intptr = &options->password_authentication;
+ 		goto parse_flag;
+diff -Nur openssh-5.4p1.orig/servconf.h openssh-5.4p1/servconf.h
+--- openssh-5.4p1.orig/servconf.h	2010-03-04 11:53:35.000000000 +0100
++++ openssh-5.4p1/servconf.h	2010-03-13 00:39:22.397236772 +0100
+@@ -94,7 +94,10 @@
+ 	int     kerberos_get_afs_token;		/* If true, try to get AFS token if
+ 						 * authenticated with Kerberos. */
+ 	int     gss_authentication;	/* If true, permit GSSAPI authentication */
++	int     gss_keyex;		/* If true, permit GSSAPI key exchange */
+ 	int     gss_cleanup_creds;	/* If true, destroy cred cache on logout */
++	int 	gss_strict_acceptor;	/* If true, restrict the GSSAPI acceptor name */
++	int 	gss_store_rekey;
+ 	int     password_authentication;	/* If true, permit password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication;	/* If true, permit */
+diff -Nur openssh-5.4p1.orig/ssh-gss.h openssh-5.4p1/ssh-gss.h
+--- openssh-5.4p1.orig/ssh-gss.h	2007-06-12 15:40:39.000000000 +0200
++++ openssh-5.4p1/ssh-gss.h	2010-03-13 00:39:22.400061752 +0100
+@@ -1,6 +1,6 @@
+ /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */
+ /*
+- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
++ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -60,10 +60,22 @@
+ 
+ #define SSH_GSS_OIDTYPE 0x06
+ 
++#define SSH2_MSG_KEXGSS_INIT                            30
++#define SSH2_MSG_KEXGSS_CONTINUE                        31
++#define SSH2_MSG_KEXGSS_COMPLETE                        32
++#define SSH2_MSG_KEXGSS_HOSTKEY                         33
++#define SSH2_MSG_KEXGSS_ERROR                           34
++#define SSH2_MSG_KEXGSS_GROUPREQ			40
++#define SSH2_MSG_KEXGSS_GROUP				41
++#define KEX_GSS_GRP1_SHA1_ID				"gss-group1-sha1-"
++#define KEX_GSS_GRP14_SHA1_ID				"gss-group14-sha1-"
++#define KEX_GSS_GEX_SHA1_ID				"gss-gex-sha1-"
++
+ typedef struct {
+ 	char *filename;
+ 	char *envvar;
+ 	char *envval;
++	struct passwd *owner;
+ 	void *data;
+ } ssh_gssapi_ccache;
+ 
+@@ -71,8 +83,11 @@
+ 	gss_buffer_desc displayname;
+ 	gss_buffer_desc exportedname;
+ 	gss_cred_id_t creds;
++	gss_name_t name;
+ 	struct ssh_gssapi_mech_struct *mech;
+ 	ssh_gssapi_ccache store;
++	int used;
++	int updated;
+ } ssh_gssapi_client;
+ 
+ typedef struct ssh_gssapi_mech_struct {
+@@ -83,6 +98,7 @@
+ 	int (*userok) (ssh_gssapi_client *, char *);
+ 	int (*localname) (ssh_gssapi_client *, char **);
+ 	void (*storecreds) (ssh_gssapi_client *);
++	int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
+ } ssh_gssapi_mech;
+ 
+ typedef struct {
+@@ -93,10 +109,11 @@
+ 	gss_OID		oid; /* client */
+ 	gss_cred_id_t	creds; /* server */
+ 	gss_name_t	client; /* server */
+-	gss_cred_id_t	client_creds; /* server */
++	gss_cred_id_t	client_creds; /* both */
+ } Gssctxt;
+ 
+ extern ssh_gssapi_mech *supported_mechs[];
++extern Gssctxt *gss_kex_context;
+ 
+ int  ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
+ void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
+@@ -116,16 +133,30 @@
+ void ssh_gssapi_delete_ctx(Gssctxt **);
+ OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
+ void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
+-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
++int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
++OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
++int ssh_gssapi_credentials_updated(Gssctxt *);
+ 
+ /* In the server */
++typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, 
++    const char *);
++char *ssh_gssapi_client_mechanisms(const char *, const char *);
++char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
++    const char *);
++gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
++int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, 
++    const char *);
+ OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
+-int ssh_gssapi_userok(char *name);
++int ssh_gssapi_userok(char *name, struct passwd *);
+ OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
+ void ssh_gssapi_do_child(char ***, u_int *);
+ void ssh_gssapi_cleanup_creds(void);
+ void ssh_gssapi_storecreds(void);
+ 
++char *ssh_gssapi_server_mechanisms(void);
++int ssh_gssapi_oid_table_ok();
++
++int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
+ #endif /* GSSAPI */
+ 
+ #endif /* _SSH_GSS_H */
+diff -Nur openssh-5.4p1.orig/ssh_config openssh-5.4p1/ssh_config
+--- openssh-5.4p1.orig/ssh_config	2010-01-12 09:40:27.000000000 +0100
++++ openssh-5.4p1/ssh_config	2010-03-13 00:39:22.401981567 +0100
+@@ -26,6 +26,8 @@
+ #   HostbasedAuthentication no
+ #   GSSAPIAuthentication no
+ #   GSSAPIDelegateCredentials no
++#   GSSAPIKeyExchange no
++#   GSSAPITrustDNS no
+ #   BatchMode no
+ #   CheckHostIP yes
+ #   AddressFamily any
+diff -Nur openssh-5.4p1.orig/ssh_config.5 openssh-5.4p1/ssh_config.5
+--- openssh-5.4p1.orig/ssh_config.5	2010-03-05 11:31:12.000000000 +0100
++++ openssh-5.4p1/ssh_config.5	2010-03-13 00:39:22.405912908 +0100
+@@ -478,11 +478,38 @@
+ The default is
+ .Dq no .
+ Note that this option applies to protocol version 2 only.
++.It Cm GSSAPIKeyExchange
++Specifies whether key exchange based on GSSAPI may be used. When using
++GSSAPI key exchange the server need not have a host key.
++The default is
++.Dq no .
++Note that this option applies to protocol version 2 only.
++.It Cm GSSAPIClientIdentity
++If set, specifies the GSSAPI client identity that ssh should use when 
++connecting to the server. The default is unset, which means that the default 
++identity will be used.
+ .It Cm GSSAPIDelegateCredentials
+ Forward (delegate) credentials to the server.
+ The default is
+ .Dq no .
+-Note that this option applies to protocol version 2 only.
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPIRenewalForcesRekey
++If set to 
++.Dq yes
++then renewal of the client's GSSAPI credentials will force the rekeying of the
++ssh connection. With a compatible server, this can delegate the renewed 
++credentials to a session on the server.
++The default is
++.Dq no .
++.It Cm GSSAPITrustDns
++Set to 
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If 
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+diff -Nur openssh-5.4p1.orig/sshconnect2.c openssh-5.4p1/sshconnect2.c
+--- openssh-5.4p1.orig/sshconnect2.c	2010-02-26 21:55:06.000000000 +0100
++++ openssh-5.4p1/sshconnect2.c	2010-03-13 00:39:22.414196262 +0100
+@@ -106,9 +106,34 @@
+ {
+ 	Kex *kex;
+ 
++#ifdef GSSAPI
++	char *orig = NULL, *gss = NULL;
++	char *gss_host = NULL;
++#endif
++
+ 	xxx_host = host;
+ 	xxx_hostaddr = hostaddr;
+ 
++#ifdef GSSAPI
++	if (options.gss_keyex) {
++		/* Add the GSSAPI mechanisms currently supported on this 
++		 * client to the key exchange algorithm proposal */
++		orig = myproposal[PROPOSAL_KEX_ALGS];
++
++		if (options.gss_trust_dns)
++			gss_host = (char *)get_canonical_hostname(1);
++		else
++			gss_host = host;
++
++		gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
++		if (gss) {
++			debug("Offering GSSAPI proposal: %s", gss);
++			xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
++			    "%s,%s", gss, orig);
++		}
++	}
++#endif
++
+ 	if (options.ciphers == (char *)-1) {
+ 		logit("No valid ciphers for protocol version 2 given, using defaults.");
+ 		options.ciphers = NULL;
+@@ -136,6 +161,17 @@
+ 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
+ 		    options.hostkeyalgorithms;
+ 
++#ifdef GSSAPI
++	/* If we've got GSSAPI algorithms, then we also support the
++	 * 'null' hostkey, as a last resort */
++	if (options.gss_keyex && gss) {
++		orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
++		xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], 
++		    "%s,null", orig);
++		xfree(gss);
++	}
++#endif
++
+ 	if (options.rekey_limit)
+ 		packet_set_rekey_limit((u_int32_t)options.rekey_limit);
+ 
+@@ -145,10 +181,26 @@
+ 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
+ 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
+ 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
++#ifdef GSSAPI
++	if (options.gss_keyex) {
++		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
++		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
++		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
++	}
++#endif
+ 	kex->client_version_string=client_version_string;
+ 	kex->server_version_string=server_version_string;
+ 	kex->verify_host_key=&verify_host_key_callback;
+ 
++#ifdef GSSAPI
++	if (options.gss_keyex) {
++		kex->gss_deleg_creds = options.gss_deleg_creds;
++		kex->gss_trust_dns = options.gss_trust_dns;
++		kex->gss_client = options.gss_client_identity;
++		kex->gss_host = gss_host;
++	}
++#endif
++
+ 	xxx_kex = kex;
+ 
+ 	dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
+@@ -243,6 +295,7 @@
+ void	input_gssapi_hash(int type, u_int32_t, void *);
+ void	input_gssapi_error(int, u_int32_t, void *);
+ void	input_gssapi_errtok(int, u_int32_t, void *);
++int	userauth_gsskeyex(Authctxt *authctxt);
+ #endif
+ 
+ void	userauth(Authctxt *, char *);
+@@ -258,6 +311,10 @@
+ 
+ Authmethod authmethods[] = {
+ #ifdef GSSAPI
++	{"gssapi-keyex",
++		userauth_gsskeyex,
++		&options.gss_authentication,
++		NULL},
+ 	{"gssapi-with-mic",
+ 		userauth_gssapi,
+ 		NULL,
+@@ -564,19 +621,29 @@
+ 	static u_int mech = 0;
+ 	OM_uint32 min;
+ 	int ok = 0;
++	const char *gss_host;
++
++	if (options.gss_trust_dns)
++		gss_host = get_canonical_hostname(1);
++	else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+ 
+ 	if (gss_supported == NULL)
+-		gss_indicate_mechs(&min, &gss_supported);
++		if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
++			gss_supported = NULL;
++			return 0;
++		}
+ 
+ 	/* Check to see if the mechanism is usable before we offer it */
+ 	while (mech < gss_supported->count && !ok) {
+ 		/* My DER encoding requires length<128 */
+ 		if (gss_supported->elements[mech].length < 128 &&
+ 		    ssh_gssapi_check_mechanism(&gssctxt, 
+-		    &gss_supported->elements[mech], authctxt->host)) {
++		    &gss_supported->elements[mech], gss_host, 
++                    options.gss_client_identity)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			mech++;
+@@ -673,8 +740,8 @@
+ {
+ 	Authctxt *authctxt = ctxt;
+ 	Gssctxt *gssctxt;
+-	int oidlen;
+-	char *oidv;
++	u_int oidlen;
++	u_char *oidv;
+ 
+ 	if (authctxt == NULL)
+ 		fatal("input_gssapi_response: no authentication context");
+@@ -784,6 +851,48 @@
+ 	xfree(msg);
+ 	xfree(lang);
+ }
++
++int
++userauth_gsskeyex(Authctxt *authctxt)
++{
++	Buffer b;
++	gss_buffer_desc gssbuf;
++	gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
++	OM_uint32 ms;
++
++	static int attempt = 0;
++	if (attempt++ >= 1)
++		return (0);
++
++	if (gss_kex_context == NULL) {
++		debug("No valid Key exchange context"); 
++		return (0);
++	}
++
++	ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service,
++	    "gssapi-keyex");
++
++	gssbuf.value = buffer_ptr(&b);
++	gssbuf.length = buffer_len(&b);
++
++	if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
++		buffer_free(&b);
++		return (0);
++	}
++
++	packet_start(SSH2_MSG_USERAUTH_REQUEST);
++	packet_put_cstring(authctxt->server_user);
++	packet_put_cstring(authctxt->service);
++	packet_put_cstring(authctxt->method->name);
++	packet_put_string(mic.value, mic.length);
++	packet_send();
++
++	buffer_free(&b);
++	gss_release_buffer(&ms, &mic);
++
++	return (1);
++}
++
+ #endif /* GSSAPI */
+ 
+ int
+diff -Nur openssh-5.4p1.orig/sshd.c openssh-5.4p1/sshd.c
+--- openssh-5.4p1.orig/sshd.c	2010-03-07 13:05:17.000000000 +0100
++++ openssh-5.4p1/sshd.c	2010-03-13 00:39:22.423749423 +0100
+@@ -120,6 +120,10 @@
+ #include "roaming.h"
+ #include "version.h"
+ 
++#ifdef USE_SECURITY_SESSION_API
++#include <Security/AuthSession.h>
++#endif
++
+ #ifdef LIBWRAP
+ #include <tcpd.h>
+ #include <syslog.h>
+@@ -1577,10 +1581,13 @@
+ 		logit("Disabling protocol version 1. Could not load host key");
+ 		options.protocol &= ~SSH_PROTO_1;
+ 	}
++#ifndef GSSAPI
++	/* The GSSAPI key exchange can run without a host key */
+ 	if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
+ 		logit("Disabling protocol version 2. Could not load host key");
+ 		options.protocol &= ~SSH_PROTO_2;
+ 	}
++#endif
+ 	if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
+ 		logit("sshd: no hostkeys available -- exiting.");
+ 		exit(1);
+@@ -1909,6 +1916,60 @@
+ 	/* Log the connection. */
+ 	verbose("Connection from %.500s port %d", remote_ip, remote_port);
+ 
++#ifdef USE_SECURITY_SESSION_API
++	/*
++	 * Create a new security session for use by the new user login if
++	 * the current session is the root session or we are not launched
++	 * by inetd (eg: debugging mode or server mode).  We do not
++	 * necessarily need to create a session if we are launched from
++	 * inetd because Panther xinetd will create a session for us.
++	 *
++	 * The only case where this logic will fail is if there is an
++	 * inetd running in a non-root session which is not creating
++	 * new sessions for us.  Then all the users will end up in the
++	 * same session (bad).
++	 *
++	 * When the client exits, the session will be destroyed for us
++	 * automatically.
++	 *
++	 * We must create the session before any credentials are stored
++	 * (including AFS pags, which happens a few lines below).
++	 */
++	{
++		OSStatus err = 0;
++		SecuritySessionId sid = 0;
++		SessionAttributeBits sattrs = 0;
++
++		err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
++		if (err)
++			error("SessionGetInfo() failed with error %.8X",
++			    (unsigned) err);
++		else
++			debug("Current Session ID is %.8X / Session Attributes are %.8X",
++			    (unsigned) sid, (unsigned) sattrs);
++
++		if (inetd_flag && !(sattrs & sessionIsRoot))
++			debug("Running in inetd mode in a non-root session... "
++			    "assuming inetd created the session for us.");
++		else {
++			debug("Creating new security session...");
++			err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
++			if (err)
++				error("SessionCreate() failed with error %.8X",
++				    (unsigned) err);
++
++			err = SessionGetInfo(callerSecuritySession, &sid, 
++			    &sattrs);
++			if (err)
++				error("SessionGetInfo() failed with error %.8X",
++				    (unsigned) err);
++			else
++				debug("New Session ID is %.8X / Session Attributes are %.8X",
++				    (unsigned) sid, (unsigned) sattrs);
++		}
++	}
++#endif
++
+ 	/*
+ 	 * We don't want to listen forever unless the other side
+ 	 * successfully authenticates itself.  So we set up an alarm which is
+@@ -2287,12 +2348,61 @@
+ 
+ 	myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
+ 
++#ifdef GSSAPI
++	{
++	char *orig;
++	char *gss = NULL;
++	char *newstr = NULL;
++	orig = myproposal[PROPOSAL_KEX_ALGS];
++
++	/* 
++	 * If we don't have a host key, then there's no point advertising
++	 * the other key exchange algorithms
++	 */
++
++	if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
++		orig = NULL;
++
++	if (options.gss_keyex)
++		gss = ssh_gssapi_server_mechanisms();
++	else
++		gss = NULL;
++
++	if (gss && orig)
++		xasprintf(&newstr, "%s,%s", gss, orig);
++	else if (gss)
++		newstr = gss;
++	else if (orig)
++		newstr = orig;
++
++	/* 
++	 * If we've got GSSAPI mechanisms, then we've got the 'null' host
++	 * key alg, but we can't tell people about it unless its the only
++  	 * host key algorithm we support
++	 */
++	if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
++		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
++
++	if (newstr)
++		myproposal[PROPOSAL_KEX_ALGS] = newstr;
++	else
++		fatal("No supported key exchange algorithms");
++	}
++#endif
++
+ 	/* start key exchange */
+ 	kex = kex_setup(myproposal);
+ 	kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
+ 	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
+ 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
+ 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
++#ifdef GSSAPI
++	if (options.gss_keyex) {
++		kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
++		kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
++		kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
++	}
++#endif
+ 	kex->server = 1;
+ 	kex->client_version_string=client_version_string;
+ 	kex->server_version_string=server_version_string;
+diff -Nur openssh-5.4p1.orig/sshd_config openssh-5.4p1/sshd_config
+--- openssh-5.4p1.orig/sshd_config	2009-10-11 12:51:09.000000000 +0200
++++ openssh-5.4p1/sshd_config	2010-03-13 00:39:22.426530018 +0100
+@@ -71,6 +71,8 @@
+ # GSSAPI options
+ #GSSAPIAuthentication no
+ #GSSAPICleanupCredentials yes
++#GSSAPIStrictAcceptorCheck yes
++#GSSAPIKeyExchange no
+ 
+ # Set this to 'yes' to enable PAM authentication, account processing, 
+ # and session processing. If this is enabled, PAM authentication will 
+diff -Nur openssh-5.4p1.orig/sshd_config.5 openssh-5.4p1/sshd_config.5
+--- openssh-5.4p1.orig/sshd_config.5	2010-03-05 00:41:45.000000000 +0100
++++ openssh-5.4p1/sshd_config.5	2010-03-13 00:39:22.430994501 +0100
+@@ -379,12 +379,40 @@
+ The default is
+ .Dq no .
+ Note that this option applies to protocol version 2 only.
++.It Cm GSSAPIKeyExchange
++Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
++doesn't rely on ssh keys to verify host identity.
++The default is
++.Dq no .
++Note that this option applies to protocol version 2 only.
+ .It Cm GSSAPICleanupCredentials
+ Specifies whether to automatically destroy the user's credentials cache
+ on logout.
+ The default is
+ .Dq yes .
+ Note that this option applies to protocol version 2 only.
++.It Cm GSSAPIStrictAcceptorCheck
++Determines whether to be strict about the identity of the GSSAPI acceptor 
++a client authenticates against. If
++.Dq yes
++then the client must authenticate against the
++.Pa host
++service on the current hostname. If 
++.Dq no
++then the client may authenticate against any service key stored in the 
++machine's default store. This facility is provided to assist with operation 
++on multi homed machines. 
++The default is
++.Dq yes .
++Note that this option applies only to protocol version 2 GSSAPI connections,
++and setting it to 
++.Dq no
++may only work with recent Kerberos GSSAPI libraries.
++.It Cm GSSAPIStoreCredentialsOnRekey
++Controls whether the user's GSSAPI credentials should be updated following a 
++successful connection rekeying. This option can be used to accepted renewed 
++or updated credentials from a compatible client. The default is
++.Dq no .
+ .It Cm HostbasedAuthentication
+ Specifies whether rhosts or /etc/hosts.equiv authentication together
+ with successful public key client host authentication is allowed


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

From bdwalton at users.sourceforge.net  Thu Sep  2 01:33:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 01 Sep 2010 23:33:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10889] csw/mgar/pkg/gettext/trunk/files
Message-ID: <E1Oqwnr-0003Ch-FE@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10889
          http://gar.svn.sourceforge.net/gar/?rev=10889&view=rev
Author:   bdwalton
Date:     2010-09-01 23:33:15 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
gettext: add older libintl versions for backward compatibility

Added Paths:
-----------
    csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.amd64
    csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.i
    csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s
    csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s9

Added: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.amd64
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.amd64
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.i
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.i
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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

From bdwalton at users.sourceforge.net  Thu Sep  2 03:29:33 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 01:29:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10890]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1OqycP-0001S8-QS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10890
          http://gar.svn.sourceforge.net/gar/?rev=10890&view=rev
Author:   bdwalton
Date:     2010-09-02 01:29:33 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: make the post-install routines generic to more easily handle multiple lib version cruft

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-01 23:33:15 UTC (rev 10889)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:29:33 UTC (rev 10890)
@@ -84,6 +84,8 @@
 # just until checkpkg doesn't squawk about this.
 CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon
 
+SHELL = /bin/bash
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)
@@ -93,26 +95,21 @@
 post-install-isa-sparcv8:
 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
-	@cp $(FILEDIR)/libgettextlib-0.14.1.so.s $(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
-	@cp $(FILEDIR)/libintl.so.2.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
-	@cp $(FILEDIR)/libintl.so.3.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
-	$(DONADA)
+	@( for f in $(FILEDIR)/*.s; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s); done )
+	$(MAKECOOKIE)
 
 post-install-isa-sparcv9:
 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
-	@cp $(FILEDIR)/libgettextlib-0.14.1.so.s9 $(INSTALLISADIR)/opt/csw/lib/64/libgettextlib-0.14.1.so
-	@cp $(FILEDIR)/libintl.so.2.s9 $(INSTALLISADIR)/opt/csw/lib/64/libintl.so.2
-	@cp $(FILEDIR)/libintl.so.3.s9 $(INSTALLISADIR)/opt/csw/lib/64/libintl.so.3
-	$(DONADA)
+	@( for f in $(FILEDIR)/*.s9; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s9); done )
+	$(MAKECOOKIE)
 
 post-install-isa-i386:
 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
-	@cp $(FILEDIR)/libgettextlib-0.14.1.so.i $(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
-	@cp $(FILEDIR)/libintl.so.2.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
-	@cp $(FILEDIR)/libintl.so.3.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
-	$(DONADA)
+	@( for f in $(FILEDIR)/*.i; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .i); done )
+	$(MAKECOOKIE)
 
 post-install-isa-amd64:
 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
-	$(DONADA)
+	@( for f in $(FILEDIR)/*.amd64; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .amd64); done )
+	$(MAKECOOKIE)


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

From bdwalton at users.sourceforge.net  Thu Sep  2 03:31:49 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 01:31:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10891] csw/mgar/pkg/gettext/trunk/files
Message-ID: <E1Oqyeb-0001YD-94@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10891
          http://gar.svn.sourceforge.net/gar/?rev=10891&view=rev
Author:   bdwalton
Date:     2010-09-02 01:31:49 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: add more legacy lib versions

Added Paths:
-----------
    csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.amd64
    csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.i
    csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s
    csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s9

Added: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.amd64
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.amd64
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.i
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.i
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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

From bdwalton at users.sourceforge.net  Thu Sep  2 03:45:38 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 01:45:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10893]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Oqyry-0007DE-Qh@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10893
          http://gar.svn.sourceforge.net/gar/?rev=10893&view=rev
Author:   bdwalton
Date:     2010-09-02 01:45:38 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: include more libs in the runtime package

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:44:17 UTC (rev 10892)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:45:38 UTC (rev 10893)
@@ -64,6 +64,7 @@
 #PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libgettextpo\..*) 
 #so use this for now
 PKGFILES_CSWggettextrt  = .*/libintl\.so.* .*/libasprintf\.so.* .*/libgettextpo\.so.*
+PKGFILES_CSWggettextrt  = .*/libgettext.*\.so.*
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext /opt/csw/bin/gngettext /opt/csw/bin/genvsubst
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh /opt/csw/share/java/libintl.jar
 PKGFILES_CSWggettextrt += /opt/csw/share/locale/.*


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

From bdwalton at users.sourceforge.net  Thu Sep  2 04:09:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 02:09:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10895]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1OqzEp-0007m2-Cd@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10895
          http://gar.svn.sourceforge.net/gar/?rev=10895&view=rev
Author:   bdwalton
Date:     2010-09-02 02:09:15 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: a few more checkpkg overrides

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:55:23 UTC (rev 10894)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 02:09:15 UTC (rev 10895)
@@ -75,6 +75,9 @@
 CHECKPKG_OVERRIDES_CSWggettextel += surplus-dependency|CSWggettext
 # This lib is legacy from the old versions and can't be updated (easily)
 CHECKPKG_OVERRIDES_CSWggettext += bad-rpath-entry|/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs|opt/csw/lib/sparcv9/libgettextlib-0.14.1.so 
+# A few more legacy libs that we can't update.
+CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so
+CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so
 # just until checkpkg doesn't squawk about this.
 CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon
 


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

From bdwalton at users.sourceforge.net  Thu Sep  2 04:30:19 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 02:30:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10896]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1OqzZD-00087o-LP@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10896
          http://gar.svn.sourceforge.net/gar/?rev=10896&view=rev
Author:   bdwalton
Date:     2010-09-02 02:30:19 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: update dependencies for moved libs

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 02:09:15 UTC (rev 10895)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 02:30:19 UTC (rev 10896)
@@ -42,7 +42,7 @@
 NOISAEXEC = 1
 STRIP_LIBTOOL = 1
 
-RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv
+RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv CSWlibxml2 CSWncurses
 RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext


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

From wahwah at users.sourceforge.net  Thu Sep  2 10:41:01 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 02 Sep 2010 08:41:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10897] csw/mgar/gar/v2/bin/checkpkg
Message-ID: <E1Or5Lx-0000WX-PM@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10897
          http://gar.svn.sourceforge.net/gar/?rev=10897&view=rev
Author:   wahwah
Date:     2010-09-02 08:41:01 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
mGAR v2: checkpkg, removing mentions of the -o flags.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-09-02 02:30:19 UTC (rev 10896)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-09-02 08:41:01 UTC (rev 10897)
@@ -102,7 +102,6 @@
 #  - Use an pre-cached (from a catalog file?) list of md5 sums
 #  - Don't use the data from /var/sadm/install/contents
 SAVE_TAGS=0
-SAVED_TAGS_FILE=error-tags.txt
 display_help=0
 SKIP_STATS_COLLECTION=0
 MD5_SUMS_CATALOG_FILE=""
@@ -119,9 +118,6 @@
 	  s)
       SAVE_TAGS=1
       ;;
-    o)
-      SAVED_TAGS_FILE="${OPTARG}"
-      ;;
     d)
       DEBUG=1
       ;;
@@ -151,7 +147,6 @@
 
 readonly INSTALL_CONTENTS_FILES
 readonly MD5_SUMS_CATALOG_FILE
-readonly SAVED_TAGS_FILE
 readonly SAVE_TAGS
 readonly SKIP_STATS_COLLECTION
 readonly ANALYZE
@@ -163,22 +158,17 @@
   print 'Options:'
   print '   -c <file>  use an additional install/contents file'
   print '   -s         save error tags on disk'
-  print '   -o <file>  save tag output to file'
   print '   -d         display debug messages'
   print '   -N         skip statistics collection'
   print '   -M <file>  use package md5sums from a catalog file'
   print '   -A         Do not analyze the results.'
   print '   -p         Enable profiling'
   print '   -q         Display less messages'
+  print ''
+  print 'Error tags are saved to the sqlite database.'
   exit 0
 fi
 
-if [[ "${SAVE_TAGS}" -eq 1 ]]; then
-  if [[ -f "${SAVED_TAGS_FILE}" ]]; then
-  	rm "${SAVED_TAGS_FILE}"
-  fi
-fi
-
 # a unique filename for the list of package deps and libs we see in a 'set'
 SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S`
 SETLIBS=$SETINF.libs


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

From wahwah at users.sourceforge.net  Thu Sep  2 10:42:19 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 02 Sep 2010 08:42:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10898] csw/mgar/gar/v2/bin/checkpkg
Message-ID: <E1Or5ND-0001Qq-Lg@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10898
          http://gar.svn.sourceforge.net/gar/?rev=10898&view=rev
Author:   wahwah
Date:     2010-09-02 08:42:19 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
mGAR v2: checkpkg, removing mentions of the -s flag.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-09-02 08:41:01 UTC (rev 10897)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-09-02 08:42:19 UTC (rev 10898)
@@ -101,7 +101,6 @@
 # TODO: Options to add:
 #  - Use an pre-cached (from a catalog file?) list of md5 sums
 #  - Don't use the data from /var/sadm/install/contents
-SAVE_TAGS=0
 display_help=0
 SKIP_STATS_COLLECTION=0
 MD5_SUMS_CATALOG_FILE=""
@@ -115,9 +114,6 @@
 	  c)
 	    INSTALL_CONTENTS_FILES="${INSTALL_CONTENTS_FILES} ${OPTARG}"
 	    ;;
-	  s)
-      SAVE_TAGS=1
-      ;;
     d)
       DEBUG=1
       ;;
@@ -147,7 +143,6 @@
 
 readonly INSTALL_CONTENTS_FILES
 readonly MD5_SUMS_CATALOG_FILE
-readonly SAVE_TAGS
 readonly SKIP_STATS_COLLECTION
 readonly ANALYZE
 readonly PROFILE
@@ -157,7 +152,6 @@
   print 'Usage: checkpkg [options] pkg1 [pkg2 ....]'
   print 'Options:'
   print '   -c <file>  use an additional install/contents file'
-  print '   -s         save error tags on disk'
   print '   -d         display debug messages'
   print '   -N         skip statistics collection'
   print '   -M <file>  use package md5sums from a catalog file'


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

From wahwah at users.sourceforge.net  Thu Sep  2 11:56:40 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 02 Sep 2010 09:56:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10899] csw/mgar/gar/v2/lib/python
Message-ID: <E1Or6XA-0002s5-Rs@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10899
          http://gar.svn.sourceforge.net/gar/?rev=10899&view=rev
Author:   wahwah
Date:     2010-09-02 09:56:40 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
mGAR v2: checkpkg, improvements for the file name parsing function, to handle file names that don't conform to the standard.

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

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-09-02 08:42:19 UTC (rev 10898)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-09-02 09:56:40 UTC (rev 10899)
@@ -119,15 +119,28 @@
     p = p[:-4]
   bits = p.split("-")
   catalogname = bits[0]
-  version, version_info, revision_info = ParseVersionString(bits[1])
+  if len(bits) < 2:
+    version, version_info, revision_info = None, None, None
+    full_version_string = None
+  else:
+    version, version_info, revision_info = ParseVersionString(bits[1])
+    full_version_string = bits[1]
   if len(bits) == 5:
     osrel, arch, vendortag = bits[2:5]
-  else:
+  elif len(bits) == 4:
     arch, vendortag = bits[2:4]
     osrel = "unspecified"
+  elif len(bits) == 3:
+    arch = bits[2]
+    vendortag = "UNKN"
+    osrel = "unspecified"
+  else:
+    arch = "unknown"
+    vendortag = "UNKN"
+    osrel = "unspecified"
   data = {
       'catalogname': catalogname,
-      'full_version_string': bits[1],
+      'full_version_string': full_version_string,
       'version': version,
       'version_info': version_info,
       'revision_info': revision_info,

Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw_test.py	2010-09-02 08:42:19 UTC (rev 10898)
+++ csw/mgar/gar/v2/lib/python/opencsw_test.py	2010-09-02 09:56:40 UTC (rev 10899)
@@ -117,7 +117,21 @@
       self.assertEqual(catalogname, compiled["catalogname"])
       self.assertEqual(pkg_version, compiled["full_version_string"])
 
+  def testParsePackageFileName_RichpSe(self):
+    file_name = "RICHPse-3.5.1.pkg.gz"
+    parsed = opencsw.ParsePackageFileName(file_name)
+    self.assertEqual(parsed["version"], "3.5.1")
+    self.assertEqual(parsed["vendortag"], "UNKN")
+    self.assertEqual(parsed["arch"], "unknown")
+    self.assertEqual(parsed["osrel"], "unspecified")
+    self.assertEqual(parsed["catalogname"], "RICHPse")
 
+  def testParsePackageFileName_Nonsense(self):
+    """Checks if the function can sustain a non-conformant string."""
+    file_name = "What if I wrote a letter to my grandma here?"
+    parsed = opencsw.ParsePackageFileName(file_name)
+
+
 class ParsePackageFileNameTest_2(unittest.TestCase):
 
   def setUp(self):
@@ -143,6 +157,28 @@
     self.assertEqual("unspecified", parsed["osrel"])
 
 
+class ParseVersionStringTest(unittest.TestCase):
+
+  def test_NoRev(self):
+    data = "1.2.3"
+    expected = ('1.2.3', {
+      'minor version': '2',
+      'patchlevel': '3',
+      'major version': '1'},
+      {})
+    self.assertEqual(expected, opencsw.ParseVersionString(data))
+
+  def test_Text(self):
+    data = "That, sir, is a frab-rication! It's wabbit season!"
+    opencsw.ParseVersionString(data)
+
+  def test_Empty(self):
+    data = ""
+    opencsw.ParseVersionString(data)
+    expected = ('', {'major version': ''}, {})
+    self.assertEqual(expected, opencsw.ParseVersionString(data))
+
+
 class UpgradeTypeTest(unittest.TestCase):
 
   def testUpgradeType_1(self):


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

From wahwah at users.sourceforge.net  Thu Sep  2 12:13:43 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 02 Sep 2010 10:13:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[10900]
	csw/mgar/gar/v2/lib/python/checkpkg.py
Message-ID: <E1Or6nf-0003iW-RH@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10900
          http://gar.svn.sourceforge.net/gar/?rev=10900&view=rev
Author:   wahwah
Date:     2010-09-02 10:13:43 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
mGAR v2: checkpkg, deal with nonstandard architectures in a nicer way.

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-09-02 09:56:40 UTC (rev 10899)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-09-02 10:13:43 UTC (rev 10900)
@@ -934,7 +934,9 @@
   def GetCommonPaths(self, arch):
     """Returns a list of paths for architecture, from gar/etc/commondirs*."""
     # TODO: If this was cached, it could save a significant amount of time.
-    assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch)
+    if arch not in ('i386', 'sparc', 'all'):
+      logging.warn("Wrong arch: %s", repr(arch))
+      return []
     if arch == 'all':
       archs = ('i386', 'sparc')
     else:


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

From chninkel at users.sourceforge.net  Thu Sep  2 14:46:26 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 12:46:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10901] csw/mgar/pkg/openssh/trunk
Message-ID: <E1Or9BS-0002T0-RH@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10901
          http://gar.svn.sourceforge.net/gar/?rev=10901&view=rev
Author:   chninkel
Date:     2010-09-02 12:46:26 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: moved conf from /opt/csw/etc to /etc/opt/csw

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 10:13:43 UTC (rev 10900)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 12:46:26 UTC (rev 10901)
@@ -36,12 +36,12 @@
 CATALOGNAME_CSWossh = openssh
 SPKG_DESC_CSWossh = OpenSSH Secure Shell server 
 RUNTIME_DEP_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
-SPKG_CLASSES_CSWossh = none cswpreserveconf cswinitsmf
+SPKG_CLASSES_CSWossh = none cswmigrateconf cswpreserveconf cswinitsmf
 
 CATALOGNAME_CSWosshclient = openssh_client
 SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client 
 RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib 
-SPKG_CLASSES_CSWosshclient = none cswpreserveconf
+SPKG_CLASSES_CSWosshclient = none cswmigrateconf cswpreserveconf
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
@@ -53,9 +53,9 @@
 PKGFILES_CSWossh += $(libexecdir)/sftp-server
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
-PKGFILES_CSWossh += /var/empty
-PKGFILES_CSWossh += /etc$(prefix)/init.d/cswopenssh
-PKGFILES_CSWossh += /var$(prefix)/svc/manifest/network/cswopenssh.xml
+PKGFILES_CSWossh += $(localstatedir)/empty
+PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
+PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
 
 PKGFILES_CSWosshclient = $(bindir)/.*
 PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
@@ -69,11 +69,14 @@
 PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
 PROTOTYPE_PERMS_setuid = 4711
 
+PRESERVECONF = $(sysconfdir)/ssh/sshd_config
+PRESERVECONF += $(sysconfdir)/ssh/ssh_config
+PRESERVECONF += $(sysconfdir)/ssh/moduli
+INITSMF = $(sysconfdir)/init.d/cswopenssh
 
-PRESERVECONF = /opt/csw/etc/ssh/sshd_config
-PRESERVECONF += /opt/csw/etc/ssh/ssh_config
-PRESERVECONF += /opt/csw/etc/ssh/moduli
-INITSMF = /etc/opt/csw/init.d/cswopenssh
+MIGRATE_FILES_CSWossh = module sshd_config
+MIGRATE_FILES_CSWosshclient = ssh_config
+MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
 
 # The openssh package installs the server and the client
 CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
@@ -116,12 +119,20 @@
 
 ##### Build and installation information #####
 
+
+# to support shared /opt/csw setup
+# see http://wiki.opencsw.org/shared-opt-csw-setup
+localstatedir 	= /var$(prefix)
+sysconfdir 	= /etc$(prefix)
+
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-kerberos5=$(prefix)
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/ssh
 CONFIGURE_ARGS += --with-solaris-contracts
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix)
+CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty
 
 TEST_SCRIPTS	=
 
@@ -192,5 +203,5 @@
 	@$(MAKECOOKIE)
 
 merge-special-directories:
-	ginstall -d $(PKGROOT)/var/empty
+	ginstall -d $(PKGROOT)$(localstatedir)/empty
 	ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 10:13:43 UTC (rev 10900)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 12:46:26 UTC (rev 10901)
@@ -3,6 +3,9 @@
   * New upstream release.
   * Removed patch applied upstream (derelativise_path_bugfix.patch 
   and dont_derelativise_authorizedkeysfile_option.patch).
+  * Moved conf from /opt/csw/etc to /etc/opt/csw.
+  * Moved privilege separation directory from /var/empty to
+  /var/opt/csw/var/empty.
   * [Build system] Switched to dynamic prototype.
 
  -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 23:25:24 +0200


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

From chninkel at users.sourceforge.net  Thu Sep  2 15:30:27 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 13:30:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10902] csw/mgar/pkg/openssh/trunk
Message-ID: <E1Or9s3-0004DH-OF@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10902
          http://gar.svn.sourceforge.net/gar/?rev=10902&view=rev
Author:   chninkel
Date:     2010-09-02 13:30:27 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: fixed some configuration migration errors

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/THIS_LOCATION_IS_DEPRECATED

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 12:46:26 UTC (rev 10901)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 13:30:27 UTC (rev 10902)
@@ -53,6 +53,7 @@
 PKGFILES_CSWossh += $(libexecdir)/sftp-server
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
+PKGFILES_CSWossh += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
 PKGFILES_CSWossh += $(localstatedir)/empty
 PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
@@ -64,6 +65,7 @@
 PKGFILES_CSWosshclient += $(mandir)/man8/ssh-keysign.8
 PKGFILES_CSWosshclient += $(libexecdir)/ssh-keysign
 PKGFILES_CSWosshclient += $(sysconfdir)/ssh/ssh_config.CSW
+PKGFILES_CSWosshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
 
 PROTOTYPE_MODIFIERS = setuid
 PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
@@ -74,8 +76,13 @@
 PRESERVECONF += $(sysconfdir)/ssh/moduli
 INITSMF = $(sysconfdir)/init.d/cswopenssh
 
-MIGRATE_FILES_CSWossh = module sshd_config
+MIGRATE_FILES_CSWossh = moduli sshd_config 
+MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
+MIGRATE_FILES_CSWossh += shosts.equiv 
+MIGRATE_FILES_CSWossh += sshrc 
 MIGRATE_FILES_CSWosshclient = ssh_config
+MIGRATE_FILES_CSWosshclient += ssh_known_hosts ssh_known_hosts2
+MIGRATE_FILES_CSWosshclient += ssh_prng_cmds
 MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
 
 # The openssh package installs the server and the client
@@ -198,8 +205,9 @@
 
 merge-config-files:
 	# we change some default value in the server config file
-	perl -pi -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
+	perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
+	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(sysconfdir)/ssh/THIS_LOCATION_IS_DEPRECATED"
 	@$(MAKECOOKIE)
 
 merge-special-directories:

Added: csw/mgar/pkg/openssh/trunk/files/THIS_LOCATION_IS_DEPRECATED
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/THIS_LOCATION_IS_DEPRECATED	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/THIS_LOCATION_IS_DEPRECATED	2010-09-02 13:30:27 UTC (rev 10902)
@@ -0,0 +1,5 @@
+This location (/opt/csw/etc) is deprecated.
+
+Configuration files are currently being placed in /etc/opt/csw.  Please make
+sure your new configuration is in /etc/opt/csw and remove the old one from
+/opt/csw/etc.


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 Sep  2 16:14:27 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:14:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10903] csw/mgar/pkg/cpan/Heap/trunk
Message-ID: <E1OrAYd-0004wS-Ik@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10903
          http://gar.svn.sourceforge.net/gar/?rev=10903&view=rev
Author:   dmichelsen
Date:     2010-09-02 14:14:27 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
cpan/Heap: Update to 0.80 and mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/Heap/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.depend
    csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.gspec
    csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.prototype

Property Changed:
----------------
    csw/mgar/pkg/cpan/Heap/trunk/


Property changes on: csw/mgar/pkg/cpan/Heap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Heap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Heap/trunk/Makefile	2010-09-02 13:30:27 UTC (rev 10902)
+++ csw/mgar/pkg/cpan/Heap/trunk/Makefile	2010-09-02 14:14:27 UTC (rev 10903)
@@ -1,9 +1,9 @@
 GARNAME = Heap
-GARVERSION = 0.71
+GARVERSION = 0.80
 CATEGORIES = cpan
 AUTHOR = JMM
 
-DESCRIPTION = extensions for keeping data partially sorted
+DESCRIPTION = Extensions for keeping data partially sorted
 define BLURB
   The Heap collection of modules provide routines that manage a heap of
   elements.  A heap is a partially sorted structure that is always able to
@@ -11,6 +11,11 @@
   if a reversed compare routine is provided).
 endef
 
-DISTFILES = $(call admfiles,CSWpmheap,depend prototype)
+DISTFILES = COPYING
 
+PACKAGES = CSWpmheap
+CATALOGNAME = pm_heap
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Heap/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Heap/trunk/checksums	2010-09-02 13:30:27 UTC (rev 10902)
+++ csw/mgar/pkg/cpan/Heap/trunk/checksums	2010-09-02 14:14:27 UTC (rev 10903)
@@ -1,4 +1 @@
-2b38bb73854ece35a4bbf2b23eda8685  download/CSWpmheap.gspec
-6e0d583c86d7f74b43769810714242aa  download/CSWpmheap.depend
-d198f632bc76b9e0f4d29f4ca62bfd42  download/CSWpmheap.prototype
-6934be7ffe351b3eea844d24a07ebc36  download/Heap-0.71.tar.gz
+05fed19a7552dadee11c780cd68c0116  Heap-0.80.tar.gz

Copied: csw/mgar/pkg/cpan/Heap/trunk/files/COPYING (from rev 10898, csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.gspec)
===================================================================
--- csw/mgar/pkg/cpan/Heap/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Heap/trunk/files/COPYING	2010-09-02 14:14:27 UTC (rev 10903)
@@ -0,0 +1,2 @@
+This code is copyright 1998-2003 O'Reilly & Associates.  It is
+available on the same terms as perl itself.

Deleted: csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.depend
===================================================================
Deleted: csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.gspec
===================================================================
--- csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.gspec	2010-09-02 13:30:27 UTC (rev 10902)
+++ csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.gspec	2010-09-02 14:14:27 UTC (rev 10903)
@@ -1,7 +0,0 @@
-%var            bitname pm_heap
-%var            pkgname CSWpmheap
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-This code is copyright 1998-2003 O'Reilly & Associates.  It is
-available on the same terms as perl itself.

Deleted: csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.prototype
===================================================================
--- csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.prototype	2010-09-02 13:30:27 UTC (rev 10902)
+++ csw/mgar/pkg/cpan/Heap/trunk/files/CSWpmheap.prototype	2010-09-02 14:14:27 UTC (rev 10903)
@@ -1,58 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/Heap 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/Heap/.packlist 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/Heap.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Binary.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Binomial.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::Num.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::NumRev.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::Ref.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::RefRev.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::Str.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Elem::StrRev.3perl 0444 root bin
-f none /opt/csw/share/man/man3/Heap::Fibonacci.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/Heap 0755 root bin
-f none /opt/csw/share/perl/csw/Heap.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Binary.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Binomial.pm 0444 root bin
-d none /opt/csw/share/perl/csw/Heap/Elem 0755 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/Num.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/NumRev.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/Ref.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/RefRev.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/Str.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Elem/StrRev.pm 0444 root bin
-f none /opt/csw/share/perl/csw/Heap/Fibonacci.pm 0444 root bin
-d none /opt/csw/share/perl/csw/auto 0755 root bin
-d none /opt/csw/share/perl/csw/auto/Heap 0755 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Binary 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Binary/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Binomial 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Binomial/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem 0755 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/Num 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/Num/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/NumRev 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/NumRev/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/Ref 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/Ref/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/RefRev 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/RefRev/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/Str 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/Str/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Elem/StrRev 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/StrRev/autosplit.ix 0444 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Elem/autosplit.ix 0444 root bin
-d none /opt/csw/share/perl/csw/auto/Heap/Fibonacci 0755 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/Fibonacci/autosplit.ix 0444 root bin
-f none /opt/csw/share/perl/csw/auto/Heap/autosplit.ix 0444 root bin


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 Sep  2 16:24:30 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:24:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10904]
	csw/mgar/pkg/cpan/HTML-Format/trunk
Message-ID: <E1OrAiM-0005TN-EQ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10904
          http://gar.svn.sourceforge.net/gar/?rev=10904&view=rev
Author:   dmichelsen
Date:     2010-09-02 14:24:30 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
cpan/HTML-Format: Update to mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Format/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/HTML-Format/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.depend
    csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.gspec
    csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.prototype

Property Changed:
----------------
    csw/mgar/pkg/cpan/HTML-Format/trunk/


Property changes on: csw/mgar/pkg/cpan/HTML-Format/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 14:14:27 UTC (rev 10903)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 14:24:30 UTC (rev 10904)
@@ -3,15 +3,20 @@
 CATEGORIES = cpan
 AUTHOR = SBURKE
 
-DESCRIPTION = format HTML as plaintext
+DESCRIPTION = Format HTML as plaintext
 define BLURB
   The HTML::FormatText is a formatter that outputs plain latin1 text. All
   character attributes (bold/italic/underline) are ignored. Formatting of HTML
   tables and forms is not implemented.
 endef
 
-DISTFILES = $(call admfiles,CSWpmhtmlfmt,depend prototype)
+DISTFILES = COPYING
 
-DEPENDS += cpan/Font-AFM
+PACKAGES = CSWpmhtmlformat
+CATALOGANME = pm_htmlformat
 
+DEP_PKGS = CSWpmfontafm CSWpmhtmltree
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/HTML-Format/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/checksums	2010-09-02 14:14:27 UTC (rev 10903)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/checksums	2010-09-02 14:24:30 UTC (rev 10904)
@@ -1,4 +1 @@
-7aaa888fbdb4a63826f4ce86694e3824  download/CSWpmhtmlfmt.gspec
-239f6fa027bec1ce3e510cc02dc92d7a  download/CSWpmhtmlfmt.depend
-141ffb7e25f2e73a0d483e53728a82a9  download/CSWpmhtmlfmt.prototype
-2d287392b77c959f06397371116c2d7e  download/HTML-Format-2.04.tar.gz
+2d287392b77c959f06397371116c2d7e  HTML-Format-2.04.tar.gz

Copied: csw/mgar/pkg/cpan/HTML-Format/trunk/files/COPYING (from rev 10898, csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.gspec)
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/files/COPYING	2010-09-02 14:24:30 UTC (rev 10904)
@@ -0,0 +1,4 @@
+(c) 1995-2002 Gisle Aas and Sean M. Burke.  All rights reserved.
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.depend
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.depend	2010-09-02 14:14:27 UTC (rev 10903)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.depend	2010-09-02 14:24:30 UTC (rev 10904)
@@ -1 +0,0 @@
-P CSWpmfontafm pm_fontafm - interface to Adobe Font Metrics files

Deleted: csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.gspec
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.gspec	2010-09-02 14:14:27 UTC (rev 10903)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.gspec	2010-09-02 14:24:30 UTC (rev 10904)
@@ -1,9 +0,0 @@
-%var            bitname pm_htmlfmt
-%var            pkgname CSWpmhtmlfmt
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-\xA9 1995-2002 Gisle Aas and Sean M. Burke.  All rights reserved.
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.prototype
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.prototype	2010-09-02 14:14:27 UTC (rev 10903)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/files/CSWpmhtmlfmt.prototype	2010-09-02 14:24:30 UTC (rev 10904)
@@ -1,19 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/HTML-Format 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/HTML-Format/.packlist 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/HTML::FormatPS.3perl 0444 root bin
-f none /opt/csw/share/man/man3/HTML::FormatRTF.3perl 0444 root bin
-f none /opt/csw/share/man/man3/HTML::FormatText.3perl 0444 root bin
-f none /opt/csw/share/man/man3/HTML::Formatter.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/HTML 0755 root bin
-f none /opt/csw/share/perl/csw/HTML/FormatPS.pm 0444 root bin
-f none /opt/csw/share/perl/csw/HTML/FormatRTF.pm 0444 root bin
-f none /opt/csw/share/perl/csw/HTML/FormatText.pm 0444 root bin
-f none /opt/csw/share/perl/csw/HTML/Formatter.pm 0444 root bin


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 Sep  2 16:26:57 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:26:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10905]
	csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
Message-ID: <E1OrAkj-0005LU-0Y@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10905
          http://gar.svn.sourceforge.net/gar/?rev=10905&view=rev
Author:   dmichelsen
Date:     2010-09-02 14:26:56 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
cpan/HTML-Format: Fix typo

Modified Paths:
--------------
    csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile

Modified: csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 14:24:30 UTC (rev 10904)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 14:26:56 UTC (rev 10905)
@@ -13,7 +13,7 @@
 DISTFILES = COPYING
 
 PACKAGES = CSWpmhtmlformat
-CATALOGANME = pm_htmlformat
+CATALOGNAME = pm_htmlformat
 
 DEP_PKGS = CSWpmfontafm CSWpmhtmltree
 


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

From chninkel at users.sourceforge.net  Thu Sep  2 16:27:23 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:27:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10906] csw/mgar/pkg/openssh/trunk
Message-ID: <E1OrAl9-0005gS-3Y@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10906
          http://gar.svn.sourceforge.net/gar/?rev=10906&view=rev
Author:   chninkel
Date:     2010-09-02 14:27:22 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: fixed last configuration migration errors (I think)

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/files/cswopenssh
    csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
    csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 14:27:22 UTC (rev 10906)
@@ -53,7 +53,6 @@
 PKGFILES_CSWossh += $(libexecdir)/sftp-server
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
-PKGFILES_CSWossh += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
 PKGFILES_CSWossh += $(localstatedir)/empty
 PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
@@ -76,14 +75,15 @@
 PRESERVECONF += $(sysconfdir)/ssh/moduli
 INITSMF = $(sysconfdir)/init.d/cswopenssh
 
-MIGRATE_FILES_CSWossh = moduli sshd_config 
+MIGRATE_FILES_CSWossh = moduli sshd_config
 MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
-MIGRATE_FILES_CSWossh += shosts.equiv 
-MIGRATE_FILES_CSWossh += sshrc 
+MIGRATE_FILES_CSWossh += shosts.equiv
+MIGRATE_FILES_CSWossh += sshrc
 MIGRATE_FILES_CSWosshclient = ssh_config
 MIGRATE_FILES_CSWosshclient += ssh_known_hosts ssh_known_hosts2
 MIGRATE_FILES_CSWosshclient += ssh_prng_cmds
 MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
+MIGRATE_DEST_DIR = $(sysconfdir)/ssh
 
 # The openssh package installs the server and the client
 CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
@@ -102,6 +102,8 @@
 
 DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
 
+DISTFILES += THIS_LOCATION_IS_DEPRECATED
+
 LICENSE = LICENCE
 
 # The GSSAPI key exchange patch
@@ -207,7 +209,7 @@
 	# we change some default value in the server config file
 	perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
-	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(sysconfdir)/ssh/THIS_LOCATION_IS_DEPRECATED"
+	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
 	@$(MAKECOOKIE)
 
 merge-special-directories:

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2010-09-02 14:27:22 UTC (rev 10906)
@@ -12,7 +12,7 @@
 
 PATH=/usr/bin:/opt/csw/bin:/usr/sbin
 
-KEYDIR=/opt/csw/etc/ssh
+KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/sshd.pid
 case $1 in 
 'start')
@@ -28,7 +28,7 @@
                 fi     
         fi
 
-        [ -x /opt/csw/sbin/sshd ] && [ -f /opt/csw/etc/ssh/sshd_config ] && /opt/csw/sbin/sshd &
+        [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &
         ;;
 'stop')
         #

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml	2010-09-02 14:27:22 UTC (rev 10906)
@@ -32,7 +32,7 @@
 				restart_on='restart'
 				type='path'>
 				<service_fmri
-					value='file://localhost/opt/csw/etc/ssh/sshd_config' />
+					value='file://localhost/etc/opt/csw/ssh/sshd_config' />
 			</dependency>
 
 			<dependent
@@ -73,7 +73,7 @@
 				<manpage
 					title='sshd'
 					section='1M'
-					manpath='/opt/csw/man'/>
+					manpath='/opt/csw/share/man'/>
 			</documentation>
 		</template>
 	</service>

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2010-09-02 14:27:22 UTC (rev 10906)
@@ -2,7 +2,7 @@
 
 PATH=/usr/bin:/opt/csw/bin:/usr/sbin
 
-KEYDIR=/opt/csw/etc/ssh
+KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/sshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
 	if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then


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

From chninkel at users.sourceforge.net  Thu Sep  2 16:28:35 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:28:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10907] csw/mgar/pkg/openssh/trunk/files
Message-ID: <E1OrAmJ-0005NV-Ao@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10907
          http://gar.svn.sourceforge.net/gar/?rev=10907&view=rev
Author:   chninkel
Date:     2010-09-02 14:28:35 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: removed obsolete preinstall code

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
    csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall

Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 14:27:22 UTC (rev 10906)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 14:28:35 UTC (rev 10907)
@@ -20,25 +20,5 @@
 	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
 fi
 
-# Configuration file are now under /opt/csw/etc/ssh 
-# instead of /opt/csw/etc
-MOVE_CONF_FILE=0
-for FILE in ssh_config sshd_config moduli ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub; do
-	if [ -f "$PKG_ROOT_DIR/opt/csw/etc/$FILE" ]; then
-		if [ "$MOVE_CONF_FILE" -eq 0 ]; then
-			echo "WARNING: Openssh configuration files location has been changed !"
-			echo "         sshd_config and ssh_config files are now under /opt/csw/etc/ssh."
-			mkdir -p "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			chown root:bin "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			MOVE_CONF_FILE=1
-		fi
-		echo "Moving file /opt/csw/etc/$FILE -> /opt/csw/etc/ssh/$FILE ..."
-		mv "$PKG_ROOT_DIR/opt/csw/etc/$FILE" "$PKG_ROOT_DIR/opt/csw/etc/ssh/$FILE"
-	fi
-done
-
-# previous openssh package (< 4.6p1) doesn't stop openssh so we do it ourself
-pkill -15 -P 1 -f "^/opt/csw/sbin/sshd$"
-
 true
 

Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 14:27:22 UTC (rev 10906)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 14:28:35 UTC (rev 10907)
@@ -20,25 +20,5 @@
 	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
 fi
 
-# Configuration file are now under /opt/csw/etc/ssh 
-# instead of /opt/csw/etc
-MOVE_CONF_FILE=0
-for FILE in ssh_config sshd_config moduli ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub; do
-	if [ -f "$PKG_ROOT_DIR/opt/csw/etc/$FILE" ]; then
-		if [ "$MOVE_CONF_FILE" -eq 0 ]; then
-			echo "WARNING: Openssh configuration files location has been changed !"
-			echo "         sshd_config and ssh_config files are now under /opt/csw/etc/ssh."
-			mkdir -p "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			chown root:bin "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			MOVE_CONF_FILE=1
-		fi
-		echo "Moving file /opt/csw/etc/$FILE -> /opt/csw/etc/ssh/$FILE ..."
-		mv "$PKG_ROOT_DIR/opt/csw/etc/$FILE" "$PKG_ROOT_DIR/opt/csw/etc/ssh/$FILE"
-	fi
-done
-
-# previous openssh package (< 4.6p1) doesn't stop openssh so we do it ourself
-pkill -15 -P 1 -f "^/opt/csw/sbin/sshd$"
-
 true
 


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

From dmichelsen at users.sourceforge.net  Thu Sep  2 16:57:09 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 02 Sep 2010 14:57:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10908] csw/mgar/pkg/cpan/YAML/trunk
Message-ID: <E1OrBDx-0006DV-38@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10908
          http://gar.svn.sourceforge.net/gar/?rev=10908&view=rev
Author:   dmichelsen
Date:     2010-09-02 14:57:08 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
cpan/YAML: Update to 0.72

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

Modified: csw/mgar/pkg/cpan/YAML/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/YAML/trunk/Makefile	2010-09-02 14:28:35 UTC (rev 10907)
+++ csw/mgar/pkg/cpan/YAML/trunk/Makefile	2010-09-02 14:57:08 UTC (rev 10908)
@@ -1,7 +1,7 @@
 GARNAME = YAML
-GARVERSION = 0.68
+GARVERSION = 0.72
 CATEGORIES = cpan
-AUTHOR = INGY
+AUTHOR = ADAMK
 
 DESCRIPTION = YAML Aint Markup Language
 define BLURB
@@ -14,6 +14,8 @@
 PACKAGES = CSWpmyaml
 CATALOGNAME = pm_yaml
 
+LICENSE = LICENSE
+
 ARCHALL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/YAML/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/YAML/trunk/checksums	2010-09-02 14:28:35 UTC (rev 10907)
+++ csw/mgar/pkg/cpan/YAML/trunk/checksums	2010-09-02 14:57:08 UTC (rev 10908)
@@ -1 +1 @@
-4b4255360bb885acdba05314daa9129a  download/YAML-0.68.tar.gz
+35f8107367a5ba8c50965eca0ea7c370  YAML-0.72.tar.gz


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

From chninkel at users.sourceforge.net  Thu Sep  2 17:09:06 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 15:09:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10909] csw/mgar/pkg/openssh/trunk
Message-ID: <E1OrBPW-0006XW-20@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10909
          http://gar.svn.sourceforge.net/gar/?rev=10909&view=rev
Author:   chninkel
Date:     2010-09-02 15:09:05 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: switched to cswclassutils for user/group creation (no more preinstall code !)

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/cswusergroup

Removed Paths:
-------------
    csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
    csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 15:09:05 UTC (rev 10909)
@@ -36,12 +36,10 @@
 CATALOGNAME_CSWossh = openssh
 SPKG_DESC_CSWossh = OpenSSH Secure Shell server 
 RUNTIME_DEP_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
-SPKG_CLASSES_CSWossh = none cswmigrateconf cswpreserveconf cswinitsmf
 
 CATALOGNAME_CSWosshclient = openssh_client
 SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client 
 RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib 
-SPKG_CLASSES_CSWosshclient = none cswmigrateconf cswpreserveconf
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
@@ -56,6 +54,7 @@
 PKGFILES_CSWossh += $(localstatedir)/empty
 PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
+PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup
 
 PKGFILES_CSWosshclient = $(bindir)/.*
 PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
@@ -74,6 +73,7 @@
 PRESERVECONF += $(sysconfdir)/ssh/ssh_config
 PRESERVECONF += $(sysconfdir)/ssh/moduli
 INITSMF = $(sysconfdir)/init.d/cswopenssh
+USERGROUP = $(prefix)/etc/pkg/CSWossh/cswusergroup
 
 MIGRATE_FILES_CSWossh = moduli sshd_config
 MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
@@ -96,9 +96,10 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWossh.preinstall CSWossh.checkinstall
-DISTFILES += CSWosshlpk.preinstall CSWosshlpk.checkinstall
+DISTFILES += CSWossh.checkinstall
+DISTFILES += CSWosshlpk.checkinstall
 DISTFILES += changelog.CSW
+DISTFILES += cswusergroup
 
 DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
 
@@ -157,7 +158,6 @@
 	CATALOGNAME_CSWosshlpk = openssh_lpk
 	SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support
 	RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt
-	SPKG_CLASSES_CSWosshlpk = none cswpreserveconf cswinitsmf
 	MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/
 	PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
 	CONFIGURE_ARGS += --with-ldap
@@ -195,7 +195,6 @@
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/sshd.smf_wrapper" "$(PKGROOT)/opt/csw/sbin/sshd.smf_wrapper"
 
-
 merge-doc-files:
 	for DOCDIR in $(foreach _PKG,$(PACKAGES),$(call catalogname,$(_PKG))); do \
 		ginstall -d $(PKGROOT)/$(docdir)/$$DOCDIR; \
@@ -209,9 +208,10 @@
 	# we change some default value in the server config file
 	perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
+	ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
 	@$(MAKECOOKIE)
 
 merge-special-directories:
 	ginstall -d $(PKGROOT)$(localstatedir)/empty
-	ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh
+	ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh

Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-
-#checks for /dev/random are done in checkinstall
-
-grep '^sshd:' $PKG_ROOT_DIR/etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
-	getent passwd sshd >/dev/null
-	if [ $? -ne 0 ] ; then
-		NEEDUSER=1
-	fi
-fi
-
-if [ "$PKG_ROOT_DIR" = "" ] ; then
-	PKG_ROOT_DIR=/
-fi
-
-if [ "$NEEDUSER" = 1 ] ; then
-	echo Adding required sshd user
-	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
-fi
-
-true
-

Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-
-#checks for /dev/random are done in checkinstall
-
-grep '^sshd:' $PKG_ROOT_DIR/etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
-	getent passwd sshd >/dev/null
-	if [ $? -ne 0 ] ; then
-		NEEDUSER=1
-	fi
-fi
-
-if [ "$PKG_ROOT_DIR" = "" ] ; then
-	PKG_ROOT_DIR=/
-fi
-
-if [ "$NEEDUSER" = 1 ] ; then
-	echo Adding required sshd user
-	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
-fi
-
-true
-

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,4 +1,4 @@
-openssh (5.6p1,REV=2010.09.01) unstable
+openssh (5.6p1,REV=2010.09.02) unstable
 
   * New upstream release.
   * Removed patch applied upstream (derelativise_path_bugfix.patch 
@@ -7,8 +7,9 @@
   * Moved privilege separation directory from /var/empty to
   /var/opt/csw/var/empty.
   * [Build system] Switched to dynamic prototype.
+  * [Build system] Switched to cswclassutils for user/group creation.
 
- -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 23:25:24 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Sep 2010 23:25:24 +0200
 
 openssh (5.4p1,REV=2010.03.25) unstable
 

Added: csw/mgar/pkg/openssh/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/cswusergroup	2010-09-02 15:09:05 UTC (rev 10909)
@@ -0,0 +1 @@
+sshd:nogroup:sshd nonpriv user:/var/run:/bin/false:::NP


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 Sep  2 17:20:01 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 02 Sep 2010 15:20:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10910]
	csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
Message-ID: <E1OrBa5-0006ph-8s@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10910
          http://gar.svn.sourceforge.net/gar/?rev=10910&view=rev
Author:   dmichelsen
Date:     2010-09-02 15:20:00 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
cpan/HTML-Format: Add legacy package

Modified Paths:
--------------
    csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile

Modified: csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 15:09:05 UTC (rev 10909)
+++ csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile	2010-09-02 15:20:00 UTC (rev 10910)
@@ -13,10 +13,20 @@
 DISTFILES = COPYING
 
 PACKAGES = CSWpmhtmlformat
-CATALOGNAME = pm_htmlformat
+CATALOGNAME_CSWpmhtmlformat = pm_htmlformat
 
-DEP_PKGS = CSWpmfontafm CSWpmhtmltree
+# Legacy package
+PACKAGES += CSWpmhtmlfmt
+CATALOGNAME_CSWpmhtmlfmt = pm_htmlfmt
 
+SPKG_DESC_CSWpmhtmlformat = $(DESCRIPTION)
+SPKG_DESC_CSWpmhtmlfmt = Deprecated, empty stub to CSWpmhtmlformat
+
+DEP_PKGS_CSWpmhtmlformat = CSWpmfontafm CSWpmhtmltree
+RUNTIME_DEP_PKGS_CSWpmhtmlfmt = CSWpmhtmlformat
+
 ARCHALL = 1
 
+PKGFILES_CSWpmhtmlfmt = NOFILES
+
 include gar/category.mk


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

From chninkel at users.sourceforge.net  Thu Sep  2 23:40:39 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 21:40:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10911] csw/mgar/pkg/lftp/trunk
Message-ID: <E1OrHWR-0007GE-SX@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10911
          http://gar.svn.sourceforge.net/gar/?rev=10911&view=rev
Author:   chninkel
Date:     2010-09-02 21:40:39 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
lftp: added socks5 support

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 15:20:00 UTC (rev 10910)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 21:40:39 UTC (rev 10911)
@@ -24,7 +24,7 @@
 PACKAGES = CSWlftp
 CATALOGNAME_CSWlftp = lftp
 
-RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWosslrt CSWreadline 
+RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWosslrt CSWreadline CSWlibsocks
 
 
 ###### Upstream and opencsw files information #######
@@ -60,6 +60,8 @@
 # previous maintainer compiled with openssl
 # instead of gnutls, no need to change that
 CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw
+# Requested see https://www.opencsw.org/mantis/view.php?id=4481
+CONFIGURE_ARGS += --with-socksdante
 
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-02 15:20:00 UTC (rev 10910)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-02 21:40:39 UTC (rev 10911)
@@ -1,3 +1,9 @@
+lftp (4.0.9,REV=2010.09.02) unstable
+
+  * Added socks5 support (closees: #4481).
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 02 Sep 2010 23:35:37 +0200
+
 lftp (4.0.9,REV=2010.06.25) unstable
 
   * New upstream release.


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

From chninkel at users.sourceforge.net  Thu Sep  2 23:46:17 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 21:46:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10912] csw/mgar/pkg/openssl/trunk
Message-ID: <E1OrHbt-0007Pr-5P@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10912
          http://gar.svn.sourceforge.net/gar/?rev=10912&view=rev
Author:   chninkel
Date:     2010-09-02 21:46:16 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssl: fixed checkpkg compliance and switched to sun studio 12

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
    csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 21:46:16 UTC (rev 10912)
@@ -54,7 +54,7 @@
 
 CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates
 # we will not recompile old 0.9.7 version for now
-ifeq ($(GARCH),sparc) 
+ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7
 else
@@ -63,7 +63,7 @@
 endif
 
 # we do ship .a files in the devel package
-ifeq ($(GARCH),sparc) 
+ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
@@ -106,9 +106,6 @@
 
 ##### Build and installation information #####
 
-GARCOMPILER = SOS11
-
-
 # The list of instructions set for which we will 
 # provide optimized libraries and binaries
 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
@@ -202,4 +199,4 @@
 	cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf -
 	@$(MAKECOOKIE)
 
-post-merge: install-certs install-oldlibs install-changelog install-doc
+pre-package: install-certs install-oldlibs install-changelog install-doc

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype	2010-09-02 21:46:16 UTC (rev 10912)
@@ -11,3 +11,4 @@
 f none /opt/csw/share/doc/openssl/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossl

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 21:46:16 UTC (rev 10912)
@@ -1051,3 +1051,4 @@
 f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossldevel

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc	2010-09-02 21:46:16 UTC (rev 10912)
@@ -1050,3 +1050,7 @@
 f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossldevel
+i copyright=CSWossldevel.copyright
+i depend=CSWossldevel.depend
+i pkginfo=CSWossldevel.pkginfo

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 21:46:16 UTC (rev 10912)
@@ -41,3 +41,4 @@
 f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslrt

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc	2010-09-02 21:46:16 UTC (rev 10912)
@@ -44,3 +44,10 @@
 f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslrt
+i checkinstall=CSWosslrt.checkinstall
+i copyright=CSWosslrt.copyright
+i depend=CSWosslrt.depend
+i pkginfo=CSWosslrt.pkginfo
+i postinstall=CSWosslrt.postinstall
+i preinstall=CSWosslrt.preinstall

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2010-09-02 21:46:16 UTC (rev 10912)
@@ -74,3 +74,4 @@
 f none /opt/csw/share/doc/openssl_utils/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_utils/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_utils/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslutils


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

From chninkel at users.sourceforge.net  Fri Sep  3 00:34:13 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 22:34:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10914] csw/mgar/pkg/openssl/trunk/files
Message-ID: <E1OrIMH-0007Bn-34@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10914
          http://gar.svn.sourceforge.net/gar/?rev=10914&view=rev
Author:   chninkel
Date:     2010-09-02 22:34:12 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssl: fixed manual prototype

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 22:11:13 UTC (rev 10913)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 22:34:12 UTC (rev 10914)
@@ -1052,3 +1052,6 @@
 f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin
 i checkpkg_override=checkpkg_override.CSWossldevel
+i copyright=CSWossldevel.copyright
+i depend=CSWossldevel.depend
+i pkginfo=CSWossldevel.pkginfo

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 22:11:13 UTC (rev 10913)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 22:34:12 UTC (rev 10914)
@@ -42,3 +42,9 @@
 f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin
 i checkpkg_override=checkpkg_override.CSWosslrt
+i checkinstall=CSWosslrt.checkinstall
+i copyright=CSWosslrt.copyright
+i depend=CSWosslrt.depend
+i pkginfo=CSWosslrt.pkginfo
+i postinstall=CSWosslrt.postinstall
+i preinstall=CSWosslrt.preinstall


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

From chninkel at users.sourceforge.net  Fri Sep  3 00:52:23 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 22:52:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10915] csw/mgar/pkg/lftp/trunk/Makefile
Message-ID: <E1OrIdr-0000oY-ER@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10915
          http://gar.svn.sourceforge.net/gar/?rev=10915&view=rev
Author:   chninkel
Date:     2010-09-02 22:52:23 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
lftp: added missing autoconf call so dont_use_csw_getopt_h.patch patch is taken in account

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 22:34:12 UTC (rev 10914)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 22:52:23 UTC (rev 10915)
@@ -67,6 +67,11 @@
 
 include gar/category.mk
 
+# we re-run autoconf because we patched a m4 file
+pre-configure:
+	cd $(WORKSRC) && autoconf
+	@$(MAKECOOKIE)
+
 post-merge:
 	@ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW
 	@rm $(PKGROOT)/$(libdir)/charset.alias


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

From chninkel at users.sourceforge.net  Fri Sep  3 01:15:11 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 23:15:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10916]
	csw/mgar/pkg/openssl/trunk/Makefile
Message-ID: <E1OrIzv-0001PK-AE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10916
          http://gar.svn.sourceforge.net/gar/?rev=10916&view=rev
Author:   chninkel
Date:     2010-09-02 23:15:11 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssl: removed unused checkpkg overrides

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

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 22:52:23 UTC (rev 10915)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 23:15:11 UTC (rev 10916)
@@ -57,9 +57,6 @@
 ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7
-else
-CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/amd64/libcrypto.so.0.9.7
-CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/pentium_pro/libssl.so.0.9.7
 endif
 
 # we do ship .a files in the devel package


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

From bdwalton at users.sourceforge.net  Fri Sep  3 04:09:17 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 03 Sep 2010 02:09:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10917]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1OrLiP-00045g-0N@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10917
          http://gar.svn.sourceforge.net/gar/?rev=10917&view=rev
Author:   bdwalton
Date:     2010-09-03 02:09:16 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
gettext: one more override for a legacy lib

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 23:15:11 UTC (rev 10916)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-03 02:09:16 UTC (rev 10917)
@@ -78,6 +78,7 @@
 # A few more legacy libs that we can't update.
 CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so
 CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so
+CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
 # just until checkpkg doesn't squawk about this.
 CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon
 


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

From chninkel at users.sourceforge.net  Fri Sep  3 11:03:27 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 03 Sep 2010 09:03:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10918]
	csw/mgar/pkg/openssl/trunk/Makefile
Message-ID: <E1OrSBD-00027h-NA@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10918
          http://gar.svn.sourceforge.net/gar/?rev=10918&view=rev
Author:   chninkel
Date:     2010-09-03 09:03:27 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
openssl: fixed checkpkg overrides

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

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-03 02:09:16 UTC (rev 10917)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-03 09:03:27 UTC (rev 10918)
@@ -60,9 +60,9 @@
 endif
 
 # we do ship .a files in the devel package
-ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
+ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/libcrypto.a


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

From chninkel at users.sourceforge.net  Fri Sep  3 13:17:24 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 03 Sep 2010 11:17:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[10919] csw/mgar/pkg/lftp/trunk
Message-ID: <E1OrUGq-0001mV-Fi@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10919
          http://gar.svn.sourceforge.net/gar/?rev=10919&view=rev
Author:   chninkel
Date:     2010-09-03 11:17:24 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
lftp: configuration file migration from /opt/csw/etc/ to /etc/opt/csw

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2010-09-03 09:03:27 UTC (rev 10918)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-09-03 11:17:24 UTC (rev 10919)
@@ -51,10 +51,16 @@
 
 PATCHFILES += dont_use_csw_getopt_h.patch
 
-PRESERVECONF = /opt/csw/etc/lftp.conf
+PRESERVECONF = $(sysconfdir)/lftp.conf
 
+MIGRATE_FILES_CSWlftp = lftp.conf
+
 ##### Build and installation information #####
 
+# to support shared /opt/csw setup
+# see http://wiki.opencsw.org/shared-opt-csw-setup
+localstatedir   = /var$(prefix)
+sysconfdir      = /etc$(prefix)
 
 CONFIGURE_ARGS = $(DIRPATHS)
 # previous maintainer compiled with openssl

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-03 09:03:27 UTC (rev 10918)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-03 11:17:24 UTC (rev 10919)
@@ -1,6 +1,8 @@
-lftp (4.0.10,REV=2010.09.02) unstable
+lftp (4.0.10,REV=2010.09.03) unstable
 
+  * New upstream release.
   * Added socks5 support (closees: #4481).
+  * Configuration file migration from /opt/csw/etc to /etc/opt/csw.
 
  -- Yann Rouillard <yann at opencsw.org>  Thu, 02 Sep 2010 23:35:37 +0200
 


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

From bonivart at users.sourceforge.net  Fri Sep  3 13:50:47 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 03 Sep 2010 11:50:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10920]
	csw/mgar/pkg/cpan/SVN-Mirror/trunk
Message-ID: <E1OrUn9-0007jr-Rb@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10920
          http://gar.svn.sourceforge.net/gar/?rev=10920&view=rev
Author:   bonivart
Date:     2010-09-03 11:50:47 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
svn-mirror: update to 0.75

Modified Paths:
--------------
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.depend
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/


Property changes on: csw/mgar/pkg/cpan/SVN-Mirror/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile	2010-09-03 11:17:24 UTC (rev 10919)
+++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile	2010-09-03 11:50:47 UTC (rev 10920)
@@ -1,26 +1,24 @@
 GARNAME = SVN-Mirror
-GARVERSION = 0.72
+GARVERSION = 0.75
 CATEGORIES = cpan
 AUTHOR = CLKAO
 
-DESCRIPTION = mirror remote repository to local Subversion repository
+DESCRIPTION = Mirror remote repository to local Subversion repository
 define BLURB
   SVN::Mirror allows you to mirror remote repository to your local subversion
   repository.
 endef
 
-DISTFILES = $(call admfiles,CSWpmsvnmirror,depend)
+DISTFILES += COPYING
 
-DEPENDS += utils/subversion
-DEPENDS += cpan/TermReadKey
-DEPENDS += cpan/SVN-Simple
-DEPENDS += cpan/URI
-DEPENDS += cpan/Class-Accessor
-DEPENDS += cpan/File-chdir
+PACKAGES = CSWpmsvnmirror
+CATALOGNAME = pm_svnmirror
+ARCHALL = 1
 
+RUNTIME_DEP_PKGS += CSWpmdatauuid CSWpmsvn CSWsvn
+RUNTIME_DEP_PKGS += CSWpmsvnsimple CSWpmtermreadkey CSWpmuri
+
 # VCP Support (disabled for now)
-#DEPENDS += cpan/VCP
-#DEPENDS += cpan/Data-UUID
 PATCHFILES += novcp.diff
 
 # Test suite takes >20m, 0.67/SPARC

Modified: csw/mgar/pkg/cpan/SVN-Mirror/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/SVN-Mirror/trunk/checksums	2010-09-03 11:17:24 UTC (rev 10919)
+++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/checksums	2010-09-03 11:50:47 UTC (rev 10920)
@@ -1,4 +1 @@
-2d73a57da67f35223f5488e308fecfe3  download/CSWpmsvnmirror.gspec
-1e0f099dce15a853fb9feb3d16eb487f  download/CSWpmsvnmirror.depend
-e5b67a40307b06781b02468de5985261  download/SVN-Mirror-0.72.tar.gz
-49082178a81aa4c5e900dd288581c202  download/novcp.diff
+15c81a0958ae94e11fcb0dbb62548c98  SVN-Mirror-0.75.tar.gz

Added: csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/COPYING	2010-09-03 11:50:47 UTC (rev 10920)
@@ -0,0 +1,6 @@
+Copyright 2003 by Chia-liang Kao clkao at clkao.org.
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+See <http://www.perl.com/perl/misc/Artistic.html>.

Deleted: csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.depend
===================================================================
--- csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.depend	2010-09-03 11:17:24 UTC (rev 10919)
+++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.depend	2010-09-03 11:50:47 UTC (rev 10920)
@@ -1,7 +0,0 @@
-P CSWcommon  common - common files and dirs for CSW packages
-P CSWpmdatauuid pm_datauuid - extension for generating unique identifiers
-P CSWpmsvn pm_subversion - subversion perl language binding
-P CSWpmsvnsimple pm_svnsimple - a simple interface for driving svn delta editors
-P CSWpmtermreadkey pm_termreadkey - module for simple terminal control
-P CSWpmuri pm_uri -  Uniform Resource Identifiers (absolute and relative)
-P CSWsvn subversion - Version control rethought

Deleted: csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.gspec
===================================================================
--- csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.gspec	2010-09-03 11:17:24 UTC (rev 10919)
+++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/files/CSWpmsvnmirror.gspec	2010-09-03 11:50:47 UTC (rev 10920)
@@ -1,11 +0,0 @@
-%var            bitname pm_svnmirror
-%var            pkgname CSWpmsvnmirror
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Copyright 2003 by Chia-liang Kao clkao at clkao.org.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-See <http://www.perl.com/perl/misc/Artistic.html>.


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

From chninkel at users.sourceforge.net  Fri Sep  3 14:37:36 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 03 Sep 2010 12:37:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10921] csw/mgar/pkg/vsftpd/trunk
Message-ID: <E1OrVWS-00089E-B9@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10921
          http://gar.svn.sourceforge.net/gar/?rev=10921&view=rev
Author:   chninkel
Date:     2010-09-03 12:37:36 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
vsftpd: configuration directory migration from /opt/csw/etc/vsftpd to /etc/opt/csw/vsftpd

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-03 12:37:36 UTC (rev 10921)
@@ -32,11 +32,7 @@
 RUNTIME_DEP_PKGS  = CSWtcpwrap 
 RUNTIME_DEP_PKGS += CSWosslrt 
 
-# adding configuration handling classes
-# (init/smf classes are dynamically added in checkinstall)
-#SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf
 
-
 ###### Upstream and opencsw files information #######
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -49,10 +45,12 @@
 DISTFILES += cswvsftpd cswvsftpd.xml vsftpd.smf_wrapper
 DISTFILES += cswusergroup 
 
-PRESERVECONF = /opt/csw/etc/vsftpd/vsftpd.conf /opt/csw/etc/vsftpd/vsftpd.userlist
-USERGROUP = /opt/csw/etc/pkg/CSWvsftpd/cswusergroup
+PRESERVECONF = $(sysconfdir)/vsftpd/vsftpd.conf $(sysconfdir)/vsftpd/vsftpd.userlist
+USERGROUP = /etc/opt/csw/pkg/CSWvsftpd/cswusergroup
 INITSMF = /etc/opt/csw/init.d/cswvsftpd
 
+MIGRATE_FILES = vsftpd
+
 # The vsftpd user home directory has special rights
 PROTOTYPE_MODIFIERS = empty
 PROTOTYPE_FILES_empty = \/opt\/csw\/var\/empty\/vsftpd
@@ -103,6 +101,11 @@
 
 include gar/category.mk
 
+# to support shared /opt/csw setup
+# see http://wiki.opencsw.org/shared-opt-csw-setup
+localstatedir   = /var$(prefix)
+sysconfdir      = /etc$(prefix)
+
 # /opt/csw/include is not take in account 
 # by vsftp build system
 CFLAGS += -I$(includedir)

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-03 12:37:36 UTC (rev 10921)
@@ -1,15 +1 @@
-a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
-eeaf77528b2da0c7730323838f30b7ef  README.CSW
-281c51282cabd9475cceef363bbc699b  build_options.patch
-778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
-54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
-57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
-36e99857f4727e99a13721c8f726c856  cswusergroup
-796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
-93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
-83d13bd15ec4c0de2695640b7407c700  destdir.patch
-a9a65f55cbfd01f9d72d1de25e67148d  set_priv_sep_user.patch
 bad7b117d737a738738836041edc00db  vsftpd-2.3.2.tar.gz
-f6ce22a6959b93e500a4ae800295c2ee  vsftpd.conf
-0d4a1cf36560892adb9eb9410a01c522  vsftpd.smf_wrapper
-60c736802e2ce00c531953b01e4a26f6  vsftpd.userlist

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2010-09-03 12:37:36 UTC (rev 10921)
@@ -1,3 +1,10 @@
+vsftpd (2.3.2,REV=2010.09.03) UNRELEASED
+
+  * Configuration file migration from /opt/csw/etc/vsftpd to
+  /etc/opt/csw/vsftpd.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 03 Sep 2010 14:21:04 +0200
+
 vsftpd (2.3.2,REV=2010.08.31) unstable
 
   * New upstream version.


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

From bonivart at users.sourceforge.net  Fri Sep  3 14:40:28 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 03 Sep 2010 12:40:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10922] csw/mgar/pkg/cpan/SVK/trunk
Message-ID: <E1OrVZE-0005oh-8K@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10922
          http://gar.svn.sourceforge.net/gar/?rev=10922&view=rev
Author:   bonivart
Date:     2010-09-03 12:40:27 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
pm_svk: update to 2.2.3

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/SVK/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.depend

Modified: csw/mgar/pkg/cpan/SVK/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/SVK/trunk/Makefile	2010-09-03 12:37:36 UTC (rev 10921)
+++ csw/mgar/pkg/cpan/SVK/trunk/Makefile	2010-09-03 12:40:27 UTC (rev 10922)
@@ -1,28 +1,30 @@
 GARNAME = SVK
-GARVERSION = 2.2.1
+GARVERSION = 2.2.3
 CATEGORIES = cpan
 AUTHOR = CLKAO
 
-DESCRIPTION = a distributed version control system
+DESCRIPTION = A distributed version control system
 define BLURB
   SVK is a decentralized version control system written in Perl. It uses the
   Subversion filesystem but provides additional features.
 endef
 
-REQUIRED_PKGS  = CSWpmalgannotate CSWpmalgdiff CSWpmappcli CSWpmclone CSWpmclsaccessor CSWpmclsautouse
-REQUIRED_PKGS += CSWpmclsdtainherit CSWpmcompresszlib CSWpmdatahier CSWpmfiletype CSWpmfreezethaw CSWpmiodigest
-REQUIRED_PKGS += CSWpmiopager CSWpmlclemktxtlex CSWpmlclemktxtsimple CSWpmlistmoreut CSWpmlog4perl
-REQUIRED_PKGS += CSWpmpathclass CSWpmperlioeol CSWpmperlioviadyn CSWpmperlioviasym CSWpmpodescapes
-REQUIRED_PKGS += CSWpmpodsimple CSWpmregexpshellish CSWpmsvn CSWpmsvnmirror CSWpmsvnsimple CSWpmtermreadkey
-REQUIRED_PKGS += CSWpmtimedate CSWpmunivrequire CSWpmuri CSWpmyaml CSWpmyamlsyck
+DISTFILES += COPYING
 
+RUNTIME_DEP_PKGS  = CSWpmalgannotate CSWpmalgdiff CSWpmappcli CSWpmclone CSWpmclsaccessor CSWpmclsautouse
+RUNTIME_DEP_PKGS += CSWpmclsdtainherit CSWpmiocompress CSWpmdatahier CSWpmfiletype CSWpmfreezethaw CSWpmiodigest
+RUNTIME_DEP_PKGS += CSWpmiopager CSWpmlclemktxtlex CSWpmlclemktxtsimple CSWpmlistmoreutils CSWpmlog4perl
+RUNTIME_DEP_PKGS += CSWpmpathclass CSWpmperlioeol CSWpmperlioviadyn CSWpmperlioviasym
+RUNTIME_DEP_PKGS += CSWpmpodsimple CSWpmregexpshellish CSWpmsvn CSWpmsvnmirror CSWpmsvnsimple CSWpmtermreadkey
+RUNTIME_DEP_PKGS += CSWpmtimedate CSWpmunivrequire CSWpmuri CSWpmyaml CSWpmyamlsyck
+
 MODDIST = $(GARNAME)-v$(GARVERSION).tar.gz
 WORKSRC = $(WORKDIR)/$(GARNAME)-v$(GARVERSION)
 
 PACKAGES = CSWsvk
 CATALOGNAME = svk
-
 ARCHALL = 1
 
+SKIPTEST = 1
+
 include gar/category.mk
-

Modified: csw/mgar/pkg/cpan/SVK/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/SVK/trunk/checksums	2010-09-03 12:37:36 UTC (rev 10921)
+++ csw/mgar/pkg/cpan/SVK/trunk/checksums	2010-09-03 12:40:27 UTC (rev 10922)
@@ -1 +1 @@
-5778f876a744acebde5c9bff0bb865ce  download/SVK-v2.2.1.tar.gz
+86ad8796345400b7b0338dab7a4ca977  SVK-v2.2.3.tar.gz

Added: csw/mgar/pkg/cpan/SVK/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/SVK/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/SVK/trunk/files/COPYING	2010-09-03 12:40:27 UTC (rev 10922)
@@ -0,0 +1,19 @@
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of either:
+# 
+#   a) Version 2 of the GNU General Public License.  You should have
+#      received a copy of the GNU General Public License along with this
+#      program.  If not, write to the Free Software Foundation, Inc., 51
+#      Franklin Street, Fifth Floor, Boston, MA 02110-1301 or visit
+#      their web page on the internet at
+#      http://www.gnu.org/copyleft/gpl.html.
+# 
+#   b) Version 1 of Perl's "Artistic License".  You should have received
+#      a copy of the Artistic License with this package, in the file
+#      named "ARTISTIC".  The license is also available at
+#      http://opensource.org/licenses/artistic-license.php.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.

Deleted: csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.depend
===================================================================
--- csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.depend	2010-09-03 12:37:36 UTC (rev 10921)
+++ csw/mgar/pkg/cpan/SVK/trunk/files/CSWsvk.depend	2010-09-03 12:40:27 UTC (rev 10922)
@@ -1,33 +0,0 @@
-P CSWpmalgannotate pm_algorithmannotate - represent a series of changes in annotate form
-P CSWpmalgdiff pm_algorithmdiff - compute intelligent differences between two files/lists
-P CSWpmappcli pm_appcli - Dispatcher module for command line interface programs
-P CSWpmclone pm_clone - recursively copy Perl datatypes
-P CSWpmclsaccessor pm_clsaccessor - Automated accessor generation
-P CSWpmclsautouse pm_clsautouse - Run-time class loading on first method call
-P CSWpmclsdtainherit pm_clsdtainherit - inheritable, overridable class data
-P CSWpmcompresszlib pm_compresszlib - Interface to zlib compression library
-P CSWpmdatahier pm_datahier - handle data in a hierarchical structure
-P CSWpmfiletype pm_filetype - determine file type using magic
-P CSWpmfreezethaw pm_freezethaw - converting Perl structures to strings and back.
-P CSWpmiodigest pm_iodigest - calculate digests while reading or writing
-P CSWpmiopager pm_iopager - Select a pager, optionally pipe it output if destination is a TTY
-P CSWpmlclemktxtlex pm_lclemktxtlex - use other catalog formats in Maketext
-P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon
-P CSWpmlistmoreut pm_listmoreut - Provide the stuff missing in List::Util
-P CSWpmlog4perl pm_log4perl - Log4j implementation for Perl
-P CSWpmpathclass pm_pathclass - Cross-platform path specification manipulation
-P CSWpmperlioeol pm_perlioeol - PerlIO layer for normalizing line endings
-P CSWpmperlioviadyn pm_perlioviadyn - dynamic PerlIO layers
-P CSWpmperlioviasym pm_perlioviasym - PerlIO layers for creating symlinks
-P CSWpmpodescapes pm_podescapes - for resolving Pod E sequences
-P CSWpmpodsimple pm_podsimple - framework for parsing Pod
-P CSWpmregexpshellish pm_regexpshellish - shell-like regular expressions
-P CSWpmsvn pm_subversion - subversion perl language binding
-P CSWpmsvnmirror pm_svnmirror - mirror remote repository to local Subversion repository
-P CSWpmsvnsimple pm_svnsimple - a simple interface for driving svn delta editors
-P CSWpmtermreadkey pm_termreadkey - module for simple terminal control
-P CSWpmtimedate pm_timedate - parse date strings into time values
-P CSWpmunivrequire pm_univrequire - require modules from a variable
-P CSWpmuri pm_uri -  Uniform Resource Identifiers (absolute and relative)
-P CSWpmyaml pm_yaml - YAML Aint Markup Language
-P CSWpmyamlsyck pm_yamlsyck - Fast, lightweight YAML loader and dumper


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

From bonivart at users.sourceforge.net  Fri Sep  3 15:08:33 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 03 Sep 2010 13:08:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10923]
	csw/mgar/pkg/cpan/Pod-Simple/trunk
Message-ID: <E1OrW0O-0000bT-W5@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10923
          http://gar.svn.sourceforge.net/gar/?rev=10923&view=rev
Author:   bonivart
Date:     2010-09-03 13:08:32 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
pm_podsimple: update to 3.14, remove pm_podescapes as dep

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

Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2010-09-03 12:40:27 UTC (rev 10922)
+++ csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2010-09-03 13:08:32 UTC (rev 10923)
@@ -1,7 +1,7 @@
 GARNAME = Pod-Simple
-GARVERSION = 3.07
+GARVERSION = 3.14
 CATEGORIES = cpan
-AUTHOR = ARANDAL
+AUTHOR = DWHEELER
 
 DESCRIPTION = Framework for parsing Pod
 define BLURB
@@ -13,13 +13,8 @@
 
 DISTFILES = COPYING
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 PACKAGES = CSWpmpodsimple
 CATALOGNAME = pm_podsimple
 ARCHALL = 1
 
-RUNTIME_DEP_PKGS = CSWpmpodescapes
-
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums	2010-09-03 12:40:27 UTC (rev 10922)
+++ csw/mgar/pkg/cpan/Pod-Simple/trunk/checksums	2010-09-03 13:08:32 UTC (rev 10923)
@@ -1,2 +1 @@
-fc18c24e0f87b17e73977c7af25eb59a  download/COPYING
-8f5174c210b1caf52d2dbbcfe5e92630  download/Pod-Simple-3.07.tar.gz
+10b084e7f24c4fd70bbc00e0198a20d6  Pod-Simple-3.14.tar.gz


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

From rthurner at users.sourceforge.net  Fri Sep  3 19:43:54 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Fri, 03 Sep 2010 17:43:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10925]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OraIs-0004hm-7L@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10925
          http://gar.svn.sourceforge.net/gar/?rev=10925&view=rev
Author:   rthurner
Date:     2010-09-03 17:43:53 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
apr-uitl: correct package name

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

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-09-03 15:05:27 UTC (rev 10924)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-09-03 17:43:53 UTC (rev 10925)
@@ -14,7 +14,7 @@
 
 PATCHFILES = 0001-Make-sure-to-find-newly-built-libs-earlier.patch
 
-PACKAGES = CSWar-util
+PACKAGES = CSWapr-util
 CATALOGNAME = apr_util
 
 LICENSE = LICENSE


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

From gadavis at users.sourceforge.net  Fri Sep  3 23:21:37 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 03 Sep 2010 21:21:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10926] csw/mgar/pkg
Message-ID: <E1OrdhZ-0004mK-Md@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10926
          http://gar.svn.sourceforge.net/gar/?rev=10926&view=rev
Author:   gadavis
Date:     2010-09-03 21:21:37 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
Adding new package NetCDF

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

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-09-01 22:45:15 UTC (rev 10888)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-03 21:21:37 UTC (rev 10926)
@@ -11,8 +11,8 @@
 ## For more information about GAR variables, please see:
 ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
 ##
-GARNAME = mypkg
-GARVERSION = 1.0
+GARNAME = netcdf
+GARVERSION = 4.1.1
 ##
 ## The category that your software fits in. This is not a descriptive field, but
 ## influences the build process. Depending on the CATEGORIES setting, different
@@ -25,21 +25,23 @@
 CATEGORIES = lib
 ##
 ## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
+DESCRIPTION = machine-independent data formats for array-oriented scientific data
 ##
 ## A longer description of the package. This is only for descriptive purposes
 ## inside the Makefile and is not used elsewhere.
 define BLURB
-  <please fill in>
+  NetCDF (network Common Data Form) is a set of software libraries and 
+  machine-independent data formats that support the creation, access, 
+  and sharing of array-oriented scientific data. 
 endef
 ##
 ## Upstream URL that should show up in the VENDOR field as well as on
 ## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
+SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/
 ##
 ## Whitespace-separated list of URLs to download the source package from.
 ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES =
+MASTER_SITES = http://www.unidata.ucar.edu/downloads/netcdf/ftp/
 ##
 ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
 ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
@@ -123,10 +125,10 @@
 ## ETCSERVICES = <file containing an entry for /etc/services>
 ## INETDCONF = <file containing an inetd.conf formatted entry>
 ## A list of runtime package dependencies in the form of CSWfoo.
-## RUNTIME_DEP_PKGS =
+RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt
 ##
 ## A list of packages necessary to build this package
-## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex
 ##
 ## When using non-empty $(PACKAGES):
 ## RUNTIME_DEP_PKGS_CSWpkgname =
@@ -157,20 +159,40 @@
 ##
 ## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
 ## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
 ##
+## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
+## building 64-bit
+## BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+##
 ## Arguments passed to the ./configure script.
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS) \
+		 --enable-netcdf-4 \
+		 --enable-dap \
+		 --enable-ncgen4 \
+		 --enable-shared \
+		 --enable-separate-fortran \
+		 --enable-cxx4 \
+		 --enable-docs-install \
+		 --enable-udunits \
+		 --disable-logging \
+		 --with-hdf5=/opt/csw \
+		 --with-zlib=/opt/csw
+
 ##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
+## Disabling 64 bit builds until we can tweak GAR to handle Fortran  & ARCH
+BUILD64 = 0
+#CONFIGURE_ENV = CC=suncc CXX=sunCC F77=sunf77 FFLAGS="-dalign" FC=sunf95 \
+#		FCFLAGS="-dalign"
+CONFIGURE_ENV = CC=cc CXX=CC F77=f77 FC=f95
+EXTRA_CFLAGS = -g
+EXTRA_CPPFLAGS = -DsunFortran -D__FUNCTION__=__func__ -D_FILE_OFFSET_BITS=64
+EXTRA_CXXFLAGS = -g
 ## EXTRA_LDFLAGS =
 ## EXTRA_INC =
 ## EXTRA_LIB =
 ## GARFLAVOR =
 ## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
+OPT_FLAGS_SOS = -fast
 ## OPT_FLAGS_GCC = -O2 -pipe
 ##
 ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
@@ -178,8 +200,13 @@
 ##
 # Remove the following rules and uncomment the
 # include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
+#all: .DEFAULT
+#.DEFAULT:
+#	@true
 
-#include gar/category.mk
+include gar/category.mk
+
+pre-configure-modulated:
+	        @(cd $(WORKSRC); autoreconf)
+		@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/netcdf/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-09-01 22:45:15 UTC (rev 10888)
+++ csw/mgar/pkg/netcdf/trunk/checksums	2010-09-03 21:21:37 UTC (rev 10926)
@@ -0,0 +1 @@
+79c5ff14c80d5e18dd8f1fceeae1c8e1  netcdf-4.1.1.tar.gz


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

From gadavis at users.sourceforge.net  Sat Sep  4 01:58:11 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 03 Sep 2010 23:58:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10927] csw/mgar/gar
Message-ID: <E1Org95-0006N3-RW@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10927
          http://gar.svn.sourceforge.net/gar/?rev=10927&view=rev
Author:   gadavis
Date:     2010-09-03 23:58:11 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
First stab at adding fortran support to GAR

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

Added Paths:
-----------
    csw/mgar/gar/v2-fortran/

Modified: csw/mgar/gar/v2-fortran/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-09-01 14:23:33 UTC (rev 10882)
+++ csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-03 23:58:11 UTC (rev 10927)
@@ -475,6 +475,16 @@
    SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC
    SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC
  SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC
+    GCC3_F77 ?= $(GCC3_CC_HOME)/bin/g77
+    GCC4_F77 ?= $(GCC4_CC_HOME)/bin/gfortran
+   SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77
+   SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77
+ SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77
+     GCC3_FC ?= $(GCC3_CC_HOME)/bin/f77
+     GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran
+    SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95
+    SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95
+  SOS12U1_FC ?= $(SOS12U1_CC_HOME)/bin/f95
 
     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)
@@ -496,22 +506,44 @@
    SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath
    SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
  SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
+      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)
+     SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
+     SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
+   SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
+      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)
+     SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
+     SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
+   SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
 
 # Compiler version
     GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
    GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version)
+   GCC3_F77_VERSION = $(shell $(GCC3_F77) -v 2>&1| ggrep version)
+    GCC4_FC_VERSION = $(shell $(GCC4_FC) -v 2>&1| ggrep version)
     GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version)
    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_F77) -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: //')
+  SOS11_F77_VERSION = $(shell $(SOS11_F77) -V 2>&1| ggrep f90: | gsed -e 's/f90: //')
+   SOS11_FC_VERSION = $(shell $(SOS11_FC) -V 2>&1| ggrep f90: | gsed -e 's/f90: //')
    SOS12_CC_VERSION = $(shell $(SOS12_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+  SOS12_F77_VERSION = $(shell $(SOS12_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //')
+   SOS12_FC_VERSION = $(shell $(SOS12_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //')
   SOS12_CXX_VERSION = $(shell $(SOS12_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
  SOS12U1_CC_VERSION = $(shell $(SOS12U1_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
 SOS12U1_CXX_VERSION = $(shell $(SOS12U1_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
+SOS12U1_F77_VERSION = $(shell $(SOS12U1_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //')
+ SOS12U1_FC_VERSION = $(shell $(SOS12U1_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //')
 
  CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
 CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION)
+F77_VERSION = $($(GARCOMPILER)_F77_VERSION)
+ FC_VERSION = $($(GARCOMPILER)_FC_VERSION)
 
 #
 # Construct compiler options
@@ -558,12 +590,17 @@
 CC_HOME  = $($(GARCOMPILER)_CC_HOME)
 CC       = $($(GARCOMPILER)_CC)
 CXX      = $($(GARCOMPILER)_CXX)
+F77      = $($(GARCOMPILER)_F77)
+FC       = $($(GARCOMPILER)_FC)
+
 CFLAGS   ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS))
 CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS))
 CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS))
 LDFLAGS  ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS))
 ASFLAGS  ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS))
 OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS))
+FFLAGS   ?= $(strip $($(GARCOMPILER)_FFLAGS) $(_CATEGORY_FFLAGS) $(EXTRA_FFLAGS))
+FCFLAGS  ?= $(strip $($(GARCOMPILER)_FCFLAGS) $(_CATEGORY_FCFLAGS) $(EXTRA_FCFLAGS))
 
 GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
 GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
@@ -642,6 +679,7 @@
 
 ifeq ($(origin COMPILER_EXPORTS), undefined)
 COMPILER_EXPORTS  = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
+COMPILER_EXPORTS += FFLAGS FCFLAGS
 COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX
 COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION
 endif
@@ -743,6 +781,8 @@
 	echo "         CFLAGS = $(CFLAGS)";				\
 	echo "       CXXFLAGS = $(CXXFLAGS)";				\
 	echo "       CPPFLAGS = $(CPPFLAGS)";				\
+	echo "         FFLAGS = $(FFLAGS)";				\
+	echo "        FCFLAGS = $(FCFLAGS)";				\
 	echo "        LDFLAGS = $(LDFLAGS)";				\
 	echo "     LD_OPTIONS = $(LD_OPTIONS)";				\
 	echo "        ASFLAGS = $(ASFLAGS)";				\


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

From gadavis at users.sourceforge.net  Sat Sep  4 02:16:21 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Sat, 04 Sep 2010 00:16:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10928] csw/mgar/pkg/netcdf/branches
Message-ID: <E1OrgQf-00075e-Qt@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10928
          http://gar.svn.sourceforge.net/gar/?rev=10928&view=rev
Author:   gadavis
Date:     2010-09-04 00:16:21 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
try building with new gar v2-fortran

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Added Paths:
-----------
    csw/mgar/pkg/netcdf/branches/gar-fortran/


Property changes on: csw/mgar/pkg/netcdf/branches/gar-fortran
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-fortran


Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-03 21:21:37 UTC (rev 10926)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-04 00:16:21 UTC (rev 10928)
@@ -162,7 +162,7 @@
 ##
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
-## BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+## BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
 ##
 ## Arguments passed to the ./configure script.
 CONFIGURE_ARGS = $(DIRPATHS) \
@@ -179,14 +179,13 @@
 		 --with-zlib=/opt/csw
 
 ##
-## Disabling 64 bit builds until we can tweak GAR to handle Fortran  & ARCH
-BUILD64 = 0
+BUILD64 = 1
 #CONFIGURE_ENV = CC=suncc CXX=sunCC F77=sunf77 FFLAGS="-dalign" FC=sunf95 \
 #		FCFLAGS="-dalign"
-CONFIGURE_ENV = CC=cc CXX=CC F77=f77 FC=f95
-EXTRA_CFLAGS = -g
+#CONFIGURE_ENV = CC=cc CXX=CC F77=f77 FC=f95
+#EXTRA_CFLAGS = -g
 EXTRA_CPPFLAGS = -DsunFortran -D__FUNCTION__=__func__ -D_FILE_OFFSET_BITS=64
-EXTRA_CXXFLAGS = -g
+#EXTRA_CXXFLAGS = -g
 ## EXTRA_LDFLAGS =
 ## EXTRA_INC =
 ## EXTRA_LIB =
@@ -206,7 +205,3 @@
 
 include gar/category.mk
 
-pre-configure-modulated:
-	        @(cd $(WORKSRC); autoreconf)
-		@$(MAKECOOKIE)
-


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

From gadavis at users.sourceforge.net  Sat Sep  4 02:25:10 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Sat, 04 Sep 2010 00:25:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10929]
	csw/mgar/gar/v2-fortran/gar.conf.mk
Message-ID: <E1OrgZC-0007P2-3z@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10929
          http://gar.svn.sourceforge.net/gar/?rev=10929&view=rev
Author:   gadavis
Date:     2010-09-04 00:25:09 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
Fix norunpath argument to fortran executables

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

Modified: csw/mgar/gar/v2-fortran/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-04 00:16:21 UTC (rev 10928)
+++ csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-04 00:25:09 UTC (rev 10929)
@@ -508,14 +508,14 @@
  SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
       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)
-     SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
-     SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
-   SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -xnorunpath
+     SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
+     SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
+   SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
       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)
-     SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
-     SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
-   SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -xnorunpath
+     SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
+     SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
+   SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
 
 # Compiler version
     GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)


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

From bdwalton at users.sourceforge.net  Thu Sep  2 03:55:23 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 01:55:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10894]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Oqz1P-0002DF-S0@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10894
          http://gar.svn.sourceforge.net/gar/?rev=10894&view=rev
Author:   bdwalton
Date:     2010-09-02 01:55:23 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
gettext: += on the additional libs package splitting

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:45:38 UTC (rev 10893)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:55:23 UTC (rev 10894)
@@ -64,7 +64,7 @@
 #PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libgettextpo\..*) 
 #so use this for now
 PKGFILES_CSWggettextrt  = .*/libintl\.so.* .*/libasprintf\.so.* .*/libgettextpo\.so.*
-PKGFILES_CSWggettextrt  = .*/libgettext.*\.so.*
+PKGFILES_CSWggettextrt += .*/libgettext.*\.so.*
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext /opt/csw/bin/gngettext /opt/csw/bin/genvsubst
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh /opt/csw/share/java/libintl.jar
 PKGFILES_CSWggettextrt += /opt/csw/share/locale/.*


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

From bonivart at users.sourceforge.net  Fri Sep  3 17:05:27 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 03 Sep 2010 15:05:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10924] csw/mgar/pkg/dcc/trunk/Makefile
Message-ID: <E1OrXpX-00046s-9P@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10924
          http://gar.svn.sourceforge.net/gar/?rev=10924&view=rev
Author:   bonivart
Date:     2010-09-03 15:05:27 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
dcc: fix ownership of map file

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

Modified: csw/mgar/pkg/dcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dcc/trunk/Makefile	2010-09-03 13:08:32 UTC (rev 10923)
+++ csw/mgar/pkg/dcc/trunk/Makefile	2010-09-03 15:05:27 UTC (rev 10924)
@@ -46,6 +46,11 @@
 SAMPLECONF += /var/opt/csw/dcc/whitecommon
 SAMPLECONF += /var/opt/csw/dcc/whitelist
 
+# Fix ownership of map file
+PROTOTYPE_MODIFIERS = 1
+PROTOTYPE_FILES_1 = /var/opt/csw/dcc/map
+PROTOTYPE_USER_1 = dcc
+
 SPKG_SOURCEURL = http://www.rhyolite.com/dcc/
 CONFFILES =  dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist
 DOCFILES = CHANGES FAQ.txt INSTALL.txt RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4


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

From chninkel at users.sourceforge.net  Fri Sep  3 00:11:14 2010
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Thu, 02 Sep 2010 22:11:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10913] csw/mgar/pkg/lftp/trunk
Message-ID: <E1OrI02-00088Z-1X@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10913
          http://gar.svn.sourceforge.net/gar/?rev=10913&view=rev
Author:   chninkel
Date:     2010-09-02 22:11:13 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
lftp: updated to 4.0.10

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/checksums
    csw/mgar/pkg/lftp/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 21:46:16 UTC (rev 10912)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-09-02 22:11:13 UTC (rev 10913)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = lftp
-GARVERSION = 4.0.9
+GARVERSION = 4.0.10
 CATEGORIES = net
 
 DESCRIPTION = A sophisticated command-line ftp/http client

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2010-09-02 21:46:16 UTC (rev 10912)
+++ csw/mgar/pkg/lftp/trunk/checksums	2010-09-02 22:11:13 UTC (rev 10913)
@@ -1,4 +1 @@
-75861629a62ad12236b82baa00b9126a  changelog.CSW
-a8baca88197dfe533c639c1fe866fa5c  dont_use_csw_getopt_h.patch
-0cd4072676264c6ed6f0b9b43dc89968  lftp-4.0.9.tar.gz
-1a9dd9857cef5453fc14102dbc2e7713  sun_cc_no_restrict.patch
+2729f41bc21130f96190d41d34bb8809  lftp-4.0.10.tar.gz

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-02 21:46:16 UTC (rev 10912)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-09-02 22:11:13 UTC (rev 10913)
@@ -1,4 +1,4 @@
-lftp (4.0.9,REV=2010.09.02) unstable
+lftp (4.0.10,REV=2010.09.02) unstable
 
   * Added socks5 support (closees: #4481).
 


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

From bdwalton at users.sourceforge.net  Thu Sep  2 03:44:17 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 02 Sep 2010 01:44:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10892] csw/mgar/pkg/gettext/trunk
Message-ID: <E1Oqyqf-0001pe-NF@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10892
          http://gar.svn.sourceforge.net/gar/?rev=10892&view=rev
Author:   bdwalton
Date:     2010-09-02 01:44:17 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
drop the legacy libs from distfiles; update makesums

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:31:49 UTC (rev 10891)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-09-02 01:44:17 UTC (rev 10892)
@@ -24,13 +24,6 @@
 MASTER_SITES = $(GNU_MIRROR)
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-#Include earlier library revisions for compatibility with existing packages
-DISTFILES += libgettextlib-0.14.1.so.i
-DISTFILES += libgettextlib-0.14.1.so.s
-DISTFILES += libintl.so.2.i
-DISTFILES += libintl.so.2.s
-DISTFILES += libintl.so.3.i
-DISTFILES += libintl.so.3.s
 
 PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
 PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch

Modified: csw/mgar/pkg/gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/gettext/trunk/checksums	2010-09-02 01:31:49 UTC (rev 10891)
+++ csw/mgar/pkg/gettext/trunk/checksums	2010-09-02 01:44:17 UTC (rev 10892)
@@ -1,9 +1,3 @@
 a772021542b5c511ea9542a06996ed64  0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
 56f02edaf64175e69988f78bb53c8753  0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch
 3dd55b952826d2b32f51308f2f91aa89  gettext-0.18.1.1.tar.gz
-d44a9a6ec0952bad7ad07026ccb42a10  libgettextlib-0.14.1.so.i
-ff0219d47dbc11034b55872172488e01  libgettextlib-0.14.1.so.s
-80123ce62a2ef58afb3f6f07a12bd1c1  libintl.so.2.i
-3ab768083f6ecc5cada151e49be21aa0  libintl.so.2.s
-ceb5de2326a4726d3710fe1512b84592  libintl.so.3.i
-88db7322e263a00f24269a7f364fdc2d  libintl.so.3.s


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 Sep  6 18:57:46 2010
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 06 Sep 2010 16:57:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[10930]
	csw/mgar/pkg/sdlmixer/trunk/Makefile
Message-ID: <E1Osf0s-0007j8-M0@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10930
          http://gar.svn.sourceforge.net/gar/?rev=10930&view=rev
Author:   jake_goerzen
Date:     2010-09-06 16:57:46 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
sdlmixer: respin package to bind with newer libmikmod

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

Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sdlmixer/trunk/Makefile	2010-09-04 00:25:09 UTC (rev 10929)
+++ csw/mgar/pkg/sdlmixer/trunk/Makefile	2010-09-06 16:57:46 UTC (rev 10930)
@@ -2,7 +2,7 @@
 GARVERSION = 1.2.11
 CATEGORIES = lib
 
-DESCRIPTION = multi-channel audio mixer library
+DESCRIPTION = Multi-channel audio mixer library
 define BLURB
 SDL mixer supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries.
 endef


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

From bonivart at users.sourceforge.net  Wed Sep  8 17:55:55 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 08 Sep 2010 15:55:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10931]
	csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
Message-ID: <E1OtN07-0008Ng-OL@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10931
          http://gar.svn.sourceforge.net/gar/?rev=10931&view=rev
Author:   bonivart
Date:     2010-09-08 15:55:55 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
pm_podsimple: remove man pages

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

Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2010-09-06 16:57:46 UTC (rev 10930)
+++ csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2010-09-08 15:55:55 UTC (rev 10931)
@@ -17,4 +17,6 @@
 CATALOGNAME = pm_podsimple
 ARCHALL = 1
 
+EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.*
+
 include gar/category.mk


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

From gadavis at users.sourceforge.net  Wed Sep  8 19:35:15 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Wed, 08 Sep 2010 17:35:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10932]
	csw/mgar/gar/v2-fortran/gar.conf.mk
Message-ID: <E1OtOYF-0001km-6s@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10932
          http://gar.svn.sourceforge.net/gar/?rev=10932&view=rev
Author:   gadavis
Date:     2010-09-08 17:35:14 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
Add Fortran compilers to ccenv target

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

Modified: csw/mgar/gar/v2-fortran/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-08 15:55:55 UTC (rev 10931)
+++ csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-08 17:35:14 UTC (rev 10932)
@@ -733,6 +733,8 @@
 	@echo
 	@echo "    C Compiler: $(CC)"
 	@echo "  C++ Compiler: $(CXX)"
+	@echo "  F77 Compiler: $(F77)"
+	@echo "   FC Compiler: $(FC)"
 	@echo
 	@echo "Compiler ISA generation matrix:"
 	@echo


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

From rthurner at users.sourceforge.net  Wed Sep  8 21:57:34 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 19:57:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10933]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtQly-0000wr-Az@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10933
          http://gar.svn.sourceforge.net/gar/?rev=10933&view=rev
Author:   rthurner
Date:     2010-09-08 19:57:34 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: update dependencies

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 17:35:14 UTC (rev 10932)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 19:57:34 UTC (rev 10933)
@@ -30,8 +30,8 @@
 DISTFILES += update20to22
 
 RUNTIME_DEP_PKGS_CSWapache2        = CSWexpat CSWiconv
-RUNTIME_DEP_PKGS_CSWapache2       += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2       += CSWsqlite3rt
+RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-utiSWapr-util
 
 # The SMF support: you don't need to specify cswinitsmf any more.  You need to
 # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during


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

From rthurner at users.sourceforge.net  Wed Sep  8 21:59:47 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 19:59:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10934]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtQo7-00010Q-7w@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10934
          http://gar.svn.sourceforge.net/gar/?rev=10934&view=rev
Author:   rthurner
Date:     2010-09-08 19:59:47 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: update initsmf

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 19:57:34 UTC (rev 10933)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 19:59:47 UTC (rev 10934)
@@ -37,7 +37,7 @@
 # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during
 # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to
 # the Makefile.
-INITSMF = /opt/csw/etc/init.d/cswapache2
+INITSMF = /etc/opt/csw/init.d/cswapache2
 
 pre-configure-modulated:
 	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)


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

From rthurner at users.sourceforge.net  Wed Sep  8 22:24:59 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 20:24:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10935]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtRCV-0003sZ-QV@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10935
          http://gar.svn.sourceforge.net/gar/?rev=10935&view=rev
Author:   rthurner
Date:     2010-09-08 20:24:59 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: typo in dependencies

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 19:59:47 UTC (rev 10934)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:24:59 UTC (rev 10935)
@@ -31,7 +31,7 @@
 
 RUNTIME_DEP_PKGS_CSWapache2        = CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-utiSWapr-util
+RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util
 
 # The SMF support: you don't need to specify cswinitsmf any more.  You need to
 # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during


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

From rthurner at users.sourceforge.net  Wed Sep  8 22:30:55 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 20:30:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10936]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtRIF-00022v-Id@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10936
          http://gar.svn.sourceforge.net/gar/?rev=10936&view=rev
Author:   rthurner
Date:     2010-09-08 20:30:55 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: change from /opt/csw to /etc/opt/csw

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:24:59 UTC (rev 10935)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:30:55 UTC (rev 10936)
@@ -75,8 +75,8 @@
 
 # Copy in specialized templates
 copy-local-files:
-	@ginstall -d $(DESTDIR)/opt/csw/etc/init.d
-	@ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/opt/csw/etc/init.d
+	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	@ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc
 	@ginstall $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra


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

From rthurner at users.sourceforge.net  Wed Sep  8 22:32:50 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 20:32:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10937]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtRK6-0004HE-5S@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10937
          http://gar.svn.sourceforge.net/gar/?rev=10937&view=rev
Author:   rthurner
Date:     2010-09-08 20:32:49 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: try to get bdb48 into the run path

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:30:55 UTC (rev 10936)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:32:49 UTC (rev 10937)
@@ -33,6 +33,9 @@
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util
 
+# We need this to get bdb48/lib into the runpath
+EXTRA_LIB = $(prefix)/bdb48/lib
+
 # The SMF support: you don't need to specify cswinitsmf any more.  You need to
 # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during
 # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to


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

From rthurner at users.sourceforge.net  Wed Sep  8 23:00:51 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 08 Sep 2010 21:00:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[10938]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OtRlD-0005jc-Mm@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10938
          http://gar.svn.sourceforge.net/gar/?rev=10938&view=rev
Author:   rthurner
Date:     2010-09-08 21:00:51 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
apache2: depend on bdb48

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 20:32:49 UTC (rev 10937)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-08 21:00:51 UTC (rev 10938)
@@ -31,7 +31,7 @@
 
 RUNTIME_DEP_PKGS_CSWapache2        = CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util
+RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib


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

From gadavis at users.sourceforge.net  Fri Sep 10 00:49:53 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 09 Sep 2010 22:49:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10939] csw/mgar/pkg
Message-ID: <E1OtpwH-0008IB-Ub@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10939
          http://gar.svn.sourceforge.net/gar/?rev=10939&view=rev
Author:   gadavis
Date:     2010-09-09 22:49:53 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
Initial package definition for arch-independent GMT Coastlines

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

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

Modified: csw/mgar/pkg/gmtcoast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-09-03 21:21:37 UTC (rev 10926)
+++ csw/mgar/pkg/gmtcoast/trunk/Makefile	2010-09-09 22:49:53 UTC (rev 10939)
@@ -2,184 +2,37 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
-GARNAME = mypkg
-GARVERSION = 1.0
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
-CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GSHHS_VERSION = 2.1.0
+
+GARNAME = gmtcoast
+GARVERSION = $(GSHHS_VERSION)
+CATEGORIES = apps
+DESCRIPTION = Coastline Definition Files for Generic Mapping Tools
 define BLURB
-  <please fill in>
+  GMT is an open source collection of ~60 tools for manipulating geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting, etc.) and producing Encapsulated PostScript File (EPS) illustrations ranging from simple x-y plots via contour maps to artificially illuminated surfaces and 3-D perspective views. GMT supports ~30 map projections and transformations and comes with support data such as GSHHS coastlines, rivers, and political boundaries. GMT is developed and maintained by Paul Wessel and Walter H. F. Smith with help from a global set of volunteers, and is supported by the National Science Foundation. It is released under the GNU General Public License. 
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES =
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-##  on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
-## RUNTIME_DEP_PKGS =
-##
-## A list of packages necessary to build this package
-## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
-##
-## Arguments passed to the ./configure script.
-CONFIGURE_ARGS = $(DIRPATHS)
-##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
 
-#include gar/category.mk
+SPKG_SOURCEURL = http://gmt.soest.hawaii.edu/
+MASTER_SITES = ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://gd.tuwien.ac.at/pub/gmt/
+
+DISTFILES  = GSHHS$(GSHHS_VERSION)_coast.tar.bz2 \
+	     GSHHS$(GSHHS_VERSION)_full.tar.bz2 \
+	     GSHHS$(GSHHS_VERSION)_high.tar.bz2 
+
+UFILES_REGEX = GSHHS(\d+(?:\.\d+)*)_(.*).tar.gz
+
+ARCHALL = 1
+
+LICENSE = LICENSE.TXT
+
+## The tarball just dumps into the current directory, no archive name
+WORKSRC = $(WORKDIR)
+
+include gar/category.mk
+
+install-custom:
+	@echo " ==> Installing $(GARNAME)"
+	@rm -rf $(DESTDIR)$(datadir)/coast
+	@ginstall -d $(DESTDIR)$(datadir)/coast
+	@cp -r $(WORKSRC)/share/coast/* $(DESTDIR)$(datadir)/coast/
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/gmtcoast/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-09-03 21:21:37 UTC (rev 10926)
+++ csw/mgar/pkg/gmtcoast/trunk/checksums	2010-09-09 22:49:53 UTC (rev 10939)
@@ -0,0 +1,3 @@
+1f84a99effe96e12fb60f31fa3cf35bb  GSHHS2.1.0_coast.tar.bz2
+da679a412056e401bb624a213d4b11d6  GSHHS2.1.0_full.tar.bz2
+51128a3c545fd48364a2da830ebce1b6  GSHHS2.1.0_high.tar.bz2


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

From gadavis at users.sourceforge.net  Fri Sep 10 01:36:11 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 09 Sep 2010 23:36:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10940]
	csw/mgar/pkg/gmtcoast/trunk/Makefile
Message-ID: <E1Otqf5-0002AU-Dg@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10940
          http://gar.svn.sourceforge.net/gar/?rev=10940&view=rev
Author:   gadavis
Date:     2010-09-09 23:36:11 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
Add in missing SCRIPTS variables that somehow disappeared from initial checkin

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

Modified: csw/mgar/pkg/gmtcoast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gmtcoast/trunk/Makefile	2010-09-09 22:49:53 UTC (rev 10939)
+++ csw/mgar/pkg/gmtcoast/trunk/Makefile	2010-09-09 23:36:11 UTC (rev 10940)
@@ -25,6 +25,11 @@
 
 LICENSE = LICENSE.TXT
 
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+INSTALL_SCRIPTS = custom
+TEST_SCRIPTS =
+
 ## The tarball just dumps into the current directory, no archive name
 WORKSRC = $(WORKDIR)
 


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

From gadavis at users.sourceforge.net  Fri Sep 10 06:39:42 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 10 Sep 2010 04:39:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[10941]
 csw/mgar/pkg/gmtcoast/tags/gmt_gmtcoast-2.1.0, REV= 2010.09.10/
Message-ID: <E1OtvOo-0002hd-OY@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10941
          http://gar.svn.sourceforge.net/gar/?rev=10941&view=rev
Author:   gadavis
Date:     2010-09-10 04:39:42 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
gmtcoast: Tag as release 2.1.0,REV=2010.09.10 for project 'gmt'

Added Paths:
-----------
    csw/mgar/pkg/gmtcoast/tags/gmt_gmtcoast-2.1.0,REV=2010.09.10/


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

From gadavis at users.sourceforge.net  Fri Sep 10 07:19:06 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 10 Sep 2010 05:19:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10942]
	csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
Message-ID: <E1Otw0w-0007CI-UC@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10942
          http://gar.svn.sourceforge.net/gar/?rev=10942&view=rev
Author:   gadavis
Date:     2010-09-10 05:19:06 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Switch compiler to GCC4 due to redistribution problems with fortran to c libraries in Studio. Disable 64 bit build due to problems with Fortran bindings in test phase

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 04:39:42 UTC (rev 10941)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:19:06 UTC (rev 10942)
@@ -125,10 +125,10 @@
 ## ETCSERVICES = <file containing an entry for /etc/services>
 ## INETDCONF = <file containing an inetd.conf formatted entry>
 ## A list of runtime package dependencies in the form of CSWfoo.
-RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt
+RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt
 ##
 ## A list of packages necessary to build this package
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex CSWgcc4gfortran
 ##
 ## When using non-empty $(PACKAGES):
 ## RUNTIME_DEP_PKGS_CSWpkgname =
@@ -162,7 +162,7 @@
 ##
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
-## BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
+BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
 ##
 ## Arguments passed to the ./configure script.
 CONFIGURE_ARGS = $(DIRPATHS) \
@@ -178,30 +178,51 @@
 		 --with-hdf5=/opt/csw \
 		 --with-zlib=/opt/csw
 
+## 64 bit build fails in fortran binding tests
+BUILD64 = 0
+## CONFIGURE_ENV = 
+
+## Needed for "Large file support" in NetCDF
+EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
+
 ##
-BUILD64 = 1
-#CONFIGURE_ENV = CC=suncc CXX=sunCC F77=sunf77 FFLAGS="-dalign" FC=sunf95 \
-#		FCFLAGS="-dalign"
-#CONFIGURE_ENV = CC=cc CXX=CC F77=f77 FC=f95
-#EXTRA_CFLAGS = -g
-EXTRA_CPPFLAGS = -DsunFortran -D__FUNCTION__=__func__ -D_FILE_OFFSET_BITS=64
-#EXTRA_CXXFLAGS = -g
-## EXTRA_LDFLAGS =
+## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
+## Use GCC4 since the fortran to C binding process with Sun Studio require 
+## non-redistributable libs in /opt/SUNWspro
+GARCOMPILER = GCC4
+
+## Add GCC4 lib dir to CFLAGS and friends because gcc3core_rt puts it's 
+## libgcc_s.so in /opt/csw/lib and this breaks the build in all sorts of weird 
+## places.
+## Rationale: Automake keeps wanting to put /opt/csw/lib in the front of the 
+## -L options during the linking phase, so the GCC3 libgcc_s gets pulled in 
+## first and an unresolved symbol error occurs. By adding to the 
+## CFLAGS/FFLAGS/FCFLAGS/CXXFLAGS, it is pulled in before AM_LDFLAGS in the 
+## linking stage in most automake-generated Makefiles. Ugly hack but it works.
+##
+## Adding -dalign to *FLAGS in attempt to fix bus error in nf_test/ftst_vars4
+## in fuction nf_put_vlen_element
+EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+
+## Need to figure out a way to get the runtime linker in some tests to work
+## Next line is an ugly hack, need to ask the GAR Cabal for ideas.
+## EXTRA_LDFLAGS = -R/opt/csw/gcc4/lib/$(MM_LIBDIR)
+
 ## EXTRA_INC =
 ## EXTRA_LIB =
 ## GARFLAVOR =
 ## INSTALL_ARGS =
-OPT_FLAGS_SOS = -fast
+#OPT_FLAGS_SOS = -fast -g
 ## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
-# Remove the following rules and uncomment the
-# include before building.
-#all: .DEFAULT
-#.DEFAULT:
-#	@true
 
+
 include gar/category.mk
 
+## During the 32-bit sparc build, the C++ bindings were barfing with an error 
+## about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
+## Per http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
+## replacing -march=v8 with -m32 seems to solve the problem
+ARCHFLAGS_GCC4_sparcv8 = -m32


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

From gadavis at users.sourceforge.net  Fri Sep 10 07:22:01 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 10 Sep 2010 05:22:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10943]
	csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
Message-ID: <E1Otw3l-0007IY-56@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10943
          http://gar.svn.sourceforge.net/gar/?rev=10943&view=rev
Author:   gadavis
Date:     2010-09-10 05:22:00 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Nuke excessive comments

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:19:06 UTC (rev 10942)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:22:00 UTC (rev 10943)
@@ -2,169 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
 GARNAME = netcdf
 GARVERSION = 4.1.1
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
 CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
 DESCRIPTION = machine-independent data formats for array-oriented scientific data
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
-define BLURB
-  NetCDF (network Common Data Form) is a set of software libraries and 
-  machine-independent data formats that support the creation, access, 
-  and sharing of array-oriented scientific data. 
-endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
 SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
 MASTER_SITES = http://www.unidata.ucar.edu/downloads/netcdf/ftp/
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-##  on including and displaying licenses.
 ## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
 RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt
-##
-## A list of packages necessary to build this package
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex CSWgcc4gfortran
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-##
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
 BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
-##
-## Arguments passed to the ./configure script.
+
 CONFIGURE_ARGS = $(DIRPATHS) \
 		 --enable-netcdf-4 \
 		 --enable-dap \
@@ -180,13 +32,10 @@
 
 ## 64 bit build fails in fortran binding tests
 BUILD64 = 0
-## CONFIGURE_ENV = 
 
 ## Needed for "Large file support" in NetCDF
 EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
 ## Use GCC4 since the fortran to C binding process with Sun Studio require 
 ## non-redistributable libs in /opt/SUNWspro
 GARCOMPILER = GCC4
@@ -206,19 +55,8 @@
 EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
 EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
 EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-
-## Need to figure out a way to get the runtime linker in some tests to work
-## Next line is an ugly hack, need to ask the GAR Cabal for ideas.
-## EXTRA_LDFLAGS = -R/opt/csw/gcc4/lib/$(MM_LIBDIR)
-
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-#OPT_FLAGS_SOS = -fast -g
 ## OPT_FLAGS_GCC = -O2 -pipe
 
-
 include gar/category.mk
 
 ## During the 32-bit sparc build, the C++ bindings were barfing with an error 


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

From gadavis at users.sourceforge.net  Fri Sep 10 07:22:55 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 10 Sep 2010 05:22:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10944]
	csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
Message-ID: <E1Otw4d-0007JW-LY@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10944
          http://gar.svn.sourceforge.net/gar/?rev=10944&view=rev
Author:   gadavis
Date:     2010-09-10 05:22:55 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Add license

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:22:00 UTC (rev 10943)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:22:55 UTC (rev 10944)
@@ -10,7 +10,7 @@
 MASTER_SITES = http://www.unidata.ucar.edu/downloads/netcdf/ftp/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-## LICENSE =
+LICENSE = COPYRIGHT
 RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex CSWgcc4gfortran
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when


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

From gadavis at users.sourceforge.net  Fri Sep 10 08:22:52 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Fri, 10 Sep 2010 06:22:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10945]
	csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
Message-ID: <E1Otx0e-0003Vn-GM@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10945
          http://gar.svn.sourceforge.net/gar/?rev=10945&view=rev
Author:   gadavis
Date:     2010-09-10 06:22:52 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Add runtime deps, readd -mcpu=v8 to archflags to prevent v8+ build

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 05:22:55 UTC (rev 10944)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-10 06:22:52 UTC (rev 10945)
@@ -11,8 +11,10 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 LICENSE = COPYRIGHT
-RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex CSWgcc4gfortran
+RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt CSWzlib CSWgcc4corert \
+		   CSWoldaprt CSWlibcares CSWlibidn CSWgcc4g++rt CSWosslrt
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWtetex CSWgcc4gfortran
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
 BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
@@ -31,7 +33,7 @@
 		 --with-zlib=/opt/csw
 
 ## 64 bit build fails in fortran binding tests
-BUILD64 = 0
+#BUILD64 = 0
 
 ## Needed for "Large file support" in NetCDF
 EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
@@ -63,4 +65,4 @@
 ## about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
 ## Per http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
 ## replacing -march=v8 with -m32 seems to solve the problem
-ARCHFLAGS_GCC4_sparcv8 = -m32
+ARCHFLAGS_GCC4_sparcv8 = -m32 -mcpu=v8


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 Sep 10 12:55:06 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 10 Sep 2010 10:55:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10946] csw/mgar/pkg/pca/trunk
Message-ID: <E1Ou1G6-0004l3-5P@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10946
          http://gar.svn.sourceforge.net/gar/?rev=10946&view=rev
Author:   dmichelsen
Date:     2010-09-10 10:55:05 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
pca: Update to 20100910-01

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

Modified: csw/mgar/pkg/pca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pca/trunk/Makefile	2010-09-10 06:22:52 UTC (rev 10945)
+++ csw/mgar/pkg/pca/trunk/Makefile	2010-09-10 10:55:05 UTC (rev 10946)
@@ -1,5 +1,5 @@
 GARNAME = pca
-GARVERSION = 20100727-01
+GARVERSION = 20100910-01
 CATEGORIES = utils
 
 DESCRIPTION = Patch Check Advanced

Modified: csw/mgar/pkg/pca/trunk/checksums
===================================================================
--- csw/mgar/pkg/pca/trunk/checksums	2010-09-10 06:22:52 UTC (rev 10945)
+++ csw/mgar/pkg/pca/trunk/checksums	2010-09-10 10:55:05 UTC (rev 10946)
@@ -1,5 +1 @@
-4376789925fa9002d0567d739f717748  0001-prefer-opencsw-perl.diff
-fc014aaacd778fd17c212d4f0f60c8fb  0002-Add-etc-opt-csw-as-config-location.patch
-6f2f2376eba0a788795dd43d68ad32d1  COPYING
-c9272b4888eea55d18bb2143fffb0bf1  pca-20100727-01
-12de68ff8f67b4bb8b095e5646402208  pca.conf
+9e19a91b241fa9be475dc8c010c61fa5  pca-20100910-01


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

From dmichelsen at users.sourceforge.net  Fri Sep 10 15:47:39 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 10 Sep 2010 13:47:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10947]
 csw/mgar/pkg/cpan/BerkeleyDB/tags/BerkeleyDB-0.42, REV=2010.03.15/
Message-ID: <E1Ou3x5-0007sk-D8@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10947
          http://gar.svn.sourceforge.net/gar/?rev=10947&view=rev
Author:   dmichelsen
Date:     2010-09-10 13:47:39 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
cpan/BerkeleyDB: Tag 0.42,REV=2010.03.15

Added Paths:
-----------
    csw/mgar/pkg/cpan/BerkeleyDB/tags/BerkeleyDB-0.42,REV=2010.03.15/


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 Sep 10 17:01:08 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 10 Sep 2010 15:01:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10948]
	csw/mgar/pkg/cpan/BerkeleyDB/trunk
Message-ID: <E1Ou56C-0001rs-JS@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10948
          http://gar.svn.sourceforge.net/gar/?rev=10948&view=rev
Author:   dmichelsen
Date:     2010-09-10 15:01:08 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
cpan/BerkeleyDB: Update to 0.43 and compile against bdb 4.8

Modified Paths:
--------------
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff

Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2010-09-10 13:47:39 UTC (rev 10947)
+++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2010-09-10 15:01:08 UTC (rev 10948)
@@ -1,5 +1,5 @@
 GARNAME = BerkeleyDB
-GARVERSION = 0.42
+GARVERSION = 0.43
 CATEGORIES = cpan
 AUTHOR = PMQS
 
@@ -16,8 +16,8 @@
 PATCHFILES = CSWpmberkeleydb.config.in.diff
 
 NOISALIST = 1
-EXTRA_LIB = /opt/csw/bdb47/lib
+EXTRA_LIB = /opt/csw/bdb48/lib
 
-RUNTIME_DEP_PKGS = CSWbdb47
+RUNTIME_DEP_PKGS = CSWbdb48
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums	2010-09-10 13:47:39 UTC (rev 10947)
+++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums	2010-09-10 15:01:08 UTC (rev 10948)
@@ -1,3 +1 @@
-4b9c1f6e62b6ef40e6bdc673a3a30a32  BerkeleyDB-0.42.tar.gz
-bf78b3346925446f99c2a7f081322109  COPYING
-2061f2f285714a1b6a014c5254e69b92  CSWpmberkeleydb.config.in.diff
+3d0cf0651ed8cd3fc36e328d5924a1e9  BerkeleyDB-0.43.tar.gz

Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff
===================================================================
--- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff	2010-09-10 13:47:39 UTC (rev 10947)
+++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff	2010-09-10 15:01:08 UTC (rev 10948)
@@ -6,7 +6,7 @@
  #INCLUDE	= /usr/local/include
  #INCLUDE	= ../..
 -INCLUDE	= /usr/local/BerkeleyDB/include
-+INCLUDE	= /opt/csw/bdb47/include
++INCLUDE	= /opt/csw/bdb48/include
  
  # 2. Where is libdb?
  #
@@ -15,7 +15,7 @@
  #LIB	= /usr/local/lib
  #LIB	= ../..
 -LIB	= /usr/local/BerkeleyDB/lib
-+LIB	= /opt/csw/bdb47/lib
++LIB	= /opt/csw/bdb48/lib
  
  # 3. Is the library called libdb?
  #
@@ -24,6 +24,6 @@
  #    you have picked.
  
 -#DBNAME = -ldb-3.0
-+DBNAME = -ldb-4.7
++DBNAME = -ldb-4.8
  
  # end of file config.in


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 Sep 13 13:33:53 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 13 Sep 2010 11:33:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10949]
	csw/mgar/pkg/cpan/HTML-Scrubber/trunk
Message-ID: <E1Ov7IH-0003bm-2x@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10949
          http://gar.svn.sourceforge.net/gar/?rev=10949&view=rev
Author:   dmichelsen
Date:     2010-09-13 11:33:52 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
cpan/HTML-Scrubber: Update to mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.depend
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/


Property changes on: csw/mgar/pkg/cpan/HTML-Scrubber/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/HTML-Scrubber/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Scrubber/trunk/Makefile	2010-09-10 15:01:08 UTC (rev 10948)
+++ csw/mgar/pkg/cpan/HTML-Scrubber/trunk/Makefile	2010-09-13 11:33:52 UTC (rev 10949)
@@ -3,7 +3,7 @@
 CATEGORIES = cpan
 AUTHOR = PODMASTER
 
-DESCRIPTION = extension for scrubbing/sanitizing html
+DESCRIPTION = Perl extension for scrubbing/sanitizing html
 define BLURB
   If you wanna "scrub" or "sanitize" html input in a reliable an flexible
   fashion, then this module is for you.  I wasn't satisfied with
@@ -11,8 +11,13 @@
   write something similar that works directly with HTML::Parser.
 endef
 
-DISTFILES += CSWpmhtmlscrubber.gspec CSWpmhtmlscrubber.depend
+PACKAGES = CSWpmhtmlscrubber
+CATALOGNAME = pm_htmlscrubber
 
-DEPENDS += cpan/HTML-Parser
+DEP_PKGS = CSWpmhtmlparser
 
+LICENSE = LICENSE
+
+ARCHALL = 1
+
 include gar/category.mk

Deleted: csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.depend
===================================================================
--- csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.depend	2010-09-10 15:01:08 UTC (rev 10948)
+++ csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.depend	2010-09-13 11:33:52 UTC (rev 10949)
@@ -1 +0,0 @@
-P CSWpmhtmlparser pm_htmlparser - HTML parser class

Deleted: csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.gspec
===================================================================
--- csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.gspec	2010-09-10 15:01:08 UTC (rev 10948)
+++ csw/mgar/pkg/cpan/HTML-Scrubber/trunk/files/CSWpmhtmlscrubber.gspec	2010-09-13 11:33:52 UTC (rev 10949)
@@ -1,5 +0,0 @@
-%var            bitname pm_htmlscrubber
-%var            pkgname CSWpmhtmlscrubber
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      url file://%{WORKSRC}/LICENSE


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

From dmichelsen at users.sourceforge.net  Mon Sep 13 13:45:59 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 13 Sep 2010 11:45:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10950]
	csw/mgar/pkg/cpan/HTML-Template/trunk
Message-ID: <E1Ov7Tz-0003zM-HM@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10950
          http://gar.svn.sourceforge.net/gar/?rev=10950&view=rev
Author:   dmichelsen
Date:     2010-09-13 11:45:59 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
cpan/HTML-Template: Update to mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/HTML-Template/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Template/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.gspec
    csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.prototype

Property Changed:
----------------
    csw/mgar/pkg/cpan/HTML-Template/trunk/


Property changes on: csw/mgar/pkg/cpan/HTML-Template/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/HTML-Template/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Template/trunk/Makefile	2010-09-13 11:33:52 UTC (rev 10949)
+++ csw/mgar/pkg/cpan/HTML-Template/trunk/Makefile	2010-09-13 11:45:59 UTC (rev 10950)
@@ -15,8 +15,11 @@
   HTML - from the data, which you generate in the Perl script.
 endef
 
-DISTFILES += $(call admfiles,CSWpmhtmltmpl,prototype)
+PACKAGES = CSWpmhtmltmpl
+CATALOGNAME = pm_htmltemplate
 
-CONFIGURE_ARGS = -n
+LICENSE = GPL
 
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/HTML-Template/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/HTML-Template/trunk/checksums	2010-09-13 11:33:52 UTC (rev 10949)
+++ csw/mgar/pkg/cpan/HTML-Template/trunk/checksums	2010-09-13 11:45:59 UTC (rev 10950)
@@ -1,3 +1 @@
-2c49d8b4031a867041e12a88627d5127  download/CSWpmhtmltmpl.gspec
-417f876832b4876b67730477579fd964  download/CSWpmhtmltmpl.prototype
-cbf88a486b36284be55765ac7357c187  download/HTML-Template-2.9.tar.gz
+cbf88a486b36284be55765ac7357c187  HTML-Template-2.9.tar.gz

Deleted: csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.gspec
===================================================================
--- csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.gspec	2010-09-13 11:33:52 UTC (rev 10949)
+++ csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.gspec	2010-09-13 11:45:59 UTC (rev 10950)
@@ -1,5 +0,0 @@
-%var            bitname pm_htmltemplate
-%var            pkgname CSWpmhtmltmpl
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      url file://%{WORKSRC}/GPL

Deleted: csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.prototype
===================================================================
--- csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.prototype	2010-09-13 11:33:52 UTC (rev 10949)
+++ csw/mgar/pkg/cpan/HTML-Template/trunk/files/CSWpmhtmltmpl.prototype	2010-09-13 11:45:59 UTC (rev 10950)
@@ -1,15 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/auto 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/HTML 0755 root bin
-d none /opt/csw/lib/perl/csw/auto/HTML/Template 0755 root bin
-f none /opt/csw/lib/perl/csw/auto/HTML/Template/.packlist 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/HTML::Template.3perl 0444 root bin
-d none /opt/csw/share/perl 0755 root bin
-d none /opt/csw/share/perl/csw 0755 root bin
-d none /opt/csw/share/perl/csw/HTML 0755 root bin
-f none /opt/csw/share/perl/csw/HTML/Template.pm 0444 root bin


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 Sep 13 13:51:22 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 13 Sep 2010 11:51:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10951] csw/mgar/pkg/cpan
Message-ID: <E1Ov7ZC-00049q-HJ@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10951
          http://gar.svn.sourceforge.net/gar/?rev=10951&view=rev
Author:   dmichelsen
Date:     2010-09-13 11:51:22 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
cpan/Mail-Sender: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Mail-Sender/
    csw/mgar/pkg/cpan/Mail-Sender/branches/
    csw/mgar/pkg/cpan/Mail-Sender/tags/
    csw/mgar/pkg/cpan/Mail-Sender/trunk/
    csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Sender/trunk/checksums
    csw/mgar/pkg/cpan/Mail-Sender/trunk/files/
    csw/mgar/pkg/cpan/Mail-Sender/trunk/files/0001-Don-t-ask-questions.patch
    csw/mgar/pkg/cpan/Mail-Sender/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Mail-Sender/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile	2010-09-13 11:51:22 UTC (rev 10951)
@@ -0,0 +1,21 @@
+GARNAME = Mail-Sender
+GARVERSION = 0.8.16
+CATEGORIES = cpan
+AUTHOR = JENDA
+
+DESCRIPTION = Module for sending mails with attachments through an SMTP server
+define BLURB
+endef
+
+DISTFILES = COPYING
+PATCHFILES = 0001-Don-t-ask-questions.patch
+
+PACKAGES = CSWpmmailsender
+CATALOGNAME = pm_mailsender
+
+DEP_PKGS = CSWpmfileremove CSWpmiostringy CSWpmtimedate CSWpmdigesthmac CSWpmmailtools CSWpmuri CSWpmmimetypes
+
+ARCHALL = 1
+
+include gar/category.mk
+

Added: csw/mgar/pkg/cpan/Mail-Sender/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sender/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-Sender/trunk/checksums	2010-09-13 11:51:22 UTC (rev 10951)
@@ -0,0 +1 @@
+e5d88236202b3d39567ade7d560797b0  Mail-Sender-0.8.16.tar.gz

Added: csw/mgar/pkg/cpan/Mail-Sender/trunk/files/0001-Don-t-ask-questions.patch
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sender/trunk/files/0001-Don-t-ask-questions.patch	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-Sender/trunk/files/0001-Don-t-ask-questions.patch	2010-09-13 11:51:22 UTC (rev 10951)
@@ -0,0 +1,25 @@
+From df895cf263b747cf383180289c0fa87fe45bdc37 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 13 Sep 2010 13:31:26 +0200
+Subject: [PATCH] Don't ask questions
+
+---
+ Config.PL |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Config.PL b/Config.PL
+index a89d837..0e14cbc 100644
+--- a/Config.PL
++++ b/Config.PL
+@@ -72,7 +72,7 @@ nmake.exe may be found at ftp://ftp.microsoft.com/Softlib/MSLFILES/nmake15.exe\n
+ }
+ 
+ print "\nSpecify$new defaults for Mail::Sender? (y/N) ";
+-$res = <STDIN>;
++# $res = <STDIN>;
+ exit unless $res =~ /^y$/i;
+ 
+ if (! $configfile) {
+-- 
+1.7.1
+

Added: csw/mgar/pkg/cpan/Mail-Sender/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sender/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-Sender/trunk/files/COPYING	2010-09-13 11:51:22 UTC (rev 10951)
@@ -0,0 +1,4 @@
+Copyright (c) 1997-2003 Jan Krynicky <Jenda at Krynicky.cz>. All rights reserved.
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself with only one exception, you are not allowed
+to use the module for SPAM.


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 Sep 13 13:54:08 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 13 Sep 2010 11:54:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10952]
	csw/mgar/pkg/cpan/Mail-Sendmail/trunk
Message-ID: <E1Ov7bs-0004C9-5R@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10952
          http://gar.svn.sourceforge.net/gar/?rev=10952&view=rev
Author:   dmichelsen
Date:     2010-09-13 11:54:07 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
cpan/Mail-Sendmail: Update to mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/CSWpmmailsendmail.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/


Property changes on: csw/mgar/pkg/cpan/Mail-Sendmail/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Mail-Sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sendmail/trunk/Makefile	2010-09-13 11:51:22 UTC (rev 10951)
+++ csw/mgar/pkg/cpan/Mail-Sendmail/trunk/Makefile	2010-09-13 11:54:07 UTC (rev 10952)
@@ -3,15 +3,22 @@
 CATEGORIES = cpan
 AUTHOR = MIVKOVIC
 
-DESCRIPTION = simple platform independent mailer
+DESCRIPTION = Simple platform independent mailer
 define BLURB
   Mail::Sendmail contains mainly &sendmail, which takes a hash with the
   message to send and sends it. It is intended to be very easy to setup and
   use. See also "FEATURES" below.
 endef
 
-DISTFILES += CSWpmmailsendmail.gspec
+DISTFILES = COPYING
 
+PACKAGES = CSWpmmailsendmail
+CATALOGNAME = pm_mailsendmail
+
+DEPS_PKGS = CSWpmmimebase64
+
+ARCHALL = 1
+
 # Skip sending test email
 PATCHFILES = test.diff
 

Modified: csw/mgar/pkg/cpan/Mail-Sendmail/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sendmail/trunk/checksums	2010-09-13 11:51:22 UTC (rev 10951)
+++ csw/mgar/pkg/cpan/Mail-Sendmail/trunk/checksums	2010-09-13 11:54:07 UTC (rev 10952)
@@ -1,3 +1 @@
-95e273944104b91d674e13f3c0baf614  download/CSWpmmailsendmail.gspec
-038f261afd091d8fad347d6c66d2833d  download/Mail-Sendmail-0.79.tar.gz
-5d84534de7f77beb1a83f4cf296e6b12  download/test.diff
+038f261afd091d8fad347d6c66d2833d  Mail-Sendmail-0.79.tar.gz

Added: csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/COPYING	2010-09-13 11:54:07 UTC (rev 10952)
@@ -0,0 +1,4 @@
+    You can use this module freely. (Someone complained this is too vague.
+    So, more precisely: do whatever you want with it, but be warned that
+    terrible things will happen to you if you use it badly, like for sending
+    spam, or ...?)

Deleted: csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/CSWpmmailsendmail.gspec
===================================================================
--- csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/CSWpmmailsendmail.gspec	2010-09-13 11:51:22 UTC (rev 10951)
+++ csw/mgar/pkg/cpan/Mail-Sendmail/trunk/files/CSWpmmailsendmail.gspec	2010-09-13 11:54:07 UTC (rev 10952)
@@ -1,4 +0,0 @@
-%var            bitname pm_mailsendmail
-%var            pkgname CSWpmmailsendmail
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec


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 Sep 13 14:03:48 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 13 Sep 2010 12:03:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10953]
	csw/mgar/pkg/cpan/Mail-SPF-Query/trunk
Message-ID: <E1Ov7lE-0001kU-ON@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10953
          http://gar.svn.sourceforge.net/gar/?rev=10953&view=rev
Author:   dmichelsen
Date:     2010-09-13 12:03:48 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
cpan/Mail-SPF-Query: Update to mGAR v2, intermediate commit, tests still fail

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/CSWpmmailspfqry.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/


Property changes on: csw/mgar/pkg/cpan/Mail-SPF-Query/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/Makefile	2010-09-13 11:54:07 UTC (rev 10952)
+++ csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/Makefile	2010-09-13 12:03:48 UTC (rev 10953)
@@ -1,17 +1,24 @@
 GARNAME = Mail-SPF-Query
-GARVERSION = 1.997
+GARVERSION = 1.999.1
 CATEGORIES = cpan
-AUTHOR = FREESIDE
+AUTHOR = JMEHNLE
 
-DESCRIPTION = query sender policy framework
+DESCRIPTION = Query Sender Policy Framework for an IP,email,helo
 define BLURB
   The SPF protocol relies on sender domains to describe their designated
   outbound mailers in DNS. Given an email address, Mail::SPF::Query determines
   the legitimacy of an SMTP client IP.
 endef
 
-DISTFILES += CSWpmmailspfqry.gspec CSWpmmailspfqry.depend
+MASTER_SITES = $(addsuffix mail-spf-query/,$(CPAN_MIRRORS))
 
-DEPENDS += cpan/Net-DNS cpan/Net-CIDR-Lite cpan/Sys-Hostname-Long cpan/URI
+DISTFILES = COPYING
 
+PACKAGES = CSWpmmailspfqry
+CATALOGNAME = pm_mailspfqry
+
+DEP_PKGS = CSWpmnetcidrlite CSWpmnetdns CSWpmsyshostnamelong CSWpmuri
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/checksums	2010-09-13 11:54:07 UTC (rev 10952)
+++ csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/checksums	2010-09-13 12:03:48 UTC (rev 10953)
@@ -1,3 +1 @@
-84decc6a7569fa0635995b58fbfa879d  download/CSWpmmailspfqry.gspec
-4941871f63dd182d5842fa11354cda73  download/CSWpmmailspfqry.depend
-9e110d00520e0fe174c25c0734a8baf6  download/Mail-SPF-Query-1.997.tar.gz
+6d62d024d1614fa1fa4f43bd39ee7bf0  Mail-SPF-Query-1.999.1.tar.gz

Copied: csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/COPYING (from rev 10948, csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/CSWpmmailspfqry.gspec)
===================================================================
--- csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/COPYING	2010-09-13 12:03:48 UTC (rev 10953)
@@ -0,0 +1,4 @@
+Released under the same terms as Perl.
+
+Copyright (C) 2003 Meng Weng Wong <mengwong+spf at pobox.com>
+

Deleted: csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/CSWpmmailspfqry.gspec
===================================================================
--- csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/CSWpmmailspfqry.gspec	2010-09-13 11:54:07 UTC (rev 10952)
+++ csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/files/CSWpmmailspfqry.gspec	2010-09-13 12:03:48 UTC (rev 10953)
@@ -1,9 +0,0 @@
-%var            bitname pm_mailspfqry
-%var            pkgname CSWpmmailspfqry
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-Released under the same terms as Perl.
-
-Copyright (C) 2003 Meng Weng Wong <mengwong+spf at pobox.com>
-


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

From bonivart at users.sourceforge.net  Mon Sep 13 15:54:13 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 13 Sep 2010 13:54:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10954] csw/mgar/pkg/cpan
Message-ID: <E1Ov9U5-00070Q-7A@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10954
          http://gar.svn.sourceforge.net/gar/?rev=10954&view=rev
Author:   bonivart
Date:     2010-09-13 13:54:12 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
pm_dbfile: initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/DB_File/
    csw/mgar/pkg/cpan/DB_File/branches/
    csw/mgar/pkg/cpan/DB_File/tags/
    csw/mgar/pkg/cpan/DB_File/trunk/
    csw/mgar/pkg/cpan/DB_File/trunk/Makefile
    csw/mgar/pkg/cpan/DB_File/trunk/checksums
    csw/mgar/pkg/cpan/DB_File/trunk/files/
    csw/mgar/pkg/cpan/DB_File/trunk/files/0001-add-bdb48-include-dir.patch
    csw/mgar/pkg/cpan/DB_File/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/DB_File/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/DB_File/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DB_File/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/DB_File/trunk/Makefile	2010-09-13 13:54:12 UTC (rev 10954)
@@ -0,0 +1,20 @@
+GARNAME = DB_File
+GARVERSION = 1.820
+CATEGORIES = cpan
+AUTHOR = PMQS
+
+DESCRIPTION = Perl5 access to Berkeley DB version 1.x
+define BLURB
+  Perl5 access to Berkeley DB version 1.x
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmdbfile
+CATALOGNAME = pm_dbfile
+
+PATCHFILES += 0001-add-bdb48-include-dir.patch
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/DB_File/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/DB_File/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/DB_File/trunk/checksums	2010-09-13 13:54:12 UTC (rev 10954)
@@ -0,0 +1 @@
+28979bee29d8075b0dffab02fe29df6e  DB_File-1.820.tar.gz

Added: csw/mgar/pkg/cpan/DB_File/trunk/files/0001-add-bdb48-include-dir.patch
===================================================================
--- csw/mgar/pkg/cpan/DB_File/trunk/files/0001-add-bdb48-include-dir.patch	                        (rev 0)
+++ csw/mgar/pkg/cpan/DB_File/trunk/files/0001-add-bdb48-include-dir.patch	2010-09-13 13:54:12 UTC (rev 10954)
@@ -0,0 +1,25 @@
+From 6d697175848d0c15f2d451307a24df68babd13af Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Mon, 13 Sep 2010 15:16:37 +0200
+Subject: [PATCH] add-bdb48-include-dir
+
+---
+ Makefile.PL |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index a586a04..6cb8fbd 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -44,7 +44,7 @@ my $WALL = '' ;
+ WriteMakefile(
+ 	NAME 		=> 'DB_File',
+ 	LIBS 		=> ["-L${LIB_DIR} $LIBS"],
+-	INC		=> "-I$INC_DIR",
++	INC		=> "-I$INC_DIR -I/opt/csw/bdb48/include",
+     VERSION_FROM	=> 'DB_File.pm',
+ 	XS_VERSION      => eval MM->parse_version('DB_File.pm'),
+ 	XSPROTOARG	=> '-noprototypes',
+-- 
+1.7.1
+

Added: csw/mgar/pkg/cpan/DB_File/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/DB_File/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/DB_File/trunk/files/COPYING	2010-09-13 13:54:12 UTC (rev 10954)
@@ -0,0 +1,3 @@
+     Copyright (c) 1995-2009 Paul Marquess. All rights reserved. This
+      program is free software; you can redistribute it and/or modify
+                  it under the same terms as Perl itself.


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

From wahwah at users.sourceforge.net  Mon Sep 13 16:05:15 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 13 Sep 2010 14:05:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10955] csw/mgar/gar/v2/lib/python
Message-ID: <E1Ov9el-0007Le-8m@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10955
          http://gar.svn.sourceforge.net/gar/?rev=10955&view=rev
Author:   wahwah
Date:     2010-09-13 14:05:15 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
mGAR v2: Added error tags and overrides to the HTML report.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/pkg-review-template.html
    csw/mgar/gar/v2/lib/python/pkgdb.py

Modified: csw/mgar/gar/v2/lib/python/pkg-review-template.html
===================================================================
--- csw/mgar/gar/v2/lib/python/pkg-review-template.html	2010-09-13 13:54:12 UTC (rev 10954)
+++ csw/mgar/gar/v2/lib/python/pkg-review-template.html	2010-09-13 14:05:15 UTC (rev 10955)
@@ -50,6 +50,18 @@
   margin: 0px;
   padding: 2px;
 }
+ul.error_tags li {
+  list-style: none;
+  background-color: #FDD;
+  padding: 0px;
+  margin: 0px;
+}
+ul.overrides li {
+  list-style: none;
+  background-color: #FFD;
+  padding: 0px;
+  margin: 0px;
+}
 </style>
 </head>
 <body>
@@ -75,6 +87,8 @@
   </h2>
       <ul>
         <li><a href="#${pkg.basic_stats.md5_sum}-pkginfo">pkginfo</a></li>
+        <li><a href="#${pkg.basic_stats.md5_sum}-error_tags">error tags</a></li>
+        <li><a href="#${pkg.basic_stats.md5_sum}-overrides">overrides</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-binaries_dump_info">binaries_dump_info</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-depends">depends</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-files_metadata">files_metadata</a></li>
@@ -192,6 +206,49 @@
   </tr>
 #end for
   </table>
+
+  <h2>
+    <a name="${pkg.basic_stats.md5_sum}-error_tags">
+      Error tags
+    </a>
+  </h2>
+#if $pkg.error_tags
+  <ul class="error_tags">
+#for etag in $pkg.error_tags
+  <li>
+      <code>
+        $etag.pkgname
+        $etag.tag_name
+        $etag.tag_info
+      </code>
+    </li>
+#end for
+  </ul>
+#else
+  <p>No error tags.</p>
+#end if
+
+  <h2>
+    <a name="${pkg.basic_stats.md5_sum}-overrides">
+      Overrides
+    </a>
+  </h2>
+#if $pkg.overrides
+  <ul class="overrides">
+#for override in $pkg.overrides
+    <li>
+      <code>
+        $override.pkgname
+        $override.tag_name
+        $override.tag_info
+      </code>
+    </li>
+#end for
+  </ul>
+#else
+  <p>No overrides.</p>
+#end if
+
 #if $pkg.binaries_dump_info
   <h2>
     <a name="${pkg.basic_stats.md5_sum}-binaries_dump_info">

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2010-09-13 13:54:12 UTC (rev 10954)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2010-09-13 14:05:15 UTC (rev 10955)
@@ -35,7 +35,62 @@
 stats_version:  $stats_version
 """
 
+DEFAULT_TEMPLATE_FILENAME = "../lib/python/pkg-review-template.html"
 
+
+class HtmlGenerator(object):
+
+  def __init__(self, md5_sums, template=None):
+    self.md5_sums = md5_sums
+    self.template = template
+
+  def GetErrorTagsResult(self, srv4):
+    res = m.CheckpkgErrorTag.select(
+        m.CheckpkgErrorTag.q.srv4_file==srv4)
+    return res
+
+  def GetOverrideResult(self, srv4):
+    res = m.CheckpkgOverride.select(
+        m.CheckpkgOverride.q.srv4_file==srv4)
+    return res
+
+  def GenerateHtml(self):
+    pkgstats = []
+    # Add error tags
+    for md5_sum in self.md5_sums:
+      srv4 = GetPkg(md5_sum)
+      data = cPickle.loads(str(srv4.data))
+      if "OPENCSW_REPOSITORY" in data["pkginfo"]:
+        build_src = data["pkginfo"]["OPENCSW_REPOSITORY"]
+        build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src)
+        build_src_url_trac = re.sub(
+            r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)',
+            r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3',
+            build_src)
+      else:
+        build_src = None
+        build_src_url_svn = None
+        build_src_url_trac = None
+      data["build_src"] = build_src
+      data["build_src_url_svn"] = build_src_url_svn
+      data["build_src_url_trac"] = build_src_url_trac
+      data["error_tags"] = list(self.GetErrorTagsResult(srv4))
+      data["overrides"] = list(self.GetOverrideResult(srv4))
+      pkgstats.append(data)
+    # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py".
+    if not self.template:
+      tmpl_filename = os.path.join(os.path.split(__file__)[0],
+                                   DEFAULT_TEMPLATE_FILENAME)
+    else:
+      tmpl_filename = self.template
+    tmpl_str = open(tmpl_filename, "r").read()
+    t = Template(tmpl_str, searchList=[{
+      "pkgstats": pkgstats,
+      "hachoir_machines": package_checks.HACHOIR_MACHINES,
+      }])
+    return unicode(t)
+
+
 def GetPkg(some_id):
   logging.debug("Selecting from db: %s", repr(some_id))
   res = m.Srv4FileStats.select(
@@ -99,41 +154,8 @@
       t = Template(SHOW_PKG_TMPL, searchList=[srv4])
       sys.stdout.write(unicode(t))
   if command == 'gen-html':
-    pkgstats = []
-    # Add error tags
-    for md5_sum in md5_sums:
-      srv4 = GetPkg(md5_sum)
-      data = cPickle.loads(str(srv4.data))
-      if "OPENCSW_REPOSITORY" in data["pkginfo"]:
-        build_src = data["pkginfo"]["OPENCSW_REPOSITORY"]
-        build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src)
-        build_src_url_trac = re.sub(
-            r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)',
-            r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3',
-            build_src)
-      else:
-        build_src = None
-        build_src_url_svn = None
-        build_src_url_trac = None
-      data["build_src"] = build_src
-      data["build_src_url_svn"] = build_src_url_svn
-      data["build_src_url_trac"] = build_src_url_trac
-      pkgstats.append(data)
-    # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py".
-    if not options.pkg_review_template:
-      tmpl_filename = os.path.join(os.path.split(__file__)[0],
-                                   "..",
-                                   "lib",
-                                   "python",
-                                   "pkg-review-template.html")
-    else:
-      tmpl_filename = options.pkg_review_template
-    tmpl_str = open(tmpl_filename, "r").read()
-    t = Template(tmpl_str, searchList=[{
-      "pkgstats": pkgstats,
-      "hachoir_machines": package_checks.HACHOIR_MACHINES,
-      }])
-    sys.stdout.write(unicode(t))
+    g = HtmlGenerator(md5_sums)
+    sys.stdout.write(g.GenerateHtml())
 
 
 if __name__ == '__main__':


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

From gadavis at users.sourceforge.net  Mon Sep 13 18:48:32 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Mon, 13 Sep 2010 16:48:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[10956]
	csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
Message-ID: <E1OvCCm-0003na-6W@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10956
          http://gar.svn.sourceforge.net/gar/?rev=10956&view=rev
Author:   gadavis
Date:     2010-09-13 16:48:31 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
more tweaks for gcc3

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile

Modified: csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-13 14:05:15 UTC (rev 10955)
+++ csw/mgar/pkg/netcdf/branches/gar-fortran/Makefile	2010-09-13 16:48:31 UTC (rev 10956)
@@ -11,10 +11,10 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 LICENSE = COPYRIGHT
-RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc4gfortranrt CSWzlib CSWgcc4corert \
-		   CSWoldaprt CSWlibcares CSWlibidn CSWgcc4g++rt CSWosslrt
+RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc3g77rt CSWzlib CSWgcc3corert \
+		   CSWoldaprt CSWlibcares CSWlibidn CSWgcc3g++rt CSWosslrt
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWtetex CSWgcc4gfortran
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWtetex CSWgcc3g77
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
 BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
@@ -33,15 +33,15 @@
 		 --with-zlib=/opt/csw
 
 ## 64 bit build fails in fortran binding tests
-#BUILD64 = 0
+BUILD64 = 1
 
 ## Needed for "Large file support" in NetCDF
 EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
-## Use GCC4 since the fortran to C binding process with Sun Studio require 
 ## non-redistributable libs in /opt/SUNWspro
-GARCOMPILER = GCC4
+GARCOMPILER = GCC3
 
+DEBUG_PACKAGING = 1
 ## Add GCC4 lib dir to CFLAGS and friends because gcc3core_rt puts it's 
 ## libgcc_s.so in /opt/csw/lib and this breaks the build in all sorts of weird 
 ## places.
@@ -53,12 +53,11 @@
 ##
 ## Adding -dalign to *FLAGS in attempt to fix bus error in nf_test/ftst_vars4
 ## in fuction nf_put_vlen_element
-EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
 ## OPT_FLAGS_GCC = -O2 -pipe
-
 include gar/category.mk
 
 ## During the 32-bit sparc build, the C++ bindings were barfing with an error 


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

From gadavis at users.sourceforge.net  Tue Sep 14 04:31:45 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Tue, 14 Sep 2010 02:31:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[10957] csw/mgar/pkg
Message-ID: <E1OvLJB-0007NG-RL@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10957
          http://gar.svn.sourceforge.net/gar/?rev=10957&view=rev
Author:   gadavis
Date:     2010-09-14 02:31:45 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
Initial commit for a working Generic Mapping Tools

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

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

Modified: csw/mgar/pkg/gmt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-09-03 21:21:37 UTC (rev 10926)
+++ csw/mgar/pkg/gmt/trunk/Makefile	2010-09-14 02:31:45 UTC (rev 10957)
@@ -2,184 +2,65 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
-GARNAME = mypkg
-GARVERSION = 1.0
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
-CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GMT_VERSION = 4.5.3
+
+GARNAME = gmt
+GARVERSION = $(GMT_VERSION)
+CATEGORIES = apps
+DESCRIPTION = Generic Mapping Tools
 define BLURB
-  <please fill in>
+  GMT is an open source collection of ~60 tools for manipulating geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting, etc.) and producing Encapsulated PostScript File (EPS) illustrations ranging from simple x-y plots via contour maps to artificially illuminated surfaces and 3-D perspective views. GMT supports ~30 map projections and transformations and comes with support data such as GSHHS coastlines, rivers, and political boundaries. GMT is developed and maintained by Paul Wessel and Walter H. F. Smith with help from a global set of volunteers, and is supported by the National Science Foundation. It is released under the GNU General Public License. 
 endef
+
 ##
 ## Upstream URL that should show up in the VENDOR field as well as on
 ## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
+SPKG_SOURCEURL = http://gmt.soest.hawaii.edu/
 ##
 ## Whitespace-separated list of URLs to download the source package from.
 ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES =
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-##  on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
-## RUNTIME_DEP_PKGS =
-##
-## A list of packages necessary to build this package
-## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
-##
-## Arguments passed to the ./configure script.
-CONFIGURE_ARGS = $(DIRPATHS)
-##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
+MASTER_SITES = ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://gd.tuwien.ac.at/pub/gmt/
 
-#include gar/category.mk
+DISTFILES  = GMT$(GMT_VERSION)_doc.tar.bz2 \
+	     GMT$(GMT_VERSION)_share.tar.bz2 \
+	     GMT$(GMT_VERSION)_src.tar.bz2 \
+	     GMT$(GMT_VERSION)_suppl.tar.bz2
+UFILES_REGEX = GMT(\d+(?:\.\d+)*)_(.*).tar.gz
+
+
+RUNTIME_DEP_PKGS = CSWnetcdf CSWgmtcoast
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+
+## GMT Includes no unit tests
+TEST_SCRIPTS =
+
+## GMT doesn't use the GNU convention for unpacked tarballs
+WORKSRC = $(WORKDIR)/GMT$(GARVERSION)
+
+## Arguments passed to the ./configure script. Configure ignores the various
+## environment variables so we have to pass CFLAGS and friends
+CONFIGURE_ARGS = $(DIRPATHS) \
+		 --disable-mex \
+		 --enable-shared \
+		 --enable-netcdf=/opt/csw
+
+CONFIGURE_ENV += NETCDF_LIB=$(libdir)
+CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
+## Attempt to build this 64-bit
+BUILD64 = 1
+
+## Although NetCDF is built with GCC3, GMT Seems to build fine with GCC4
+GARCOMPILER = GCC4
+
+DEBUG_PACKAGING = 1
+
+## Checkpkg whines about this, but GMT really needs it's coastline files in
+## order to make a map of any real substance
+CHECKPKG_OVERRIDES_CSWgmt += surplus-dependency|CSWgmtcoast
+
+## Gar's license file finding routine isn't aware of how to find files when WORKSRC has been redefined, so we need to put the license file somewhere that it can find.
+post-install-modulated:
+	@cp $(WORKSRC)/LICENSE.TXT $(WORKDIR)/COPYING
+include gar/category.mk

Modified: csw/mgar/pkg/gmt/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-09-03 21:21:37 UTC (rev 10926)
+++ csw/mgar/pkg/gmt/trunk/checksums	2010-09-14 02:31:45 UTC (rev 10957)
@@ -0,0 +1,7 @@
+a2f0243bbbea4c6e1472a1d92a2c6d7c  GMT4.5.3_doc.tar.bz2
+378ea1b0e46b09455722df81c4c191ab  GMT4.5.3_share.tar.bz2
+ad069cfcc8216fdef69e0cb94536c2a6  GMT4.5.3_src.tar.bz2
+7d4bcb2ac56ee558cae8446363a74e64  GMT4.5.3_suppl.tar.bz2
+1f84a99effe96e12fb60f31fa3cf35bb  GSHHS2.1.0_coast.tar.bz2
+da679a412056e401bb624a213d4b11d6  GSHHS2.1.0_full.tar.bz2
+51128a3c545fd48364a2da830ebce1b6  GSHHS2.1.0_high.tar.bz2


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

From wahwah at users.sourceforge.net  Tue Sep 14 11:44:37 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 14 Sep 2010 09:44:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10958]
	csw/mgar/gar/v2-checkpkg-override-relocation/
Message-ID: <E1OvS45-0003UE-Bd@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10958
          http://gar.svn.sourceforge.net/gar/?rev=10958&view=rev
Author:   wahwah
Date:     2010-09-14 09:44:37 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
mGAR v2-checkpkg-override-relocation: removing an old branch.

Removed Paths:
-------------
    csw/mgar/gar/v2-checkpkg-override-relocation/


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 Sep 14 16:16:38 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Sep 2010 14:16:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10959]
	csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk
Message-ID: <E1OvWJK-0000ZB-Ik@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10959
          http://gar.svn.sourceforge.net/gar/?rev=10959&view=rev
Author:   dmichelsen
Date:     2010-09-14 14:16:38 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
cpan/Net-CIDR-Lite: Update to 0.21 and mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/CSWpmnetcidrlite.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/


Property changes on: csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/Makefile	2010-09-14 09:44:37 UTC (rev 10958)
+++ csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/Makefile	2010-09-14 14:16:38 UTC (rev 10959)
@@ -1,14 +1,19 @@
 GARNAME = Net-CIDR-Lite
-GARVERSION = 0.20
+GARVERSION = 0.21
 CATEGORIES = cpan
 AUTHOR = DOUGW
 
-DESCRIPTION = extension for merging IPv4 or IPv6 CIDR addresses
+DESCRIPTION = Extension for merging IPv4 or IPv6 CIDR addresses
 define BLURB
   Faster alternative to Net::CIDR when merging a large number of CIDR address
   ranges. Works for IPv4 and IPv6 addresses.
 endef
 
-DISTFILES += CSWpmnetcidrlite.gspec
+DISTFILES = COPYING
 
+PACKAGES = CSWpmnetcidrlite
+CATALOGNAME = pm_netcidrlite
+
+ARCHALL = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/checksums	2010-09-14 09:44:37 UTC (rev 10958)
+++ csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/checksums	2010-09-14 14:16:38 UTC (rev 10959)
@@ -1,2 +1 @@
-75a35fb3b0f570f71f940ccf0b1e5bb0  download/CSWpmnetcidrlite.gspec
-54998db6b297ffc8a20adb91ea744200  download/Net-CIDR-Lite-0.20.tar.gz
+12280b3754886b876918f03f53aee4f5  Net-CIDR-Lite-0.21.tar.gz

Copied: csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/COPYING (from rev 10957, csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/CSWpmnetcidrlite.gspec)
===================================================================
--- csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/COPYING	2010-09-14 14:16:38 UTC (rev 10959)
@@ -0,0 +1,2 @@
+This module is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.

Deleted: csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/CSWpmnetcidrlite.gspec
===================================================================
--- csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/CSWpmnetcidrlite.gspec	2010-09-14 09:44:37 UTC (rev 10958)
+++ csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/files/CSWpmnetcidrlite.gspec	2010-09-14 14:16:38 UTC (rev 10959)
@@ -1,7 +0,0 @@
-%var            bitname pm_netcidrlite
-%var            pkgname CSWpmnetcidrlite
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright      
-This module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.


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

From dmichelsen at users.sourceforge.net  Tue Sep 14 16:28:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Sep 2010 14:28:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10960]
	csw/mgar/pkg/postgresql/trunk/Makefile
Message-ID: <E1OvWUV-000137-DX@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10960
          http://gar.svn.sourceforge.net/gar/?rev=10960&view=rev
Author:   dmichelsen
Date:     2010-09-14 14:28:11 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
posgresql: Minor restructuring, no change in functionality yet

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-14 14:16:38 UTC (rev 10959)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-14 14:28:11 UTC (rev 10960)
@@ -84,23 +84,12 @@
 SPKG_DESC_CSWlibpq-$(BASE_VERSION_G)          = PostgreSQL $(BASE_VERSION).x Libraries
 
 RUNTIME_DEP_PKGS_CSWpostgresql                        = CSWpostgresql-$(BASE_VERSION_G)
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibpq-$(BASE_VERSION_G)
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxslt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWosslrt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWreadline
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxslt
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWzlib
+RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)      = CSWkrb5lib CSWlibpq-$(BASE_VERSION_G) CSWlibxml2 CSWlibxslt CSWosslrt CSWreadline CSWzlib CSWlibgnugetopt
+RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)           = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev  = CSWpostgresql-$(BASE_VERSION_G)
 
 ARCHALL_CSWpostgresql                       = 1
 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
-ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
 
 LICENSE = COPYRIGHT
 
@@ -164,31 +153,9 @@
 USERGROUP = /etc/opt/csw/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
 PRESERVECONF = $(sysconfdir)/postgresql\.conf
 
-BIN_NAMES  = clusterdb
-BIN_NAMES += createdb
-BIN_NAMES += createlang
-BIN_NAMES += createuser
-BIN_NAMES += dropdb
-BIN_NAMES += droplang
-BIN_NAMES += dropuser
-BIN_NAMES += ecpg
-BIN_NAMES += initdb
-BIN_NAMES += oid2name
-BIN_NAMES += pg_config
-BIN_NAMES += pg_controldata
-BIN_NAMES += pg_ctl
-BIN_NAMES += pg_dump
-BIN_NAMES += pg_dumpall
-BIN_NAMES += pg_resetxlog
-BIN_NAMES += pg_restore
-BIN_NAMES += pg_standby
-BIN_NAMES += pgbench
-BIN_NAMES += postgres
-BIN_NAMES += postmaster
-BIN_NAMES += psql
-BIN_NAMES += reindexdb
-BIN_NAMES += vacuumdb
-BIN_NAMES += vacuumlo
+BIN_NAMES  = clusterdb createdb createlang createuser dropdb droplang dropuser ecpg initdb oid2name
+BIN_NAMES += pg_config pg_controldata pg_ctl pg_dump pg_dumpall pg_resetxlog pg_restore pg_standby
+BIN_NAMES += pgbench postgres postmaster psql reindexdb vacuumdb vacuumlo
 
 PGDATA = $(localstatedir)/pgdata
 
@@ -199,6 +166,9 @@
 PROTOTYPE_PERMS_pgdata = 0700
 PROTOTYPE_CLASS_pgdata = ugfiles
 
+CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-84
+CHECKPKG_OVERRIDES_CSWpostgresql-84-dev += surplus-dependency|CSWpostgresql-84
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))


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

From bonivart at users.sourceforge.net  Tue Sep 14 16:43:04 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 14 Sep 2010 14:43:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[10961] csw/mgar/pkg/bind/trunk
Message-ID: <E1OvWiu-0007Lq-Pk@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10961
          http://gar.svn.sourceforge.net/gar/?rev=10961&view=rev
Author:   bonivart
Date:     2010-09-14 14:43:04 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
bind: update to 9.7.2

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

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2010-09-14 14:28:11 UTC (rev 10960)
+++ csw/mgar/pkg/bind/trunk/Makefile	2010-09-14 14:43:04 UTC (rev 10961)
@@ -2,14 +2,16 @@
 # owner/group for device files? (root:sys)
 
 GARNAME = bind
-GARVERSION = 9.7.1
-RELEASE = P2
-DISTVERSION = $(GARVERSION)-$(RELEASE)
-SPKG_VERSION = $(GARVERSION)$(RELEASE)
-DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+GARVERSION = 9.7.2
 CATEGORIES = net
 
+# Enable these for Px-releases
+#RELEASE = P2
+#DISTVERSION = $(GARVERSION)-$(RELEASE)
+#SPKG_VERSION = $(GARVERSION)$(RELEASE)
+#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
+#WORKSRC = $(WORKDIR)/$(DISTNAME)
+
 DESCRIPTION = ISC BIND DNS reference implementation
 define BLURB
   BIND is open-source software that implements the Domain Name System (DNS)
@@ -18,10 +20,14 @@
   high-volume and high-reliability applications.
 endef
 
-MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/
-DISTFILES  = $(DISTNAME).tar.gz
-#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/
-#DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+# Enable these for Px-releases
+#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/
+#DISTFILES  = $(DISTNAME).tar.gz
+
+# Disable these for Px-releases
+MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
 DISTFILES += CSWbindchroot.postinstall
 
 PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot

Modified: csw/mgar/pkg/bind/trunk/checksums
===================================================================
--- csw/mgar/pkg/bind/trunk/checksums	2010-09-14 14:28:11 UTC (rev 10960)
+++ csw/mgar/pkg/bind/trunk/checksums	2010-09-14 14:43:04 UTC (rev 10961)
@@ -1,2 +1 @@
-dbbc839888d11d22aad3ccb65942d2e5  CSWbindchroot.postinstall
-bd6be63cc910d04da39103d441871596  bind-9.7.1-P2.tar.gz
+166832fc0f94d6e4eb2dac8bed3b275f  bind-9.7.2.tar.gz


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

From wahwah at users.sourceforge.net  Tue Sep 14 17:59:47 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 14 Sep 2010 15:59:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10962]
	csw/mgar/pkg/puppet/branches/puppet-2.6.x/
Message-ID: <E1OvXv9-0001OI-Bj@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10962
          http://gar.svn.sourceforge.net/gar/?rev=10962&view=rev
Author:   wahwah
Date:     2010-09-14 15:59:47 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
puppet: Branching out to build puppet-2.6.x

Added Paths:
-----------
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/


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

From gadavis at users.sourceforge.net  Tue Sep 14 20:04:28 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Tue, 14 Sep 2010 18:04:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10963] csw/mgar/pkg/netcdf/trunk
Message-ID: <E1OvZro-0002sr-Dk@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10963
          http://gar.svn.sourceforge.net/gar/?rev=10963&view=rev
Author:   gadavis
Date:     2010-09-14 18:04:28 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
Merge in changes from branch gar-fortran

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

Property Changed:
----------------
    csw/mgar/pkg/netcdf/trunk/


Property changes on: csw/mgar/pkg/netcdf/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/netcdf/branches/gar-fortran:10929-10962

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-14 15:59:47 UTC (rev 10962)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-14 18:04:28 UTC (rev 10963)
@@ -2,169 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
 GARNAME = netcdf
 GARVERSION = 4.1.1
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
 CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
 DESCRIPTION = machine-independent data formats for array-oriented scientific data
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
-define BLURB
-  NetCDF (network Common Data Form) is a set of software libraries and 
-  machine-independent data formats that support the creation, access, 
-  and sharing of array-oriented scientific data. 
-endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
 SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
 MASTER_SITES = http://www.unidata.ucar.edu/downloads/netcdf/ftp/
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-##  on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
-RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt
-##
-## A list of packages necessary to build this package
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWautoconf CSWautomake CSWtetex
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-##
+LICENSE = COPYRIGHT
+RUNTIME_DEP_PKGS = CSWcurlrt CSWhdf5rt CSWgcc3g77rt CSWzlib CSWgcc3corert \
+		   CSWoldaprt CSWlibcares CSWlibidn CSWgcc3g++rt CSWosslrt
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWtetex CSWgcc3g77
 ## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
 ## building 64-bit
-## BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-##
-## Arguments passed to the ./configure script.
+BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
+
 CONFIGURE_ARGS = $(DIRPATHS) \
 		 --enable-netcdf-4 \
 		 --enable-dap \
@@ -178,35 +32,22 @@
 		 --with-hdf5=/opt/csw \
 		 --with-zlib=/opt/csw
 
-##
+## 64 bit build fails in fortran binding tests
 ## Disabling 64 bit builds until we can tweak GAR to handle Fortran  & ARCH
 BUILD64 = 0
-#CONFIGURE_ENV = CC=suncc CXX=sunCC F77=sunf77 FFLAGS="-dalign" FC=sunf95 \
-#		FCFLAGS="-dalign"
-CONFIGURE_ENV = CC=cc CXX=CC F77=f77 FC=f95
-EXTRA_CFLAGS = -g
-EXTRA_CPPFLAGS = -DsunFortran -D__FUNCTION__=__func__ -D_FILE_OFFSET_BITS=64
-EXTRA_CXXFLAGS = -g
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-OPT_FLAGS_SOS = -fast
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
-# Remove the following rules and uncomment the
-# include before building.
-#all: .DEFAULT
-#.DEFAULT:
-#	@true
 
-include gar/category.mk
+## Needed for "Large file support" in NetCDF
+EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
-pre-configure-modulated:
-	        @(cd $(WORKSRC); autoreconf)
-		@$(MAKECOOKIE)
+## Can't use Sun Studio with shared libs:
+##  * non-redistributable libs in /opt/SUNWspro prevent Sun Studio
+## Can't use GCC4
+##  * C++ is way broken for 32-bit Sparc
+##    During the 32-bit sparc build, the C++ bindings were barfing with an error
+##    about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
+##    http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
+##  * Fortran to C bindings fail test on 64-bit sparc
+GARCOMPILER = GCC3
 
+DEBUG_PACKAGING = 1
+include gar/category.mk


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

From dmichelsen at users.sourceforge.net  Wed Sep 15 12:38:05 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 15 Sep 2010 10:38:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[10964] csw/mgar/pkg/cpan
Message-ID: <E1OvpNN-0006Zt-DF@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10964
          http://gar.svn.sourceforge.net/gar/?rev=10964&view=rev
Author:   dmichelsen
Date:     2010-09-15 10:38:04 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
cpan/Module-Starter: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Module-Starter/
    csw/mgar/pkg/cpan/Module-Starter/branches/
    csw/mgar/pkg/cpan/Module-Starter/tags/
    csw/mgar/pkg/cpan/Module-Starter/trunk/
    csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Starter/trunk/checksums
    csw/mgar/pkg/cpan/Module-Starter/trunk/files/
    csw/mgar/pkg/cpan/Module-Starter/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Module-Starter/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile	2010-09-15 10:38:04 UTC (rev 10964)
@@ -0,0 +1,17 @@
+GARNAME = Module-Starter
+GARVERSION = 1.54
+CATEGORIES = cpan
+AUTHOR = PETDANCE
+
+DESCRIPTION = A simple starter kit for any module
+define BLURB
+endef
+
+DISTFILES = COPYING
+
+PACKAGES = CSWpmmodulestarter
+CATALOGNAME = pm_modulestarter
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Module-Starter/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Module-Starter/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Module-Starter/trunk/checksums	2010-09-15 10:38:04 UTC (rev 10964)
@@ -0,0 +1 @@
+abf086bf058c2c80ea283d6b4049275b  Module-Starter-1.54.tar.gz

Added: csw/mgar/pkg/cpan/Module-Starter/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Module-Starter/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Module-Starter/trunk/files/COPYING	2010-09-15 10:38:04 UTC (rev 10964)
@@ -0,0 +1,7 @@
+COPYRIGHT
+    Copyright 2004-7 Andy Lester, Ricardo Signes, C.J. Adams-Collier,
+    All Rights Reserved.
+
+    This program is free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
+


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

From dmichelsen at users.sourceforge.net  Wed Sep 15 12:57:43 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 15 Sep 2010 10:57:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[10965] csw/mgar/pkg
Message-ID: <E1OvpgN-00079d-8J@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10965
          http://gar.svn.sourceforge.net/gar/?rev=10965&view=rev
Author:   dmichelsen
Date:     2010-09-15 10:57:42 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
libxml++: Initial commit, dependencies needed, e.g. glibmm

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


Property changes on: csw/mgar/pkg/libxml++/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/libxml++/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml++/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libxml++/trunk/Makefile	2010-09-15 10:57:42 UTC (rev 10965)
@@ -0,0 +1,22 @@
+# $Id$
+GARNAME = libxml++
+GARVERSION = 2.30.1
+CATEGORIES = lib
+
+DESCRIPTION = C++ wrapper for the libxml XML parser library
+define BLURB
+endef
+
+MASTER_SITES = $(GNOME_MIRROR)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+
+EXTRA_CONFIGURE_EXPORTS = MAKE
+MAKE = gmake
+
+BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/libxml++/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/libxml++/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxml++/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libxml++/trunk/checksums	2010-09-15 10:57:42 UTC (rev 10965)
@@ -0,0 +1 @@
+0de2bd8c38cf308983df7d531681da56  libxml++-2.30.1.tar.bz2


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

From dmichelsen at users.sourceforge.net  Wed Sep 15 13:01:40 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 15 Sep 2010 11:01:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10966] csw/mgar/pkg/glibmm
Message-ID: <E1OvpkC-0000Ar-8u@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10966
          http://gar.svn.sourceforge.net/gar/?rev=10966&view=rev
Author:   dmichelsen
Date:     2010-09-15 11:01:39 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
glibmm: Move legacy to tags

Added Paths:
-----------
    csw/mgar/pkg/glibmm/tags/legacy/

Removed Paths:
-------------
    csw/mgar/pkg/glibmm/trunk/legacy/


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

From wahwah at users.sourceforge.net  Thu Sep 16 00:56:22 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 15 Sep 2010 22:56:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10967]
	csw/mgar/pkg/postgresql/branches/optcsw/
Message-ID: <E1Ow0tq-0004re-LZ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10967
          http://gar.svn.sourceforge.net/gar/?rev=10967&view=rev
Author:   wahwah
Date:     2010-09-15 22:56:22 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
postgresql: Branching out to do some experimentation.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/optcsw/


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

From wahwah at users.sourceforge.net  Thu Sep 16 01:03:13 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 15 Sep 2010 23:03:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10968]
	csw/mgar/pkg/postgresql/branches/optcsw/Makefile
Message-ID: <E1Ow10T-0004CD-QA@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10968
          http://gar.svn.sourceforge.net/gar/?rev=10968&view=rev
Author:   wahwah
Date:     2010-09-15 23:03:13 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
postgresql: Moved 3 libs to libpq, added a dependency on CSWlibgnugetopt and overrides.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/optcsw/Makefile

Modified: csw/mgar/pkg/postgresql/branches/optcsw/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-15 22:56:22 UTC (rev 10967)
+++ csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-15 23:03:13 UTC (rev 10968)
@@ -85,6 +85,7 @@
 
 RUNTIME_DEP_PKGS_CSWpostgresql                        = CSWpostgresql-$(BASE_VERSION_G)
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibgnugetopt
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibpq-$(BASE_VERSION_G)
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxslt
@@ -98,6 +99,9 @@
 RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWzlib
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev  = CSWpostgresql-$(BASE_VERSION_G)
 
+CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-84
+CHECKPKG_OVERRIDES_CSWpostgresql-84-dev += surplus-dependency|CSWpostgresql-84
+
 ARCHALL_CSWpostgresql                       = 1
 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
@@ -156,7 +160,7 @@
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(PKGFILES_RT)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(prefix)/share/checkpkg/overrides/libpq$(BASE_VERSION_G)
+PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*lib(pq|pgtypes|ecpg)\.so.*
 
 # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
 initscript_base_name = cswpostgres_$(VERSION_NODOT)


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

From wahwah at users.sourceforge.net  Thu Sep 16 08:35:20 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 16 Sep 2010 06:35:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[10969]
	csw/mgar/pkg/postgresql/branches/optcsw
Message-ID: <E1Ow840-0008Fo-Px@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10969
          http://gar.svn.sourceforge.net/gar/?rev=10969&view=rev
Author:   wahwah
Date:     2010-09-16 06:35:20 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
postgresql: Version bump to 8.4.4.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/optcsw/Makefile
    csw/mgar/pkg/postgresql/branches/optcsw/checksums

Modified: csw/mgar/pkg/postgresql/branches/optcsw/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-15 23:03:13 UTC (rev 10968)
+++ csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-16 06:35:20 UTC (rev 10969)
@@ -18,7 +18,7 @@
 # How to make one automatically?
 VERSION_NODOT = 8_4
 BASE_VERSION_G = 84
-PATCHLEVEL = 2
+PATCHLEVEL = 4
 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 

Modified: csw/mgar/pkg/postgresql/branches/optcsw/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/checksums	2010-09-15 23:03:13 UTC (rev 10968)
+++ csw/mgar/pkg/postgresql/branches/optcsw/checksums	2010-09-16 06:35:20 UTC (rev 10969)
@@ -1,5 +1 @@
-6e4e2a7755acf94bc83200a308e21ef3  README-CSW.txt
-e5202be64cafe8f65d41a6fffd1bc311  cswpostgres.tmpl
-9e1e49d76fee70cb8e2d49304695ec89  cswusergroup.tmpl
-d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2
-8237c74666058f607f5418e3b57c74a9  postgresql.conf.tmpl
+4bf2448ad965bca3940df648c02194df  postgresql-8.4.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  Thu Sep 16 09:50:14 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 07:50:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10970] csw/mgar/pkg/xjobs/trunk
Message-ID: <E1Ow9EU-0003ZC-MO@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10970
          http://gar.svn.sourceforge.net/gar/?rev=10970&view=rev
Author:   dmichelsen
Date:     2010-09-16 07:50:14 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
xjobs: Update to 20100915

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

Modified: csw/mgar/pkg/xjobs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xjobs/trunk/Makefile	2010-09-16 06:35:20 UTC (rev 10969)
+++ csw/mgar/pkg/xjobs/trunk/Makefile	2010-09-16 07:50:14 UTC (rev 10970)
@@ -1,5 +1,5 @@
 GARNAME = xjobs
-GARVERSION = 20100311
+GARVERSION = 20100915
 CATEGORIES = utils
 
 DESCRIPTION = Executes jobs in parallel similar to xargs

Modified: csw/mgar/pkg/xjobs/trunk/checksums
===================================================================
--- csw/mgar/pkg/xjobs/trunk/checksums	2010-09-16 06:35:20 UTC (rev 10969)
+++ csw/mgar/pkg/xjobs/trunk/checksums	2010-09-16 07:50:14 UTC (rev 10970)
@@ -1 +1 @@
-28c89f1d944f0d44b2014475a0763027  xjobs-20100311.tgz
+df9310c060a4b8c467e240495ad495b8  xjobs-20100915.tgz


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

From dmichelsen at users.sourceforge.net  Thu Sep 16 13:47:32 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 11:47:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[10971] csw/mgar/pkg/yasm/trunk
Message-ID: <E1OwCw8-0000jl-16@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10971
          http://gar.svn.sourceforge.net/gar/?rev=10971&view=rev
Author:   dmichelsen
Date:     2010-09-16 11:47:31 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
yasm: Update to 1.1.0

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

Modified: csw/mgar/pkg/yasm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yasm/trunk/Makefile	2010-09-16 07:50:14 UTC (rev 10970)
+++ csw/mgar/pkg/yasm/trunk/Makefile	2010-09-16 11:47:31 UTC (rev 10971)
@@ -1,5 +1,5 @@
 GARNAME = yasm
-GARVERSION = 1.0.0
+GARVERSION = 1.1.0
 CATEGORIES = devel
 
 DESCRIPTION = A complete rewrite of the NASM assembler

Modified: csw/mgar/pkg/yasm/trunk/checksums
===================================================================
--- csw/mgar/pkg/yasm/trunk/checksums	2010-09-16 07:50:14 UTC (rev 10970)
+++ csw/mgar/pkg/yasm/trunk/checksums	2010-09-16 11:47:31 UTC (rev 10971)
@@ -1 +1 @@
-e00627e13d30ff9238053e95bd93a8fb  yasm-1.0.0.tar.gz
+8392e5f2235c2c2a981e1a633f2698cb  yasm-1.1.0.tar.gz


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

From wahwah at users.sourceforge.net  Thu Sep 16 13:57:57 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 16 Sep 2010 11:57:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10972]
	csw/mgar/gar/v2/lib/python/pkgdb.py
Message-ID: <E1OwD6D-000134-O1@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10972
          http://gar.svn.sourceforge.net/gar/?rev=10972&view=rev
Author:   wahwah
Date:     2010-09-16 11:57:57 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
mGAR v2: pkgdb, fixing a bug which caused the custom template option to be ignored.

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

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2010-09-16 11:47:31 UTC (rev 10971)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2010-09-16 11:57:57 UTC (rev 10972)
@@ -154,7 +154,7 @@
       t = Template(SHOW_PKG_TMPL, searchList=[srv4])
       sys.stdout.write(unicode(t))
   if command == 'gen-html':
-    g = HtmlGenerator(md5_sums)
+    g = HtmlGenerator(md5_sums, options.pkg_review_template)
     sys.stdout.write(g.GenerateHtml())
 
 


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 Sep 16 14:47:15 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 12:47:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10973] csw/mgar/pkg/mutt/trunk
Message-ID: <E1OwDrv-0002GV-Qv@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10973
          http://gar.svn.sourceforge.net/gar/?rev=10973&view=rev
Author:   dmichelsen
Date:     2010-09-16 12:47:15 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
mutt: Update to 1.5.21

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

Modified: csw/mgar/pkg/mutt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mutt/trunk/Makefile	2010-09-16 11:57:57 UTC (rev 10972)
+++ csw/mgar/pkg/mutt/trunk/Makefile	2010-09-16 12:47:15 UTC (rev 10973)
@@ -1,5 +1,5 @@
 GARNAME = mutt
-GARVERSION = 1.5.20
+GARVERSION = 1.5.21
 CATEGORIES = apps
 
 EXTRA_MODULATORS = SLANG
@@ -102,6 +102,14 @@
 # This warning from checkpkg is obviously wrong...
 CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl
 
+# These overrides are specific to the structure of the package
+CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-ncurses
+CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-slang
+CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWalternatives
+CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWmutt-base
+CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWalternatives
+CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base
+
 include gar/category.mk
 
 post-merge:

Modified: csw/mgar/pkg/mutt/trunk/checksums
===================================================================
--- csw/mgar/pkg/mutt/trunk/checksums	2010-09-16 11:57:57 UTC (rev 10972)
+++ csw/mgar/pkg/mutt/trunk/checksums	2010-09-16 12:47:15 UTC (rev 10973)
@@ -1,2 +1 @@
-cbeed4711dc224a1ae0900780d469b38  CSWmutt.postmsg
-027cdd9959203de0c3c64149a7ee351c  mutt-1.5.20.tar.gz
+a29db8f1d51e2f10c070bf88e8a553fd  mutt-1.5.21.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 Sep 16 14:47:48 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 12:47:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10974]
	csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/
Message-ID: <E1OwDsS-0002H8-R2@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10974
          http://gar.svn.sourceforge.net/gar/?rev=10974&view=rev
Author:   dmichelsen
Date:     2010-09-16 12:47:48 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
openssh: Make new branch openssh-5.6p1+lpk

Added Paths:
-----------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/


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 Sep 16 15:08:29 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 13:08:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10975] csw/mgar/pkg/openssh/branches
Message-ID: <E1OwECT-0002uf-94@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10975
          http://gar.svn.sourceforge.net/gar/?rev=10975&view=rev
Author:   dmichelsen
Date:     2010-09-16 13:08:28 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
openssh-5.6p1: Forward-port r9735

Modified Paths:
--------------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch

Removed Paths:
-------------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch

Property Changed:
----------------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/


Property changes on: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk:9735

Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile	2010-09-16 12:47:48 UTC (rev 10974)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile	2010-09-16 13:08:28 UTC (rev 10975)
@@ -152,14 +152,18 @@
 
 # we always register the lpk related files so checksum 
 # is the same with LPK enabled or not
-DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
+# Patch taken from http://code.google.com/p/openssh-lpk/issues/detail?id=7
+# and modified with
+#   perl -e 's/--- g/--- /; s/\+{3} g/+++ /' -pi 
+# as all filenames seem to be prefixed with 'g' and redone patch for
+# patchdirlevel 1 instead of 0
+DISTFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
 ifdef LPK
 	PACKAGES = CSWosshlpk
 	CATALOGNAME_CSWosshlpk = openssh_lpk
 	SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support
 	RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt
-	MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/
-	PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
+	PATCHFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
 	CONFIGURE_ARGS += --with-ldap
 	DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk
 	
@@ -167,6 +171,10 @@
 	SPKG_DESC_CSWosshclient = 
 endif
 
+CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/
+CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/
+CHECKPKG_OVERRIDES_CSWosshlpk += init-file-wrong-location|/etc/opt/csw/init.d/cswopenssh
+CHECKPKG_OVERRIDES_CSWosshlpk += surplus-dependency|CSWosshclient
 
 include gar/category.mk
 
@@ -184,6 +192,7 @@
 
 # adding documentation files
 pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories
+	@$(MAKECOOKIE)
 
 merge-contrib-files:
 	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
@@ -202,7 +211,6 @@
 		(cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \
 		ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \
 	done
-	@$(MAKECOOKIE)
 
 merge-config-files:
 	# we change some default value in the server config file
@@ -210,7 +218,6 @@
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
-	@$(MAKECOOKIE)
 
 merge-special-directories:
 	ginstall -d $(PKGROOT)$(localstatedir)/empty

Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums	2010-09-16 12:47:48 UTC (rev 10974)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums	2010-09-16 13:08:28 UTC (rev 10975)
@@ -1 +1,18 @@
-e6ee52e47c768bf0ec42a232b5d18fb0  openssh-5.6p1.tar.gz
+d0bdd7ebcbd41acd67dcf55e98c53dcb  0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
+1d3d6d477c09e59c514e637fa3a2f7a4  CSWossh.checkinstall
+0993813fa5c752215f892cb67c86816f  CSWossh.preinstall
+e00106f28a2aef529e097aa182906273  CSWossh.prototype
+39259b734dc10d2b7eb82d2331254d4c  CSWosshclient.prototype
+1d3d6d477c09e59c514e637fa3a2f7a4  CSWosshlpk.checkinstall
+0993813fa5c752215f892cb67c86816f  CSWosshlpk.preinstall
+36aff9d761d77369ba97ce6508782ccd  CSWosshlpk.prototype
+3344f6f17e6d75e8e135b8366e64a7ee  changelog.CSW
+a5ebb2e3fdaa06c3c9edba55aac5f83b  cswopenssh
+8e765642349b6321d01b33e95304e113  cswopenssh.xml
+704ad1d3216df8de4d44465006c64c39  derelativise_path_bugfix.patch
+4b3e79120b60e8f25be5141eba53cac5  don_t_use_TIOCSCTTY.patch
+72c46751eba8f77b53b1ee7cb801bfd7  dont_derelativise_authorizedkeysfile_option.patch
+ca5403c8e1539d5ced0573f289ed7aef  no_x_forwarding_bug.patch
+10e0b84c84ad0dc9c490480aab36be01  openssh-5.4p1-gsskex-all-20100313.patch
+da10af8a789fa2e83e3635f3a1b76f5e  openssh-5.4p1.tar.gz
+db57ce80e8944213443caa4c52c884e5  sshd.smf_wrapper

Copied: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch (from rev 9735, csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch)
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch	2010-09-16 13:08:28 UTC (rev 10975)
@@ -0,0 +1,1948 @@
+From bf2274fb19b2da6b8b3b6c51111d912e19b3128c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 21 Apr 2010 11:14:45 +0200
+Subject: [PATCH] This is a forward-port of the OpenSSH LPK support patch.
+
+It adds support for storing OpenSSH public keys in LDAP. It also supports
+grouping of machines in the LDAP data to limit users to specific machines.
+
+The latest homepage for the LPK project is:
+http://code.google.com/p/openssh-lpk/
+
+The 0.3.10 version of the patch includes a fix for 64-bit platforms, as
+discovered by Gentoo, where the bind timeout and search timeout values were not
+being parsed correctly: http://bugs.gentoo.org/210110
+
+Forward-ported-from: openssh-lpk-5.1p1-0.3.10.patch
+---
+ Makefile.in                 |    2 +-
+ README.lpk                  |  267 ++++++++++++++++++++
+ auth-rsa.c                  |   86 +++++++
+ auth2-pubkey.c              |   73 ++++++
+ config.h.in                 |    3 +
+ configure                   |   81 ++++++
+ configure.ac                |   32 +++
+ ldapauth.c                  |  575 +++++++++++++++++++++++++++++++++++++++++++
+ ldapauth.h                  |  124 ++++++++++
+ lpk-user-example.txt        |  117 +++++++++
+ openssh-lpk_openldap.schema |   19 ++
+ openssh-lpk_sun.schema      |   21 ++
+ servconf.c                  |  169 +++++++++++++
+ servconf.h                  |    7 +
+ sshd.c                      |   14 +
+ sshd_config                 |   15 ++
+ sshd_config.5               |   56 +++++
+ 17 files changed, 1660 insertions(+), 1 deletions(-)
+ create mode 100644 README.lpk
+ create mode 100644 ldapauth.c
+ create mode 100644 ldapauth.h
+ create mode 100644 lpk-user-example.txt
+ create mode 100644 openssh-lpk_openldap.schema
+ create mode 100644 openssh-lpk_sun.schema
+
+diff --git a/Makefile.in b/Makefile.in
+index 69e3567..b15d85d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -91,7 +91,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+ 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
+ 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+-	roaming_common.o roaming_serv.o
++	roaming_common.o roaming_serv.o ldapauth.o
+ 
+ MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
+ MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
+diff --git a/README.lpk b/README.lpk
+new file mode 100644
+index 0000000..d0b6de0
+--- /dev/null
++++ b/README.lpk
+@@ -0,0 +1,267 @@
++OpenSSH LDAP PUBLIC KEY PATCH 
++Copyright (c) 2003 Eric AUGE (eau at phear.org)
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products
++   derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++purposes of this patch:
++
++This patch would help to have authentication centralization policy
++using ssh public key authentication.
++This patch could be an alternative to other "secure" authentication system
++working in a similar way (Kerberos, SecurID, etc...), except the fact 
++that it's based on OpenSSH and its public key abilities.
++
++>> FYI: <<
++'uid': means unix accounts existing on the current server
++'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config)
++
++example schema:
++
++
++                                  server1 (uid: eau,rival,toto) (lpkServerGroup: unix)
++                ___________      /
++               /           \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix)
++              | LDAP Server |    \
++	      | eau  ,rival |     server2 (uid: rival, eau) (lpkServerGroup: unix)
++	      | titi ,toto  |
++	      | userx,....  |         server5 (uid: eau)  (lpkServerGroup: mail)
++               \___________/ \       /
++	                       ----- - server4 (uid: eau, rival)  (no group configured)
++			             \
++				        etc...
++
++- WHAT WE NEED :
++
++  * configured LDAP server somewhere on the network (i.e. OpenLDAP)
++  * patched sshd (with this patch ;)
++  * LDAP user(/group) entry (look at users.ldif (& groups.ldif)):
++        User entry:
++	- attached to the 'ldapPublicKey' objectclass
++	- attached to the 'posixAccount' objectclass
++	- with a filled 'sshPublicKey' attribute 
++	Example:
++		dn: uid=eau,ou=users,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: person
++		objectclass: organizationalPerson
++		objectclass: posixAccount
++		objectclass: ldapPublicKey
++		description: Eric AUGE Account
++		userPassword: blah
++		cn: Eric AUGE
++		sn: Eric AUGE
++		uid: eau
++		uidNumber: 1034
++		gidNumber: 1
++		homeDirectory: /export/home/eau
++		sshPublicKey: ssh-dss AAAAB3...
++		sshPublicKey: ssh-dss AAAAM5...
++
++	Group entry:
++	- attached to the 'posixGroup' objectclass
++	- with a 'cn' groupname attribute
++	- with multiple 'memberUid' attributes filled with usernames allowed in this group
++	Example:
++		# few members
++		dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: posixGroup
++		description: Unix based servers group
++		cn: unix
++		gidNumber: 1002
++		memberUid: eau
++		memberUid: user1
++		memberUid: user2
++
++
++- HOW IT WORKS :
++
++  * without patch
++  If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..)
++  and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled).
++
++  * with the patch
++  If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled.
++  It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. 
++  (usually in $HOME/.ssh/authorized_keys)
++
++  If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into.
++  If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled).
++
++  7 tokens are added to sshd_config :
++  # here is the new patched ldap related tokens
++  # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup
++  UseLPK yes								# look the pub key into LDAP
++  LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3	# which LDAP server for users ? (URL format)
++  LpkUserDN  ou=users,dc=foobar,dc=net					# which base DN for users ?
++  LpkGroupDN ou=groups,dc=foobar,dc=net					# which base DN for groups ? 
++  LpkBindDN cn=manager,dc=foobar,dc=net					# which bind DN ?
++  LpkBindPw asecret							# bind DN credidentials
++  LpkServerGroup agroupname						# the group the server is part of
++
++  Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some
++  flaws you have to take care of.
++
++- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY
++
++  * my way (there is plenty :)
++  - create ldif file (i.e. users.ldif)
++  - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub
++  - my way in 4 steps :
++  Example:
++
++  # you add this to the user entry in the LDIF file :
++  [...]
++  objectclass: posixAccount
++  objectclass: ldapPublicKey
++  [...]
++  sshPubliKey: ssh-dss AAAABDh12DDUR2...
++  [...]
++
++  # insert your entry and you're done :)
++  ldapadd -D balblabla -w bleh < file.ldif 
++  
++  all standard options can be present in the 'sshPublicKey' attribute.
++
++- WHY :
++
++  Simply because, i was looking for a way to centralize all sysadmins authentication, easily,  without completely using LDAP 
++  as authentication method (like pam_ldap etc..).  
++  
++  After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get 
++  public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser'
++  objectclass within LDAP and part of the group the SSH server is in). 
++
++  Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase 
++  so each user can change it as much as he wants). 
++
++  Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only).
++
++- RULES :  
++  Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. 
++  and the additionnal lpk.schema.
++
++  This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication 
++  (pamldap, nss_ldap, etc..).
++
++  This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..).
++  
++  Referring to schema at the beginning of this file if user 'eau' is only in group 'unix'
++  'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'.
++  If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able
++  to log in 'server5' (i hope you got the idea, my english is bad :).
++
++  Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP
++  server.
++  When you want to allow a new user to have access to the server parc, you just add him an account on 
++  your servers, you add his public key into his entry on the LDAP server, it's done. 
++
++  Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys).
++
++  When the user needs to change his passphrase he can do it directly from his workstation by changing 
++  his own key set lock passphrase, and all servers are automatically aware.
++ 
++  With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself
++  so he can add/modify/delete himself his public key when needed.
++
++\xAD FLAWS :
++  LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP 
++  allow write to users dn, somebody could replace someuser's public key by its own and impersonate some 
++  of your users in all your server farm be VERY CAREFUL.
++  
++  MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login 
++  as the impersonnated user.
++
++  If LDAP server is down then, fallback on passwd auth.
++  
++  the ldap code part has not been well audited yet.
++
++- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif)
++    --- CUT HERE ---
++    dn: uid=jdoe,ou=users,dc=foobar,dc=net
++    objectclass: top
++    objectclass: person
++    objectclass: organizationalPerson
++    objectclass: posixAccount
++    objectclass: ldapPublicKey
++    description: My account
++    cn: John Doe
++    sn: John Doe
++    uid: jdoe
++    uidNumber: 100
++    gidNumber: 100
++    homeDirectory: /home/jdoe
++    sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB....
++    [...]
++    --- CUT HERE ---
++
++- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif)
++    --- CUT HERE ---
++    dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++    objectclass: top
++    objectclass: posixGroup
++    description: Unix based servers group
++    cn: unix
++    gidNumber: 1002
++    memberUid: jdoe
++    memberUid: user1
++    memberUid: user2
++    [...]
++    --- CUT HERE ---
++
++>> FYI: << 
++Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry
++
++- COMPILING:
++  1. Apply the patch
++  2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes
++  3. make
++  4. it's done.
++
++- BLA :
++  I hope this could help, and i hope to be clear enough,, or give ideas.  questions/comments/improvements are welcome.
++  
++- TODO :
++  Redesign differently.
++
++- DOCS/LINK :
++  http://pacsec.jp/core05/psj05-barisani-en.pdf
++  http://fritz.potsdam.edu/projects/openssh-lpk/
++  http://fritz.potsdam.edu/projects/sshgate/
++  http://dev.inversepath.com/trac/openssh-lpk
++  http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm )
++
++- CONTRIBUTORS/IDEAS/GREETS :
++  - Falk Siemonsmeier.
++  - Jacob Rief.
++  - Michael Durchgraf.
++  - frederic peters.
++  - Finlay dobbie.
++  - Stefan Fisher.
++  - Robin H. Johnson.
++  - Adrian Bridgett.
++
++- CONTACT :
++  - Eric AUGE <eau at phear.org>
++  - Andrea Barisani <andrea at inversepath.com>
+diff --git a/auth-rsa.c b/auth-rsa.c
+index 65571a8..107fcaf 100644
+--- a/auth-rsa.c
++++ b/auth-rsa.c
+@@ -177,10 +177,96 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
+ 	FILE *f;
+ 	u_long linenum = 0;
+ 	Key *key;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++	/* here is the job */
++	key = key_new(KEY_RSA1);
++
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s", pw->pw_name);
++	    if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    for (i = 0 ; i < k->num ; i++) {
++			char *cp, *options = NULL;
++
++			for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			/*
++			* Check if there are options for this key, and if so,
++			* save their starting address and skip the option part
++			* for now.  If there are no options, set the starting
++			* address to NULL.
++			 */
++			if (*cp < '0' || *cp > '9') {
++			    int quoted = 0;
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			} else
++			    options = NULL;
++
++			/* Parse the key from the line. */
++			if (hostfile_read_key(&cp, &bits, key) == 0) {
++			    debug("[LDAP] line %d: non ssh1 key syntax", i);
++			    continue;
++			}
++			/* cp now points to the comment part. */
++
++			/* Check if the we have found the desired key (identified by its modulus). */
++			if (BN_cmp(key->rsa->n, client_n) != 0)
++			    continue;
++
++			/* check the real bits  */
++			if (bits != (unsigned int)BN_num_bits(key->rsa->n))
++			    logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: "
++				    "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits);
++
++			/* We have found the desired key. */
++			/*
++			* If our options do not allow this key to be used,
++			* do not send challenge.
++			 */
++			if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i))
++			    continue;
++
++			/* break out, this key is allowed */
++			allowed = 1;
++
++			/* add the return stuff etc... */
++			/* Restore the privileged uid. */
++			restore_uid();
++
++			/* return key if allowed */
++			if (allowed && rkey != NULL)
++			    *rkey = key;
++			else
++			    key_free(key);
++
++			ldap_keys_free(k);
++			return (allowed);
++		    }
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	/* The authorized keys. */
+ 	file = authorized_keys_file(pw);
+ 	debug("trying public RSA key file %s", file);
+diff --git a/auth2-pubkey.c b/auth2-pubkey.c
+index 51aa774..7a3a27b 100644
+--- a/auth2-pubkey.c
++++ b/auth2-pubkey.c
+@@ -58,6 +58,10 @@
+ #include "misc.h"
+ #include "authfile.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ /* import */
+ extern ServerOptions options;
+ extern u_char *session_id2;
+@@ -187,10 +191,79 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
+ 	u_long linenum = 0;
+ 	Key *found;
+ 	char *fp;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++ 	found_key = 0;
++ 	/* allocate a new key type */
++ 	found = key_new(key->type);
++ 
++ 	/* first check if the options is enabled, then try.. */
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s",pw->pw_name);
++	    if (ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    /* Skip leading whitespace, empty and comment lines. */
++		    for (i = 0 ; i < k->num ; i++) {
++			/* dont forget if multiple keys to reset options */
++			char *cp, *options = NULL;
++
++			for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			if (key_read(found, &cp) != 1) {
++			    /* no key?  check if there are options for this key */
++			    int quoted = 0;
++			    debug2("[LDAP] user_key_allowed: check options: '%s'", cp);
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			    /* Skip remaining whitespace. */
++			    for (; *cp == ' ' || *cp == '\t'; cp++)
++				;
++			    if (key_read(found, &cp) != 1) {
++				debug2("[LDAP] user_key_allowed: advance: '%s'", cp);
++				/* still no key?  advance to next line*/
++				continue;
++			    }
++			}
++
++			if (key_equal(found, key) &&
++				auth_parse_options(pw, options, file, linenum) == 1) {
++			    found_key = 1;
++			    debug("[LDAP] matching key found");
++			    fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
++			    verbose("[LDAP] Found matching %s key: %s", key_type(found), fp);
++
++			    /* restoring memory */
++			    ldap_keys_free(k);
++			    xfree(fp);
++			    restore_uid();
++			    key_free(found);
++			    return found_key;
++			    break;
++			}
++		    }/* end of LDAP for() */
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	debug("trying public key file %s", file);
+ 	f = auth_openkeyfile(file, pw, options.strict_modes);
+ 
+diff --git a/config.h.in b/config.h.in
+index a61dec6..eba6884 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -575,6 +575,9 @@
+ /* Define to 1 if you have the <linux/if_tun.h> header file. */
+ #undef HAVE_LINUX_IF_TUN_H
+ 
++/* Define if you want LDAP support */
++#undef WITH_LDAP_PUBKEY
++
+ /* Define if your libraries define login() */
+ #undef HAVE_LOGIN
+ 
+diff --git a/configure b/configure
+index 7c19fc2..8ebf2e1 100755
+--- a/configure
++++ b/configure
+@@ -1340,6 +1340,7 @@ Optional Packages:
+   --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
+   --with-libedit[=PATH]   Enable libedit support for sftp
+   --with-audit=module     Enable EXPERIMENTAL audit support (modules=debug,bsm)
++  --with-ldap[=PATH]      Enable LDAP pubkey support (optionally in PATH)
+   --with-ssl-dir=PATH     Specify path to OpenSSL installation
+   --without-openssl-header-check Disable OpenSSL version consistency check
+   --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
+@@ -12845,6 +12846,85 @@ echo "$as_me: error: Unknown audit module $withval" >&2;}
+ fi
+ 
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++
++# Check whether --with-ldap was given.
++if test "${with_ldap+set}" = set; then
++  withval=$with_ldap;
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++
++cat >>confdefs.h <<\_ACEOF
++#define WITH_LDAP_PUBKEY 1
++_ACEOF
++
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++
++			{ echo "$as_me:$LINENO: checking for LDAP support" >&5
++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++				 #include <ldap.h>
++int
++main ()
++{
++(void)ldap_init(0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++				    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++					{ { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5
++echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;}
++   { (exit 1); exit 1; }; }
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		fi
++
++
++fi
++
++
+ 
+ 
+ 
+@@ -30786,6 +30866,7 @@ echo "                   SELinux support: $SELINUX_MSG"
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff --git a/configure.ac b/configure.ac
+index a9960a7..d3d85ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1323,6 +1323,37 @@ AC_ARG_WITH(audit,
+ 	esac ]
+ )
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++AC_ARG_WITH(ldap,
++	[  --with-ldap[[=PATH]]      Enable LDAP pubkey support (optionally in PATH)],
++	[
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++			AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support])
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++	
++			AC_MSG_CHECKING([for LDAP support])
++			AC_TRY_COMPILE(
++				[#include <sys/types.h>
++				 #include <ldap.h>],
++				[(void)ldap_init(0, 0);],
++				[AC_MSG_RESULT(yes)],
++				[
++				    AC_MSG_RESULT(no) 
++					AC_MSG_ERROR([** Incomplete or missing ldap libraries **])
++				]
++        	)
++		fi
++	]
++)
++
+ dnl    Checks for library functions. Please keep in alphabetical order
+ AC_CHECK_FUNCS( \
+ 	arc4random \
+@@ -4185,6 +4216,7 @@ echo "                   SELinux support: $SELINUX_MSG"
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff --git a/ldapauth.c b/ldapauth.c
+new file mode 100644
+index 0000000..133483e
+--- /dev/null
++++ b/ldapauth.c
+@@ -0,0 +1,575 @@
++/* 
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#include "includes.h"
++
++#ifdef WITH_LDAP_PUBKEY
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
++#include "ldapauth.h"
++#include "log.h"
++
++static char *attrs[] = {
++    PUBKEYATTR,
++    NULL
++};
++
++/* filter building infos */
++#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)"
++#define FILTER_OR_PREFIX "(|"
++#define FILTER_OR_SUFFIX ")"
++#define FILTER_CN_PREFIX "(cn="
++#define FILTER_CN_SUFFIX ")"
++#define FILTER_UID_FORMAT "(memberUid=%s)"
++#define FILTER_GROUP_SUFFIX ")"
++#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52)
++
++/* just filter building stuff */
++#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1)
++#define REQUEST_GROUP(buffer, prefilter, pwname) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname)
++/*
++XXX OLD group building macros
++#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46)
++#define REQUEST_GROUP(buffer,pwname,grp) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname)
++    */
++
++/*
++XXX stock upstream version without extra filter support
++#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64)
++#define REQUEST_USER(buffer, pwname) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname)
++   */
++
++#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0))
++#define REQUEST_USER(buffer, pwname, customfilter) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \
++    	"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \
++	pwname, (customfilter != NULL ? customfilter : ""))
++
++/* some portable and working tokenizer, lame though */
++static int tokenize(char ** o, size_t size, char * input) {
++    unsigned int i = 0, num;
++    const char * charset = " \t";
++    char * ptr = input;
++
++    /* leading white spaces are ignored */
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++        if (i < size-1) {
++            o[i++] = ptr;
++            ptr += num;
++            if (*ptr)
++                *ptr++ = '\0';
++        }
++    }
++    o[i] = NULL;
++    return SUCCESS;
++}
++
++void ldap_close(ldap_opt_t * ldap) {
++
++    if (!ldap)
++        return;
++
++    if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0)
++	ldap_perror(ldap->ld, "ldap_unbind()");
++
++    ldap->ld = NULL;
++    FLAG_SET_DISCONNECTED(ldap->flags);
++
++    return;
++}
++
++/* init && bind */
++int ldap_connect(ldap_opt_t * ldap) {
++    int version = LDAP_VERSION3;
++
++    if (!ldap->servers)
++        return FAILURE;
++
++    /* Connection Init and setup */
++    ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++    if (!ldap->ld) {
++        ldap_perror(ldap->ld, "ldap_init()");
++        return FAILURE;
++    }
++
++    if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)");
++        return FAILURE;
++    }
++
++    /* Timeouts setup */
++    if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)");
++    }
++    if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)");
++    }
++
++    /* TLS support */
++    if ( (ldap->tls == -1) || (ldap->tls == 1) ) {
++        if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) {
++            /* failed then reinit the initial connect */
++            ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()");
++            if (ldap->tls == 1)
++                return FAILURE;
++
++            ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++            if (!ldap->ld) { 
++                ldap_perror(ldap->ld, "ldap_init()");
++                return FAILURE;
++            }
++
++            if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++                 ldap_perror(ldap->ld, "ldap_set_option()");
++                 return FAILURE;
++            }
++        }
++    }
++
++
++    if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_simple_bind_s()");
++        return FAILURE;
++    }
++
++    /* says it is connected */
++    FLAG_SET_CONNECTED(ldap->flags);
++
++    return SUCCESS;
++}
++
++/* must free allocated ressource */
++static char * ldap_build_host(char *host, int port) {
++    unsigned int size = strlen(host)+11;
++    char * h = (char *) calloc (size, sizeof(char));
++    int rc;
++    if (!h)
++         return NULL;
++
++    rc = snprintf(h, size, "%s:%d ", host, port);
++    if (rc == -1)
++        return NULL;
++    return h;
++}
++
++static int ldap_count_group(const char * input) {
++    const char * charset = " \t";
++    const char * ptr = input;
++    unsigned int count = 0;
++    unsigned int num;
++
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++    count++;
++    ptr += num;
++    ptr++;
++    }
++
++    return count;
++}
++
++/* format filter */
++char * ldap_parse_groups(const char * groups) {
++    unsigned int buffer_size = FILTER_GROUP_SIZE(groups);
++    char * buffer = (char *) calloc(buffer_size, sizeof(char));
++    char * g = NULL;
++    char * garray[32];
++    unsigned int i = 0;
++
++    if ((!groups)||(!buffer))
++        return NULL;
++
++    g = strdup(groups);
++    if (!g) {
++        free(buffer);
++        return NULL;
++    }
++
++    /* first separate into n tokens */
++    if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) {
++        free(g);
++        free(buffer);
++        return NULL;
++    }
++
++    /* build the final filter format */
++    strlcat(buffer, FILTER_GROUP_PREFIX, buffer_size);
++    strlcat(buffer, FILTER_OR_PREFIX, buffer_size);
++    i = 0;
++    while (garray[i]) {
++        strlcat(buffer, FILTER_CN_PREFIX, buffer_size);
++        strlcat(buffer, garray[i], buffer_size);
++        strlcat(buffer, FILTER_CN_SUFFIX, buffer_size);
++        i++;
++    }
++    strlcat(buffer, FILTER_OR_SUFFIX, buffer_size);
++    strlcat(buffer, FILTER_UID_FORMAT, buffer_size);
++    strlcat(buffer, FILTER_GROUP_SUFFIX, buffer_size);
++
++    free(g);
++    return buffer;
++}
++
++/* a bit dirty but leak free  */
++char * ldap_parse_servers(const char * servers) {
++    char * s = NULL;
++    char * tmp = NULL, *urls[32];
++    unsigned int num = 0 , i = 0 , asize = 0;
++    LDAPURLDesc *urld[32];
++
++    if (!servers)
++        return NULL;
++
++    /* local copy of the arg */
++    s = strdup(servers);
++    if (!s)
++        return NULL;
++
++    /* first separate into URL tokens */
++    if ( tokenize(urls, sizeof(urls)/sizeof(*urls), s) < 0)
++        return NULL;
++
++    i = 0;
++    while (urls[i]) {
++        if (! ldap_is_ldap_url(urls[i]) ||
++           (ldap_url_parse(urls[i], &urld[i]) != 0)) {
++                return NULL;
++        }
++        i++;
++    }
++
++    /* now free(s) */
++    free (s);
++
++    /* how much memory do we need */
++    num = i;
++    for (i = 0 ; i < num ; i++)
++        asize += strlen(urld[i]->lud_host)+11;
++
++    /* alloc */
++    s = (char *) calloc( asize+1 , sizeof(char));
++    if (!s) {
++        for (i = 0 ; i < num ; i++)
++            ldap_free_urldesc(urld[i]);
++        return NULL;
++    }
++
++    /* then build the final host string */
++    for (i = 0 ; i < num ; i++) {
++        /* built host part */
++        tmp = ldap_build_host(urld[i]->lud_host, urld[i]->lud_port);
++        strncat(s, tmp, strlen(tmp));
++        ldap_free_urldesc(urld[i]);
++        free(tmp);
++    }
++
++    return s;
++}
++
++void ldap_options_print(ldap_opt_t * ldap) {
++    debug("ldap options:");
++    debug("servers: %s", ldap->servers);
++    if (ldap->u_basedn)
++        debug("user basedn: %s", ldap->u_basedn);
++    if (ldap->g_basedn)
++        debug("group basedn: %s", ldap->g_basedn);
++    if (ldap->binddn)
++        debug("binddn: %s", ldap->binddn);
++    if (ldap->bindpw)
++        debug("bindpw: %s", ldap->bindpw);
++    if (ldap->sgroup)
++        debug("group: %s", ldap->sgroup);
++    if (ldap->filter)
++        debug("filter: %s", ldap->filter);
++}
++
++void ldap_options_free(ldap_opt_t * l) {
++    if (!l)
++        return;
++    if (l->servers)
++        free(l->servers);
++    if (l->u_basedn)
++        free(l->u_basedn);
++    if (l->g_basedn)
++        free(l->g_basedn);
++    if (l->binddn)
++        free(l->binddn);
++    if (l->bindpw)
++        free(l->bindpw);
++    if (l->sgroup)
++        free(l->sgroup);
++    if (l->fgroup)
++        free(l->fgroup);
++    if (l->filter)
++        free(l->filter);
++    if (l->l_conf)
++        free(l->l_conf);
++    free(l);
++}
++
++/* free keys */
++void ldap_keys_free(ldap_key_t * k) {
++    ldap_value_free_len(k->keys);
++    free(k);
++    return;
++}
++
++ldap_key_t * ldap_getuserkey(ldap_opt_t *l, const char * user) {
++    ldap_key_t * k = (ldap_key_t *) calloc (1, sizeof(ldap_key_t));
++    LDAPMessage *res, *e;
++    char * filter;
++    int i;
++
++    if ((!k) || (!l))
++         return NULL;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED))
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return NULL;
++
++    /* build  filter for LDAP request */
++    REQUEST_USER(filter, user, l->filter);
++
++    if ( ldap_search_st( l->ld,
++        l->u_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        attrs, 0, &l->s_timeout, &res ) != LDAP_SUCCESS) {
++        
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++        free(k);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return NULL;
++    } 
++
++    /* free */
++    free(filter);
++
++    /* check if any results */
++    i = ldap_count_entries(l->ld,res);
++    if (i <= 0) {
++        ldap_msgfree(res);
++        free(k);
++        return NULL;
++    }
++
++    if (i > 1)
++        debug("[LDAP] duplicate entries, using the FIRST entry returned");
++
++    e = ldap_first_entry(l->ld, res);
++    k->keys = ldap_get_values_len(l->ld, e, PUBKEYATTR);
++    k->num = ldap_count_values_len(k->keys);
++
++    ldap_msgfree(res);
++    return k;
++}
++
++
++/* -1 if trouble
++   0 if user is NOT member of current server group
++   1 if user IS MEMBER of current server group 
++ */
++int ldap_ismember(ldap_opt_t * l, const char * user) {
++    LDAPMessage *res;
++    char * filter;
++    int i;
++
++    if ((!l->sgroup) || !(l->g_basedn))
++        return 1;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED)) 
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                 break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return FAILURE;
++
++    /* build filter for LDAP request */
++    REQUEST_GROUP(filter, l->fgroup, user);
++
++    if (ldap_search_st( l->ld, 
++        l->g_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        NULL, 0, &l->s_timeout, &res) != LDAP_SUCCESS) {
++    
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return FAILURE;
++    }
++
++    free(filter);
++
++    /* check if any results */
++    if (ldap_count_entries(l->ld, res) > 0) {
++        ldap_msgfree(res);
++        return 1;
++    }
++
++    ldap_msgfree(res);
++    return 0;
++}
++
++/*
++ * ldap.conf simple parser
++ * XXX TODO:  sanity checks
++ * must either
++ * - free the previous ldap_opt_before replacing entries
++ * - free each necessary previously parsed elements
++ * ret:
++ * -1 on FAILURE, 0 on SUCCESS
++ */
++int ldap_parse_lconf(ldap_opt_t * l) {
++    FILE * lcd; /* ldap.conf descriptor */
++    char buf[BUFSIZ];
++    char * s = NULL, * k = NULL, * v = NULL;
++    int li, len;
++
++    lcd = fopen (l->l_conf, "r");
++    if (lcd == NULL) {
++        /* debug("Cannot open %s", l->l_conf); */
++        perror("ldap_parse_lconf()");
++        return FAILURE;
++    }
++    
++    while (fgets (buf, sizeof (buf), lcd) != NULL) {
++
++        if (*buf == '\n' || *buf == '#')
++            continue;
++
++        k = buf;
++        v = k;
++        while (*v != '\0' && *v != ' ' && *v != '\t')
++            v++;
++
++        if (*v == '\0')
++            continue;
++
++        *(v++) = '\0';
++
++        while (*v == ' ' || *v == '\t')
++            v++;
++
++        li = strlen (v) - 1;
++        while (v[li] == ' ' || v[li] == '\t' || v[li] == '\n')
++            --li;
++        v[li + 1] = '\0';
++
++        if (!strcasecmp (k, "uri")) {
++            if ((l->servers = ldap_parse_servers(v)) == NULL) {
++                fatal("error in ldap servers");
++            return FAILURE;
++            }
++
++        }
++        else if (!strcasecmp (k, "base")) { 
++            s = strchr (v, '?');
++            if (s != NULL) {
++                len = s - v;
++                l->u_basedn = malloc (len + 1);
++                strncpy (l->u_basedn, v, len);
++                l->u_basedn[len] = '\0';
++            } else {
++                l->u_basedn = strdup (v);
++            }
++        }
++        else if (!strcasecmp (k, "binddn")) {
++            l->binddn = strdup (v);
++        }
++        else if (!strcasecmp (k, "bindpw")) {
++            l->bindpw = strdup (v);
++        }
++        else if (!strcasecmp (k, "timelimit")) {
++            l->s_timeout.tv_sec = atoi (v);
++                }
++        else if (!strcasecmp (k, "bind_timelimit")) {
++            l->b_timeout.tv_sec = atoi (v);
++        }
++        else if (!strcasecmp (k, "ssl")) {
++            if (!strcasecmp (v, "start_tls"))
++                l->tls = 1;
++        }
++    }
++
++    fclose (lcd);
++    return SUCCESS;
++}
++
++#endif /* WITH_LDAP_PUBKEY */
+diff --git a/ldapauth.h b/ldapauth.h
+new file mode 100644
+index 0000000..ba70958
+--- /dev/null
++++ b/ldapauth.h
+@@ -0,0 +1,124 @@
++/*
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ 
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#ifndef LDAPAUTH_H
++#define LDAPAUTH_H
++
++#define LDAP_DEPRECATED 1
++
++#include <string.h>
++#include <time.h>
++#include <ldap.h>
++#include <lber.h>
++
++/* tokens in use for config */
++#define _DEFAULT_LPK_TOKEN "UseLPK"
++#define _DEFAULT_SRV_TOKEN "LpkServers"
++#define _DEFAULT_USR_TOKEN "LpkUserDN"
++#define _DEFAULT_GRP_TOKEN "LpkGroupDN"
++#define _DEFAULT_BDN_TOKEN "LpkBindDN"
++#define _DEFAULT_BPW_TOKEN "LpkBindPw"
++#define _DEFAULT_MYG_TOKEN "LpkServerGroup"
++#define _DEFAULT_FIL_TOKEN "LpkFilter"
++#define _DEFAULT_TLS_TOKEN "LpkForceTLS"
++#define _DEFAULT_BTI_TOKEN "LpkBindTimelimit"
++#define _DEFAULT_STI_TOKEN "LpkSearchTimelimit"
++#define _DEFAULT_LDP_TOKEN "LpkLdapConf"
++
++/* default options */
++#define _DEFAULT_LPK_ON 0
++#define _DEFAULT_LPK_SERVERS NULL
++#define _DEFAULT_LPK_UDN NULL
++#define _DEFAULT_LPK_GDN NULL
++#define _DEFAULT_LPK_BINDDN NULL
++#define _DEFAULT_LPK_BINDPW NULL
++#define _DEFAULT_LPK_SGROUP NULL
++#define _DEFAULT_LPK_FILTER NULL
++#define _DEFAULT_LPK_TLS -1
++#define _DEFAULT_LPK_BTIMEOUT 10
++#define _DEFAULT_LPK_STIMEOUT 10
++#define _DEFAULT_LPK_LDP NULL
++
++/* flags */
++#define FLAG_EMPTY	    0x00000000
++#define FLAG_CONNECTED	    0x00000001
++
++/* flag macros */
++#define FLAG_SET_EMPTY(x)		x&=(FLAG_EMPTY)
++#define FLAG_SET_CONNECTED(x)		x|=(FLAG_CONNECTED)
++#define FLAG_SET_DISCONNECTED(x)	x&=~(FLAG_CONNECTED)
++
++/* defines */
++#define FAILURE -1
++#define SUCCESS 0
++#define PUBKEYATTR "sshPublicKey"
++
++/* 
++ *
++ * defined files path 
++ * (should be relocated to pathnames.h,
++ * if one day it's included within the tree) 
++ *
++ */
++#define _PATH_LDAP_CONFIG_FILE "/etc/ldap.conf"
++
++/* structures */
++typedef struct ldap_options {
++    int on;			/* Use it or NOT */
++    LDAP * ld;			/* LDAP file desc */
++    char * servers;		/* parsed servers for ldaplib failover handling */
++    char * u_basedn;		/* user basedn */
++    char * g_basedn;		/* group basedn */
++    char * binddn;		/* binddn */
++    char * bindpw;		/* bind password */
++    char * sgroup;		/* server group */
++    char * fgroup;		/* group filter */
++    char * filter;		/* additional filter */
++    char * l_conf;		/* use ldap.conf */
++    int tls;			/* TLS only */
++    struct timeval b_timeout;   /* bind timeout */
++    struct timeval s_timeout;   /* search timeout */
++    unsigned int flags;		/* misc flags (reconnection, future use?) */
++} ldap_opt_t;
++
++typedef struct ldap_keys {
++    struct berval ** keys;	/* the public keys retrieved */
++    unsigned int num;		/* number of keys */
++} ldap_key_t;
++
++
++/* function headers */
++void ldap_close(ldap_opt_t *);
++int ldap_connect(ldap_opt_t *);
++char * ldap_parse_groups(const char *);
++char * ldap_parse_servers(const char *);
++void ldap_options_print(ldap_opt_t *);
++void ldap_options_free(ldap_opt_t *);
++void ldap_keys_free(ldap_key_t *);
++int ldap_parse_lconf(ldap_opt_t *);
++ldap_key_t * ldap_getuserkey(ldap_opt_t *, const char *);
++int ldap_ismember(ldap_opt_t *, const char *);
++
++#endif
+diff --git a/lpk-user-example.txt b/lpk-user-example.txt
+new file mode 100644
+index 0000000..1528fc0
+--- /dev/null
++++ b/lpk-user-example.txt
+@@ -0,0 +1,117 @@
++
++Post to ML -> User Made Quick Install Doc.
++Contribution from John Lane <john at lane.uk.net>
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++
++OpenSSH LDAP keystore Patch
++===========================
++
++NOTE: these notes are a transcript of a specific installation
++      they work for me, your specifics may be different!
++      from John Lane March 17th 2005         john at lane.uk.net
++
++This is a patch to OpenSSH 4.0p1 to allow it to obtain users' public keys
++from their LDAP record as an alternative to ~/.ssh/authorized_keys.
++
++(Assuming here that necessary build stuff is in $BUILD)
++
++cd $BUILD/openssh-4.0p1
++patch -Np1 -i $BUILD/openssh-lpk-4.0p1-0.3.patch
++mkdir -p /var/empty &&
++./configure --prefix=/usr --sysconfdir=/etc/ssh \
++    --libexecdir=/usr/sbin --with-md5-passwords --with-pam \
++    --with-libs="-lldap" --with-cppflags="-DWITH_LDAP_PUBKEY"
++Now do.
++make &&
++make install
++
++Add the following config to /etc/ssh/ssh_config
++UseLPK yes
++LpkServers ldap://myhost.mydomain.com
++LpkUserDN  ou=People,dc=mydomain,dc=com
++
++We need to tell sshd about the SSL keys during boot, as root's
++environment does not exist at that time. Edit /etc/rc.d/init.d/sshd.
++Change the startup code from this:
++                echo "Starting SSH Server..."
++                loadproc /usr/sbin/sshd
++                ;;
++to this:
++                echo "Starting SSH Server..."
++                LDAPRC="/root/.ldaprc" loadproc /usr/sbin/sshd
++                ;;
++
++Re-start the sshd daemon:
++/etc/rc.d/init.d/sshd restart
++
++Install the additional LDAP schema
++cp $BUILD/openssh-lpk-0.2.schema  /etc/openldap/schema/openssh.schema
++
++Now add the openSSH LDAP schema to /etc/openldap/slapd.conf:
++Add the following to the end of the existing block of schema includes
++include         /etc/openldap/schema/openssh.schema
++
++Re-start the LDAP server:
++/etc/rc.d/init.d/slapd restart
++
++To add one or more public keys to a user, eg "testuser" :
++ldapsearch -x -W -Z -LLL -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com" > /tmp/testuser
++
++append the following to this /tmp/testuser file
++objectclass: ldapPublicKey
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KS
++qIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z8XwSsuAoR1t86t+5dlI
++7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++Then do a modify:
++ldapmodify -x -D "uid=testuser,ou=People,dc=mydomain,dc=com" -W -f
++/tmp/testuser -Z
++Enter LDAP Password:
++modifying entry "uid=testuser,ou=People,dc=mydomain,dc=com"
++And check the modify is ok:
++ldapsearch -x -W -Z -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com"
++Enter LDAP Password:
++# extended LDIF
++#
++# LDAPv3
++# base <uid=testuser,ou=People,dc=mydomain,dc=com> with scope sub
++# filter: (objectclass=*)
++# requesting: ALL
++#
++
++# testuser, People, mydomain.com
++dn: uid=testuser,ou=People,dc=mydomain,dc=com
++uid: testuser
++cn: testuser
++objectClass: account
++objectClass: posixAccount
++objectClass: top
++objectClass: shadowAccount
++objectClass: ldapPublicKey
++shadowLastChange: 12757
++shadowMax: 99999
++shadowWarning: 7
++loginShell: /bin/bash
++uidNumber: 9999
++gidNumber: 501
++homeDirectory: /home/testuser
++userPassword:: e1NTSEF9UDgwV1hnM1VjUDRJK0k1YnFiL1d4ZUJObXlZZ3Z3UTU=
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KSqIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z
++8XwSsuAoR1t86t+5dlI7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++# search result
++search: 3
++result: 0 Success
++
++# numResponses: 2
++# numEntries: 1
++
++Now start a ssh session to user "testuser" from usual ssh client (e.g.
++puTTY). Login should succeed.
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+diff --git a/openssh-lpk_openldap.schema b/openssh-lpk_openldap.schema
+new file mode 100644
+index 0000000..5f5512a
+--- /dev/null
++++ b/openssh-lpk_openldap.schema
+@@ -0,0 +1,19 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Based on the proposal of : Mark Ruijter
++#
++
++
++# octetString SYNTAX
++attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff --git a/openssh-lpk_sun.schema b/openssh-lpk_sun.schema
+new file mode 100644
+index 0000000..c5e0214
+--- /dev/null
++++ b/openssh-lpk_sun.schema
+@@ -0,0 +1,21 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Schema for Sun Directory Server.
++# Based on the original schema, modified by Stefan Fischer.
++#
++
++dn: cn=schema
++
++# octetString SYNTAX
++attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff --git a/servconf.c b/servconf.c
+index f9e2f2d..078b581 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -42,6 +42,10 @@
+ #include "channels.h"
+ #include "groupaccess.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ static void add_listen_addr(ServerOptions *, char *, int);
+ static void add_one_listen_addr(ServerOptions *, char *, int);
+ 
+@@ -131,6 +135,24 @@ initialize_server_options(ServerOptions *options)
+ 	options->zero_knowledge_password_authentication = -1;
+ 	options->revoked_keys_file = NULL;
+ 	options->trusted_user_ca_keys = NULL;
++#ifdef WITH_LDAP_PUBKEY
++	/* XXX dirty */
++	options->lpk.ld = NULL;
++	options->lpk.on = -1;
++	options->lpk.servers = NULL;
++	options->lpk.u_basedn = NULL;
++	options->lpk.g_basedn = NULL;
++	options->lpk.binddn = NULL;
++	options->lpk.bindpw = NULL;
++	options->lpk.sgroup = NULL;
++	options->lpk.filter = NULL;
++	options->lpk.fgroup = NULL;
++	options->lpk.l_conf = NULL;
++	options->lpk.tls = -1;
++	options->lpk.b_timeout.tv_sec = -1;
++	options->lpk.s_timeout.tv_sec = -1;
++	options->lpk.flags = FLAG_EMPTY;
++#endif
+ }
+ 
+ void
+@@ -265,6 +287,32 @@ fill_default_server_options(ServerOptions *options)
+ 		options->permit_tun = SSH_TUNMODE_NO;
+ 	if (options->zero_knowledge_password_authentication == -1)
+ 		options->zero_knowledge_password_authentication = 0;
++#ifdef WITH_LDAP_PUBKEY
++	if (options->lpk.on == -1)
++	    options->lpk.on = _DEFAULT_LPK_ON;
++	if (options->lpk.servers == NULL)
++	    options->lpk.servers = _DEFAULT_LPK_SERVERS;
++	if (options->lpk.u_basedn == NULL)
++	    options->lpk.u_basedn = _DEFAULT_LPK_UDN;
++	if (options->lpk.g_basedn == NULL)
++	    options->lpk.g_basedn = _DEFAULT_LPK_GDN;
++	if (options->lpk.binddn == NULL)
++	    options->lpk.binddn = _DEFAULT_LPK_BINDDN;
++	if (options->lpk.bindpw == NULL)
++	    options->lpk.bindpw = _DEFAULT_LPK_BINDPW;
++	if (options->lpk.sgroup == NULL)
++	    options->lpk.sgroup = _DEFAULT_LPK_SGROUP;
++	if (options->lpk.filter == NULL)
++	    options->lpk.filter = _DEFAULT_LPK_FILTER;
++	if (options->lpk.tls == -1)
++	    options->lpk.tls = _DEFAULT_LPK_TLS;
++	if (options->lpk.b_timeout.tv_sec == -1)
++	    options->lpk.b_timeout.tv_sec = _DEFAULT_LPK_BTIMEOUT;
++	if (options->lpk.s_timeout.tv_sec == -1)
++	    options->lpk.s_timeout.tv_sec = _DEFAULT_LPK_STIMEOUT;
++	if (options->lpk.l_conf == NULL)
++	    options->lpk.l_conf = _DEFAULT_LPK_LDP;
++#endif
+ 
+ 	/* Turn privilege separation on by default */
+ 	if (use_privsep == -1)
+@@ -312,6 +360,12 @@ typedef enum {
+ 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
+ 	sRevokedKeys, sTrustedUserCAKeys,
+ 	sDeprecated, sUnsupported
++#ifdef WITH_LDAP_PUBKEY
++	,sLdapPublickey, sLdapServers, sLdapUserDN
++	,sLdapGroupDN, sBindDN, sBindPw, sMyGroup
++	,sLdapFilter, sForceTLS, sBindTimeout
++	,sSearchTimeout, sLdapConf
++#endif
+ } ServerOpCodes;
+ 
+ #define SSHCFG_GLOBAL	0x01	/* allowed in main section of sshd_config */
+@@ -432,6 +486,20 @@ static struct {
+ 	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
+ 	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
+ 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
++#ifdef WITH_LDAP_PUBKEY
++	{ _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
++	{ _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
++	{ _DEFAULT_USR_TOKEN, sLdapUserDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_GRP_TOKEN, sLdapGroupDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_BDN_TOKEN, sBindDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_BPW_TOKEN, sBindPw, SSHCFG_GLOBAL },
++	{ _DEFAULT_MYG_TOKEN, sMyGroup, SSHCFG_GLOBAL },
++	{ _DEFAULT_FIL_TOKEN, sLdapFilter, SSHCFG_GLOBAL },
++	{ _DEFAULT_TLS_TOKEN, sForceTLS, SSHCFG_GLOBAL },
++	{ _DEFAULT_BTI_TOKEN, sBindTimeout, SSHCFG_GLOBAL },
++	{ _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL },
++	{ _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL },
++#endif
+ 	{ NULL, sBadOption, 0 }
+ };
+ 
+@@ -1349,6 +1417,107 @@ process_server_config_line(ServerOptions *options, char *line,
+ 		while (arg)
+ 		    arg = strdelim(&cp);
+ 		break;
++#ifdef WITH_LDAP_PUBKEY
++	case sLdapPublickey:
++		intptr = &options->lpk.on;
++		goto parse_flag;
++	case sLdapServers:
++		/* arg = strdelim(&cp); */
++		p = line;
++		while(*p++);
++		arg = p;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		if ((options->lpk.servers = ldap_parse_servers(arg)) == NULL)
++		    fatal("%s line %d: error in ldap servers", filename, linenum);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapUserDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.u_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapGroupDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.g_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing binddn",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.binddn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindPw:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing bindpw",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.bindpw = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sMyGroup:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing groupname",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.sgroup = xstrdup(arg);
++		if (options->lpk.sgroup)
++		    options->lpk.fgroup = ldap_parse_groups(options->lpk.sgroup);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapFilter:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing filter",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.filter = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sForceTLS:
++		intptr = &options->lpk.tls;
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing yes/no argument.",
++			    filename, linenum);
++		value = 0;	/* silence compiler */
++		if (strcmp(arg, "yes") == 0)
++			value = 1;
++		else if (strcmp(arg, "no") == 0)
++			value = 0;
++		else if (strcmp(arg, "try") == 0)
++			value = -1;
++		else
++			fatal("%s line %d: Bad yes/no argument: %s",
++				filename, linenum, arg);
++		if (*intptr == -1)
++			*intptr = value;
++		break;
++	case sBindTimeout:
++		intptr = (int *) &options->lpk.b_timeout.tv_sec;
++		goto parse_int;
++	case sSearchTimeout:
++		intptr = (int *) &options->lpk.s_timeout.tv_sec;
++		goto parse_int;
++		break;
++	case sLdapConf:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing LpkLdapConf", filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.l_conf = xstrdup(arg);
++		memset(arg, 0, strlen(arg));
++		break;
++#endif
+ 
+ 	default:
+ 		fatal("%s line %d: Missing handler for opcode %s (%d)",
+diff --git a/servconf.h b/servconf.h
+index 860009f..fd113c2 100644
+--- a/servconf.h
++++ b/servconf.h
+@@ -16,6 +16,10 @@
+ #ifndef SERVCONF_H
+ #define SERVCONF_H
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #define MAX_PORTS		256	/* Max # ports. */
+ 
+ #define MAX_ALLOW_USERS		256	/* Max # users on allow list. */
+@@ -150,6 +154,9 @@ typedef struct {
+ 	int	use_pam;		/* Enable auth via PAM */
+ 
+ 	int	permit_tun;
++#ifdef WITH_LDAP_PUBKEY
++        ldap_opt_t lpk;
++#endif
+ 
+ 	int	num_permitted_opens;
+ 
+diff --git a/sshd.c b/sshd.c
+index bc0d275..e82e102 100644
+--- a/sshd.c
++++ b/sshd.c
+@@ -127,6 +127,10 @@ int allow_severity;
+ int deny_severity;
+ #endif /* LIBWRAP */
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #ifndef O_NOCTTY
+ #define O_NOCTTY	0
+ #endif
+@@ -1530,6 +1534,16 @@ main(int ac, char **av)
+ 		exit(1);
+ 	}
+ 
++#ifdef WITH_LDAP_PUBKEY
++    /* ldap_options_print(&options.lpk); */
++    /* XXX initialize/check ldap connection and set *LD */
++    if (options.lpk.on) {
++        if (options.lpk.l_conf && (ldap_parse_lconf(&options.lpk) < 0) )
++            error("[LDAP] could not parse %s", options.lpk.l_conf);
++        if (ldap_connect(&options.lpk) < 0)
++            error("[LDAP] could not initialize ldap connection");
++    }
++#endif
+ 	debug("sshd version %.100s", SSH_RELEASE);
+ 
+ 	/* Store privilege separation user for later use if required. */
+diff --git a/sshd_config b/sshd_config
+index 72fbae3..381b390 100644
+--- a/sshd_config
++++ b/sshd_config
+@@ -107,6 +107,21 @@
+ # no default banner path
+ #Banner none
+ 
++# here are the new patched ldap related tokens
++# entries in your LDAP must have posixAccount & ldapPublicKey objectclass
++#UseLPK yes
++#LpkLdapConf /etc/ldap.conf
++#LpkServers  ldap://10.1.7.1/ ldap://10.1.7.2/
++#LpkUserDN   ou=users,dc=phear,dc=org
++#LpkGroupDN  ou=groups,dc=phear,dc=org
++#LpkBindDN cn=Manager,dc=phear,dc=org
++#LpkBindPw secret
++#LpkServerGroup mail
++#LpkFilter (hostAccess=master.phear.org)
++#LpkForceTLS no
++#LpkSearchTimelimit 3
++#LpkBindTimelimit 3
++
+ # override default of no subsystems
+ Subsystem	sftp	/usr/libexec/sftp-server
+ 
+diff --git a/sshd_config.5 b/sshd_config.5
+index 2f54102..cb86374 100644
+--- a/sshd_config.5
++++ b/sshd_config.5
+@@ -1043,6 +1043,62 @@ Specifies the full pathname of the
+ program.
+ The default is
+ .Pa /usr/X11R6/bin/xauth .
++.It Cm UseLPK
++Specifies whether LDAP public key retrieval must be used or not. It allow
++an easy centralisation of public keys within an LDAP directory. The argument must be
++.Dq yes
++or
++.Dq no .
++.It Cm LpkLdapConf
++Specifies whether LDAP Public keys should parse the specified ldap.conf file
++instead of sshd_config Tokens. The argument must be a valid path to an ldap.conf
++file like
++.Pa /etc/ldap.conf
++.It Cm LpkServers
++Specifies LDAP one or more [:space:] separated server's url the following form may be used:
++.Pp
++LpkServers ldaps://127.0.0.1 ldap://127.0.0.2 ldap://127.0.0.3
++.It Cm LpkUserDN
++Specifies the LDAP user DN.
++.Pp
++LpkUserDN ou=users,dc=phear,dc=org
++.It Cm LpkGroupDN
++Specifies the LDAP groups DN.
++.Pp
++LpkGroupDN ou=groups,dc=phear,dc=org
++.It Cm LpkBindDN
++Specifies the LDAP bind DN to use if necessary.
++.Pp
++LpkBindDN cn=Manager,dc=phear,dc=org
++.It Cm LpkBindPw
++Specifies the LDAP bind credential. 
++.Pp
++LpkBindPw secret
++.It Cm LpkServerGroup
++Specifies one or more [:space:] separated group the server is part of. 
++.Pp
++LpkServerGroup unix mail prod
++.It Cm LpkFilter
++Specifies an additional LDAP filter to use for finding SSH keys
++.Pp
++LpkFilter (hostAccess=master.phear.org)
++.It Cm LpkForceTLS
++Specifies if the LDAP server connection must be tried, forced or not used. The argument must be 
++.Dq yes
++or
++.Dq no
++or
++.Dq try .
++.It Cm LpkSearchTimelimit
++Sepcifies the search time limit before the search is considered over. value is
++in seconds.
++.Pp
++LpkSearchTimelimit 3
++.It Cm LpkBindTimelimit
++Sepcifies the bind time limit before the connection is considered dead. value is
++in seconds.
++.Pp
++LpkBindTimelimit 3
+ .El
+ .Sh TIME FORMATS
+ .Xr sshd 8
+-- 
+1.7.0
+

Deleted: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch	2010-09-16 12:47:48 UTC (rev 10974)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch	2010-09-16 13:08:28 UTC (rev 10975)
@@ -1,1884 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/Makefile.in openssh-5.2p1+lpk/Makefile.in
---- openssh-5.2p1.orig/Makefile.in	2008-11-05 06:20:46.000000000 +0100
-+++ openssh-5.2p1+lpk/Makefile.in	2009-03-22 15:59:08.607515800 +0100
-@@ -86,7 +86,7 @@
- 	auth-krb5.o \
- 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
- 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
--	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
-+	audit.o audit-bsm.o platform.o ldapauth.o sftp-server.o sftp-common.o
- 
- MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
- MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/README.lpk openssh-5.2p1+lpk/README.lpk
---- openssh-5.2p1.orig/README.lpk	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.2p1+lpk/README.lpk	2009-03-22 15:59:08.672813997 +0100
-@@ -0,0 +1,267 @@
-+OpenSSH LDAP PUBLIC KEY PATCH 
-+Copyright (c) 2003 Eric AUGE (eau at phear.org)
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products
-+   derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+purposes of this patch:
-+
-+This patch would help to have authentication centralization policy
-+using ssh public key authentication.
-+This patch could be an alternative to other "secure" authentication system
-+working in a similar way (Kerberos, SecurID, etc...), except the fact 
-+that it's based on OpenSSH and its public key abilities.
-+
-+>> FYI: <<
-+'uid': means unix accounts existing on the current server
-+'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config)
-+
-+example schema:
-+
-+
-+                                  server1 (uid: eau,rival,toto) (lpkServerGroup: unix)
-+                ___________      /
-+               /           \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix)
-+              | LDAP Server |    \
-+	      | eau  ,rival |     server2 (uid: rival, eau) (lpkServerGroup: unix)
-+	      | titi ,toto  |
-+	      | userx,....  |         server5 (uid: eau)  (lpkServerGroup: mail)
-+               \___________/ \       /
-+	                       ----- - server4 (uid: eau, rival)  (no group configured)
-+			             \
-+				        etc...
-+
-+- WHAT WE NEED :
-+
-+  * configured LDAP server somewhere on the network (i.e. OpenLDAP)
-+  * patched sshd (with this patch ;)
-+  * LDAP user(/group) entry (look at users.ldif (& groups.ldif)):
-+        User entry:
-+	- attached to the 'ldapPublicKey' objectclass
-+	- attached to the 'posixAccount' objectclass
-+	- with a filled 'sshPublicKey' attribute 
-+	Example:
-+		dn: uid=eau,ou=users,dc=cuckoos,dc=net
-+		objectclass: top
-+		objectclass: person
-+		objectclass: organizationalPerson
-+		objectclass: posixAccount
-+		objectclass: ldapPublicKey
-+		description: Eric AUGE Account
-+		userPassword: blah
-+		cn: Eric AUGE
-+		sn: Eric AUGE
-+		uid: eau
-+		uidNumber: 1034
-+		gidNumber: 1
-+		homeDirectory: /export/home/eau
-+		sshPublicKey: ssh-dss AAAAB3...
-+		sshPublicKey: ssh-dss AAAAM5...
-+
-+	Group entry:
-+	- attached to the 'posixGroup' objectclass
-+	- with a 'cn' groupname attribute
-+	- with multiple 'memberUid' attributes filled with usernames allowed in this group
-+	Example:
-+		# few members
-+		dn: cn=unix,ou=groups,dc=cuckoos,dc=net
-+		objectclass: top
-+		objectclass: posixGroup
-+		description: Unix based servers group
-+		cn: unix
-+		gidNumber: 1002
-+		memberUid: eau
-+		memberUid: user1
-+		memberUid: user2
-+
-+
-+- HOW IT WORKS :
-+
-+  * without patch
-+  If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..)
-+  and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled).
-+
-+  * with the patch
-+  If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled.
-+  It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. 
-+  (usually in $HOME/.ssh/authorized_keys)
-+
-+  If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into.
-+  If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled).
-+
-+  7 tokens are added to sshd_config :
-+  # here is the new patched ldap related tokens
-+  # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup
-+  UseLPK yes								# look the pub key into LDAP
-+  LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3	# which LDAP server for users ? (URL format)
-+  LpkUserDN  ou=users,dc=foobar,dc=net					# which base DN for users ?
-+  LpkGroupDN ou=groups,dc=foobar,dc=net					# which base DN for groups ? 
-+  LpkBindDN cn=manager,dc=foobar,dc=net					# which bind DN ?
-+  LpkBindPw asecret							# bind DN credidentials
-+  LpkServerGroup agroupname						# the group the server is part of
-+
-+  Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some
-+  flaws you have to take care of.
-+
-+- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY
-+
-+  * my way (there is plenty :)
-+  - create ldif file (i.e. users.ldif)
-+  - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub
-+  - my way in 4 steps :
-+  Example:
-+
-+  # you add this to the user entry in the LDIF file :
-+  [...]
-+  objectclass: posixAccount
-+  objectclass: ldapPublicKey
-+  [...]
-+  sshPubliKey: ssh-dss AAAABDh12DDUR2...
-+  [...]
-+
-+  # insert your entry and you're done :)
-+  ldapadd -D balblabla -w bleh < file.ldif 
-+  
-+  all standard options can be present in the 'sshPublicKey' attribute.
-+
-+- WHY :
-+
-+  Simply because, i was looking for a way to centralize all sysadmins authentication, easily,  without completely using LDAP 
-+  as authentication method (like pam_ldap etc..).  
-+  
-+  After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get 
-+  public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser'
-+  objectclass within LDAP and part of the group the SSH server is in). 
-+
-+  Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase 
-+  so each user can change it as much as he wants). 
-+
-+  Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only).
-+
-+- RULES :  
-+  Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. 
-+  and the additionnal lpk.schema.
-+
-+  This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication 
-+  (pamldap, nss_ldap, etc..).
-+
-+  This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..).
-+  
-+  Referring to schema at the beginning of this file if user 'eau' is only in group 'unix'
-+  'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'.
-+  If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able
-+  to log in 'server5' (i hope you got the idea, my english is bad :).
-+
-+  Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP
-+  server.
-+  When you want to allow a new user to have access to the server parc, you just add him an account on 
-+  your servers, you add his public key into his entry on the LDAP server, it's done. 
-+
-+  Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys).
-+
-+  When the user needs to change his passphrase he can do it directly from his workstation by changing 
-+  his own key set lock passphrase, and all servers are automatically aware.
-+ 
-+  With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself
-+  so he can add/modify/delete himself his public key when needed.
-+
-+\xAD FLAWS :
-+  LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP 
-+  allow write to users dn, somebody could replace someuser's public key by its own and impersonate some 
-+  of your users in all your server farm be VERY CAREFUL.
-+  
-+  MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login 
-+  as the impersonnated user.
-+
-+  If LDAP server is down then, fallback on passwd auth.
-+  
-+  the ldap code part has not been well audited yet.
-+
-+- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif)
-+    --- CUT HERE ---
-+    dn: uid=jdoe,ou=users,dc=foobar,dc=net
-+    objectclass: top
-+    objectclass: person
-+    objectclass: organizationalPerson
-+    objectclass: posixAccount
-+    objectclass: ldapPublicKey
-+    description: My account
-+    cn: John Doe
-+    sn: John Doe
-+    uid: jdoe
-+    uidNumber: 100
-+    gidNumber: 100
-+    homeDirectory: /home/jdoe
-+    sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB....
-+    [...]
-+    --- CUT HERE ---
-+
-+- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif)
-+    --- CUT HERE ---
-+    dn: cn=unix,ou=groups,dc=cuckoos,dc=net
-+    objectclass: top
-+    objectclass: posixGroup
-+    description: Unix based servers group
-+    cn: unix
-+    gidNumber: 1002
-+    memberUid: jdoe
-+    memberUid: user1
-+    memberUid: user2
-+    [...]
-+    --- CUT HERE ---
-+
-+>> FYI: << 
-+Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry
-+
-+- COMPILING:
-+  1. Apply the patch
-+  2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes
-+  3. make
-+  4. it's done.
-+
-+- BLA :
-+  I hope this could help, and i hope to be clear enough,, or give ideas.  questions/comments/improvements are welcome.
-+  
-+- TODO :
-+  Redesign differently.
-+
-+- DOCS/LINK :
-+  http://pacsec.jp/core05/psj05-barisani-en.pdf
-+  http://fritz.potsdam.edu/projects/openssh-lpk/
-+  http://fritz.potsdam.edu/projects/sshgate/
-+  http://dev.inversepath.com/trac/openssh-lpk
-+  http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm )
-+
-+- CONTRIBUTORS/IDEAS/GREETS :
-+  - Falk Siemonsmeier.
-+  - Jacob Rief.
-+  - Michael Durchgraf.
-+  - frederic peters.
-+  - Finlay dobbie.
-+  - Stefan Fisher.
-+  - Robin H. Johnson.
-+  - Adrian Bridgett.
-+
-+- CONTACT :
-+  - Eric AUGE <eau at phear.org>
-+  - Andrea Barisani <andrea at inversepath.com>
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth-rsa.c openssh-5.2p1+lpk/auth-rsa.c
---- openssh-5.2p1.orig/auth-rsa.c	2008-07-02 14:37:30.000000000 +0200
-+++ openssh-5.2p1+lpk/auth-rsa.c	2009-03-22 15:59:08.132715250 +0100
-@@ -174,10 +174,96 @@
- 	FILE *f;
- 	u_long linenum = 0;
- 	Key *key;
-+#ifdef WITH_LDAP_PUBKEY
-+	ldap_key_t * k;
-+	unsigned int i = 0;
-+#endif
- 
- 	/* Temporarily use the user's uid. */
- 	temporarily_use_uid(pw);
- 
-+#ifdef WITH_LDAP_PUBKEY
-+	/* here is the job */
-+	key = key_new(KEY_RSA1);
-+
-+	if (options.lpk.on) {
-+	    debug("[LDAP] trying LDAP first uid=%s", pw->pw_name);
-+	    if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) {
-+		if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
-+		    for (i = 0 ; i < k->num ; i++) {
-+			char *cp, *options = NULL;
-+
-+			for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
-+			    ;
-+			if (!*cp || *cp == '\n' || *cp == '#')
-+			    continue;
-+
-+			/*
-+			* Check if there are options for this key, and if so,
-+			* save their starting address and skip the option part
-+			* for now.  If there are no options, set the starting
-+			* address to NULL.
-+			 */
-+			if (*cp < '0' || *cp > '9') {
-+			    int quoted = 0;
-+			    options = cp;
-+			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
-+				if (*cp == '\\' && cp[1] == '"')
-+				    cp++;	/* Skip both */
-+				else if (*cp == '"')
-+				    quoted = !quoted;
-+			    }
-+			} else
-+			    options = NULL;
-+
-+			/* Parse the key from the line. */
-+			if (hostfile_read_key(&cp, &bits, key) == 0) {
-+			    debug("[LDAP] line %d: non ssh1 key syntax", i);
-+			    continue;
-+			}
-+			/* cp now points to the comment part. */
-+
-+			/* Check if the we have found the desired key (identified by its modulus). */
-+			if (BN_cmp(key->rsa->n, client_n) != 0)
-+			    continue;
-+
-+			/* check the real bits  */
-+			if (bits != (unsigned int)BN_num_bits(key->rsa->n))
-+			    logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: "
-+				    "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits);
-+
-+			/* We have found the desired key. */
-+			/*
-+			* If our options do not allow this key to be used,
-+			* do not send challenge.
-+			 */
-+			if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i))
-+			    continue;
-+
-+			/* break out, this key is allowed */
-+			allowed = 1;
-+
-+			/* add the return stuff etc... */
-+			/* Restore the privileged uid. */
-+			restore_uid();
-+
-+			/* return key if allowed */
-+			if (allowed && rkey != NULL)
-+			    *rkey = key;
-+			else
-+			    key_free(key);
-+
-+			ldap_keys_free(k);
-+			return (allowed);
-+		    }
-+		} else {
-+		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
-+		}
-+	    } else {
-+		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
-+	    }
-+	}
-+#endif
- 	/* The authorized keys. */
- 	file = authorized_keys_file(pw);
- 	debug("trying public RSA key file %s", file);
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth2-pubkey.c openssh-5.2p1+lpk/auth2-pubkey.c
---- openssh-5.2p1.orig/auth2-pubkey.c	2008-07-04 04:54:25.000000000 +0200
-+++ openssh-5.2p1+lpk/auth2-pubkey.c	2009-03-22 15:59:08.102307504 +0100
-@@ -55,6 +55,10 @@
- #include "monitor_wrap.h"
- #include "misc.h"
- 
-+#ifdef WITH_LDAP_PUBKEY
-+#include "ldapauth.h"
-+#endif
-+
- /* import */
- extern ServerOptions options;
- extern u_char *session_id2;
-@@ -187,10 +191,79 @@
- 	u_long linenum = 0;
- 	Key *found;
- 	char *fp;
-+#ifdef WITH_LDAP_PUBKEY
-+	ldap_key_t * k;
-+	unsigned int i = 0;
-+#endif
- 
- 	/* Temporarily use the user's uid. */
- 	temporarily_use_uid(pw);
- 
-+#ifdef WITH_LDAP_PUBKEY
-+ 	found_key = 0;
-+ 	/* allocate a new key type */
-+ 	found = key_new(key->type);
-+ 
-+ 	/* first check if the options is enabled, then try.. */
-+	if (options.lpk.on) {
-+	    debug("[LDAP] trying LDAP first uid=%s",pw->pw_name);
-+	    if (ldap_ismember(&options.lpk, pw->pw_name) > 0) {
-+		if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
-+		    /* Skip leading whitespace, empty and comment lines. */
-+		    for (i = 0 ; i < k->num ; i++) {
-+			/* dont forget if multiple keys to reset options */
-+			char *cp, *options = NULL;
-+
-+			for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
-+			    ;
-+			if (!*cp || *cp == '\n' || *cp == '#')
-+			    continue;
-+
-+			if (key_read(found, &cp) != 1) {
-+			    /* no key?  check if there are options for this key */
-+			    int quoted = 0;
-+			    debug2("[LDAP] user_key_allowed: check options: '%s'", cp);
-+			    options = cp;
-+			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
-+				if (*cp == '\\' && cp[1] == '"')
-+				    cp++;	/* Skip both */
-+				else if (*cp == '"')
-+				    quoted = !quoted;
-+			    }
-+			    /* Skip remaining whitespace. */
-+			    for (; *cp == ' ' || *cp == '\t'; cp++)
-+				;
-+			    if (key_read(found, &cp) != 1) {
-+				debug2("[LDAP] user_key_allowed: advance: '%s'", cp);
-+				/* still no key?  advance to next line*/
-+				continue;
-+			    }
-+			}
-+
-+			if (key_equal(found, key) &&
-+				auth_parse_options(pw, options, file, linenum) == 1) {
-+			    found_key = 1;
-+			    debug("[LDAP] matching key found");
-+			    fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
-+			    verbose("[LDAP] Found matching %s key: %s", key_type(found), fp);
-+
-+			    /* restoring memory */
-+			    ldap_keys_free(k);
-+			    xfree(fp);
-+			    restore_uid();
-+			    key_free(found);
-+			    return found_key;
-+			    break;
-+			}
-+		    }/* end of LDAP for() */
-+		} else {
-+		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
-+		}
-+	    } else {
-+		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
-+	    }
-+	}
-+#endif
- 	debug("trying public key file %s", file);
- 	f = auth_openkeyfile(file, pw, options.strict_modes);
- 
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/config.h.in openssh-5.2p1+lpk/config.h.in
---- openssh-5.2p1.orig/config.h.in	2009-02-23 01:18:12.000000000 +0100
-+++ openssh-5.2p1+lpk/config.h.in	2009-03-22 15:59:08.195639244 +0100
-@@ -563,6 +563,9 @@
- /* Define to 1 if you have the <linux/if_tun.h> header file. */
- #undef HAVE_LINUX_IF_TUN_H
- 
-+/* Define if you want LDAP support */
-+#undef WITH_LDAP_PUBKEY
-+
- /* Define if your libraries define login() */
- #undef HAVE_LOGIN
- 
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure openssh-5.2p1+lpk/configure
---- openssh-5.2p1.orig/configure	2009-02-23 01:18:14.000000000 +0100
-+++ openssh-5.2p1+lpk/configure	2009-03-22 15:59:08.400328912 +0100
-@@ -1340,6 +1340,7 @@
-   --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
-   --with-libedit[=PATH]   Enable libedit support for sftp
-   --with-audit=module     Enable EXPERIMENTAL audit support (modules=debug,bsm)
-+  --with-ldap[=PATH]      Enable LDAP pubkey support (optionally in PATH)
-   --with-ssl-dir=PATH     Specify path to OpenSSL installation
-   --without-openssl-header-check Disable OpenSSL version consistency check
-   --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
-@@ -12767,6 +12768,85 @@
- fi
- 
- 
-+# Check whether user wants LDAP support
-+LDAP_MSG="no"
-+
-+# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then
-+  withval=$with_ldap;
-+		if test "x$withval" != "xno" ; then
-+
-+			if test "x$withval" != "xyes" ; then
-+				CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+				LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			fi
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITH_LDAP_PUBKEY 1
-+_ACEOF
-+
-+			LIBS="-lldap $LIBS"
-+			LDAP_MSG="yes"
-+
-+			{ echo "$as_me:$LINENO: checking for LDAP support" >&5
-+echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
-+			cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+				 #include <ldap.h>
-+int
-+main ()
-+{
-+(void)ldap_init(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+				    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+					{ { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5
-+echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+		fi
-+
-+
-+fi
-+
-+
- 
- 
- 
-@@ -30543,6 +30623,7 @@
- echo "                 Smartcard support: $SCARD_MSG"
- echo "                     S/KEY support: $SKEY_MSG"
- echo "              TCP Wrappers support: $TCPW_MSG"
-+echo "                      LDAP support: $LDAP_MSG"
- echo "              MD5 password support: $MD5_MSG"
- echo "                   libedit support: $LIBEDIT_MSG"
- echo "  Solaris process contract support: $SPC_MSG"
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure.ac openssh-5.2p1+lpk/configure.ac
---- openssh-5.2p1.orig/configure.ac	2009-02-16 05:37:03.000000000 +0100
-+++ openssh-5.2p1+lpk/configure.ac	2009-03-22 15:59:08.490709251 +0100
-@@ -1314,6 +1314,37 @@
- 	esac ]
- )
- 
-+# Check whether user wants LDAP support
-+LDAP_MSG="no"
-+AC_ARG_WITH(ldap,
-+	[  --with-ldap[[=PATH]]      Enable LDAP pubkey support (optionally in PATH)],
-+	[
-+		if test "x$withval" != "xno" ; then
-+
-+			if test "x$withval" != "xyes" ; then
-+				CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+				LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			fi
-+
-+			AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support])
-+			LIBS="-lldap $LIBS"
-+			LDAP_MSG="yes"
-+	
-+			AC_MSG_CHECKING([for LDAP support])
-+			AC_TRY_COMPILE(
-+				[#include <sys/types.h>
-+				 #include <ldap.h>],
-+				[(void)ldap_init(0, 0);],
-+				[AC_MSG_RESULT(yes)],
-+				[
-+				    AC_MSG_RESULT(no) 
-+					AC_MSG_ERROR([** Incomplete or missing ldap libraries **])
-+				]
-+        	)
-+		fi
-+	]
-+)
-+
- dnl    Checks for library functions. Please keep in alphabetical order
- AC_CHECK_FUNCS( \
- 	arc4random \
-@@ -4163,6 +4194,7 @@
- echo "                 Smartcard support: $SCARD_MSG"
- echo "                     S/KEY support: $SKEY_MSG"
- echo "              TCP Wrappers support: $TCPW_MSG"
-+echo "                      LDAP support: $LDAP_MSG"
- echo "              MD5 password support: $MD5_MSG"
- echo "                   libedit support: $LIBEDIT_MSG"
- echo "  Solaris process contract support: $SPC_MSG"
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/ldapauth.c openssh-5.2p1+lpk/ldapauth.c
---- openssh-5.2p1.orig/ldapauth.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.2p1+lpk/ldapauth.c	2009-03-22 15:59:08.528655666 +0100
-@@ -0,0 +1,575 @@
-+/* 
-+ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $
-+ */
-+
-+/*
-+ *
-+ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-+ *
-+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-+ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-+ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
-+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ */
-+
-+#include "includes.h"
-+
-+#ifdef WITH_LDAP_PUBKEY
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <string.h>
-+
-+#include "ldapauth.h"
-+#include "log.h"
-+
-+static char *attrs[] = {
-+    PUBKEYATTR,
-+    NULL
-+};
-+
-+/* filter building infos */
-+#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)"
-+#define FILTER_OR_PREFIX "(|"
-+#define FILTER_OR_SUFFIX ")"
-+#define FILTER_CN_PREFIX "(cn="
-+#define FILTER_CN_SUFFIX ")"
-+#define FILTER_UID_FORMAT "(memberUid=%s)"
-+#define FILTER_GROUP_SUFFIX ")"
-+#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52)
-+
-+/* just filter building stuff */
-+#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1)
-+#define REQUEST_GROUP(buffer, prefilter, pwname) \
-+    buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \
-+    if (!buffer) { \
-+        perror("calloc()"); \
-+        return FAILURE; \
-+    } \
-+    snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname)
-+/*
-+XXX OLD group building macros
-+#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46)
-+#define REQUEST_GROUP(buffer,pwname,grp) \
-+    buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \
-+    if (!buffer) { \
-+        perror("calloc()"); \
-+        return FAILURE; \
-+    } \
-+    snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname)
-+    */
-+
-+/*
-+XXX stock upstream version without extra filter support
-+#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64)
-+#define REQUEST_USER(buffer, pwname) \
-+    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \
-+    if (!buffer) { \
-+        perror("calloc()"); \
-+        return NULL; \
-+    } \
-+    snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname)
-+   */
-+
-+#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0))
-+#define REQUEST_USER(buffer, pwname, customfilter) \
-+    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \
-+    if (!buffer) { \
-+        perror("calloc()"); \
-+        return NULL; \
-+    } \
-+    snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \
-+    	"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \
-+	pwname, (customfilter != NULL ? customfilter : ""))
-+
-+/* some portable and working tokenizer, lame though */
-+static int tokenize(char ** o, size_t size, char * input) {
-+    unsigned int i = 0, num;
-+    const char * charset = " \t";
-+    char * ptr = input;
-+
-+    /* leading white spaces are ignored */
-+    num = strspn(ptr, charset);
-+    ptr += num;
-+
-+    while ((num = strcspn(ptr, charset))) {
-+        if (i < size-1) {
-+            o[i++] = ptr;
-+            ptr += num;
-+            if (*ptr)
-+                *ptr++ = '\0';
-+        }
-+    }
-+    o[i] = NULL;
-+    return SUCCESS;
-+}
-+
-+void ldap_close(ldap_opt_t * ldap) {
-+
-+    if (!ldap)
-+        return;
-+
-+    if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0)
-+	ldap_perror(ldap->ld, "ldap_unbind()");
-+
-+    ldap->ld = NULL;
-+    FLAG_SET_DISCONNECTED(ldap->flags);
-+
-+    return;
-+}
-+
-+/* init && bind */
-+int ldap_connect(ldap_opt_t * ldap) {
-+    int version = LDAP_VERSION3;
-+
-+    if (!ldap->servers)
-+        return FAILURE;
-+
-+    /* Connection Init and setup */
-+    ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
-+    if (!ldap->ld) {
-+        ldap_perror(ldap->ld, "ldap_init()");
-+        return FAILURE;
-+    }
-+
-+    if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
-+        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)");
-+        return FAILURE;
-+    }
-+
-+    /* Timeouts setup */
-+    if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) {
-+        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)");
-+    }
-+    if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) {
-+        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)");
-+    }
-+
-+    /* TLS support */
-+    if ( (ldap->tls == -1) || (ldap->tls == 1) ) {
-+        if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) {
-+            /* failed then reinit the initial connect */
-+            ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()");
-+            if (ldap->tls == 1)
-+                return FAILURE;
-+
-+            ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
-+            if (!ldap->ld) { 
-+                ldap_perror(ldap->ld, "ldap_init()");
-+                return FAILURE;
-+            }
-+
-+            if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
-+                 ldap_perror(ldap->ld, "ldap_set_option()");
-+                 return FAILURE;
-+            }
-+        }
-+    }
-+
-+
-+    if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) {
-+        ldap_perror(ldap->ld, "ldap_simple_bind_s()");
-+        return FAILURE;
-+    }
-+
-+    /* says it is connected */
-+    FLAG_SET_CONNECTED(ldap->flags);
-+
-+    return SUCCESS;
-+}
-+
-+/* must free allocated ressource */
-+static char * ldap_build_host(char *host, int port) {
-+    unsigned int size = strlen(host)+11;
-+    char * h = (char *) calloc (size, sizeof(char));
-+    int rc;
-+    if (!h)
-+         return NULL;
-+
-+    rc = snprintf(h, size, "%s:%d ", host, port);
-+    if (rc == -1)
-+        return NULL;
-+    return h;
-+}
-+
-+static int ldap_count_group(const char * input) {
-+    const char * charset = " \t";
-+    const char * ptr = input;
-+    unsigned int count = 0;
-+    unsigned int num;
-+
-+    num = strspn(ptr, charset);
-+    ptr += num;
-+
-+    while ((num = strcspn(ptr, charset))) {
-+    count++;
-+    ptr += num;
-+    ptr++;
-+    }
-+
-+    return count;
-+}
-+
-+/* format filter */
-+char * ldap_parse_groups(const char * groups) {
-+    unsigned int buffer_size = FILTER_GROUP_SIZE(groups);
-+    char * buffer = (char *) calloc(buffer_size, sizeof(char));
-+    char * g = NULL;
-+    char * garray[32];
-+    unsigned int i = 0;
-+
-+    if ((!groups)||(!buffer))
-+        return NULL;
-+
-+    g = strdup(groups);
-+    if (!g) {
-+        free(buffer);
-+        return NULL;
-+    }
-+
-+    /* first separate into n tokens */
-+    if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) {
-+        free(g);

@@ Diff output truncated at 100000 characters. @@

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

From dmichelsen at users.sourceforge.net  Thu Sep 16 15:39:28 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 13:39:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10976] csw/mgar/pkg/libgpg_error/trunk
Message-ID: <E1OwEgS-000405-VX@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10976
          http://gar.svn.sourceforge.net/gar/?rev=10976&view=rev
Author:   dmichelsen
Date:     2010-09-16 13:39:28 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
libgpg_error: Update to 1.9

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

Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/Makefile	2010-09-16 13:08:28 UTC (rev 10975)
+++ csw/mgar/pkg/libgpg_error/trunk/Makefile	2010-09-16 13:39:28 UTC (rev 10976)
@@ -1,5 +1,5 @@
 GARNAME = libgpg-error
-GARVERSION = 1.7
+GARVERSION = 1.9
 CATEGORIES = lib
 
 DESCRIPTION = GNU gpg related library
@@ -18,7 +18,7 @@
 
 SPKG_SOURCEURL = http://www.gnupg.org/download/
 
-RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt
+RUNTIME_DEP_PKGS = CSWggettextrt
 
 BUILD64 = 1
 NOISAEXEC = 1

Modified: csw/mgar/pkg/libgpg_error/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/checksums	2010-09-16 13:08:28 UTC (rev 10975)
+++ csw/mgar/pkg/libgpg_error/trunk/checksums	2010-09-16 13:39:28 UTC (rev 10976)
@@ -1,2 +1 @@
-62c0d09d1e76c5b6da8fff92314c4665  download/libgpg-error-1.7.tar.bz2
-9bdc4607eda7221e72f6f027423080f2  download/CSWgpgerr.gspec
+521b98aa9395e7eaf0ef2236233a0796  libgpg-error-1.9.tar.bz2


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

From dmichelsen at users.sourceforge.net  Thu Sep 16 16:18:58 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 14:18:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[10977] csw/mgar/pkg/libksba/trunk
Message-ID: <E1OwFIg-0007DF-Mi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10977
          http://gar.svn.sourceforge.net/gar/?rev=10977&view=rev
Author:   dmichelsen
Date:     2010-09-16 14:18:58 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
libksba: Update to 1.0.8

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

Modified: csw/mgar/pkg/libksba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libksba/trunk/Makefile	2010-09-16 13:39:28 UTC (rev 10976)
+++ csw/mgar/pkg/libksba/trunk/Makefile	2010-09-16 14:18:58 UTC (rev 10977)
@@ -1,5 +1,5 @@
 GARNAME = libksba
-GARVERSION = 1.0.6
+GARVERSION = 1.0.8
 CATEGORIES = lib
 
 DESCRIPTION = Libksba is a CMS and X.509 access library

Modified: csw/mgar/pkg/libksba/trunk/checksums
===================================================================
--- csw/mgar/pkg/libksba/trunk/checksums	2010-09-16 13:39:28 UTC (rev 10976)
+++ csw/mgar/pkg/libksba/trunk/checksums	2010-09-16 14:18:58 UTC (rev 10977)
@@ -1 +1 @@
-cb8535688de3bec9dad2b267593556ce  download/libksba-1.0.6.tar.bz2
+8acac0b3cbd0030dfc6d0f6a58c9b5b2  libksba-1.0.8.tar.bz2


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

From dmichelsen at users.sourceforge.net  Thu Sep 16 16:32:29 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 14:32:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10978] csw/mgar/pkg/libassuan/trunk
Message-ID: <E1OwFVl-0006Pv-J1@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10978
          http://gar.svn.sourceforge.net/gar/?rev=10978&view=rev
Author:   dmichelsen
Date:     2010-09-16 14:32:29 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
libassuan: Update to 2.0.1

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

Added Paths:
-----------
    csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch

Modified: csw/mgar/pkg/libassuan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libassuan/trunk/Makefile	2010-09-16 14:18:58 UTC (rev 10977)
+++ csw/mgar/pkg/libassuan/trunk/Makefile	2010-09-16 14:32:29 UTC (rev 10978)
@@ -1,5 +1,5 @@
 GARNAME = libassuan
-GARVERSION = 2.0.0
+GARVERSION = 2.0.1
 CATEGORIES = lib
 
 DESCRIPTION = IPC library used by some GnuPG related software
@@ -9,6 +9,10 @@
 MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libassuan/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
+# Use this patch unless this is fixed:
+#   https://bugs.g10code.com/gnupg/issue1282
+PATCHFILES = 0001-Add-INADDR_NONE-for-Solaris.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
 

Modified: csw/mgar/pkg/libassuan/trunk/checksums
===================================================================
--- csw/mgar/pkg/libassuan/trunk/checksums	2010-09-16 14:18:58 UTC (rev 10977)
+++ csw/mgar/pkg/libassuan/trunk/checksums	2010-09-16 14:32:29 UTC (rev 10978)
@@ -1 +1 @@
-59bc0ae7194c412d7a522029005684b2  libassuan-2.0.0.tar.bz2
+53a7d4c22af909d7236d17d454ef935b  libassuan-2.0.1.tar.bz2

Added: csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch	2010-09-16 14:32:29 UTC (rev 10978)
@@ -0,0 +1,26 @@
+From f7b3397155b616637aa0b8ca51c78fa62b9a302b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 16 Sep 2010 15:56:10 +0200
+Subject: [PATCH] Add INADDR_NONE for Solaris
+
+---
+ src/assuan-socket-connect.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
+index 13b8aa5..8d5a09e 100644
+--- a/src/assuan-socket-connect.c
++++ b/src/assuan-socket-connect.c
+@@ -51,6 +51,9 @@
+ #ifndef AF_LOCAL
+ # define AF_LOCAL AF_UNIX
+ #endif
++#ifndef INADDR_NONE
++# define INADDR_NONE ((unsigned long) -1)
++#endif
+ 
+ #ifndef SUN_LEN
+ # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
+-- 
+1.7.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 Sep 16 16:44:05 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 14:44:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[10979]
 csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/
 files/contrib-openssh-lpk-5.4p1-0.3.13.patch
Message-ID: <E1OwFgz-0007wo-6k@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10979
          http://gar.svn.sourceforge.net/gar/?rev=10979&view=rev
Author:   dmichelsen
Date:     2010-09-16 14:44:05 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
openssh-5.6p1+lpk: Add patch from http://code.google.com/p/openssh-lpk/source/browse/#svn/trunk/patch/contrib

Added Paths:
-----------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.4p1-0.3.13.patch

Added: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.4p1-0.3.13.patch
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.4p1-0.3.13.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.4p1-0.3.13.patch	2010-09-16 14:44:05 UTC (rev 10979)
@@ -0,0 +1,2002 @@
+This is a forward-port of the OpenSSH LPK support patch.
+
+It adds support for storing OpenSSH public keys in LDAP. It also supports
+grouping of machines in the LDAP data to limit users to specific machines.
+
+The latest homepage for the LPK project is:
+http://code.google.com/p/openssh-lpk/
+
+Signed-off-by: Robin H. Johnson <robbat2 at gentoo.org>
+
+Change history:
+===============
+2010/03/27
+contrib-openssh-lpk-5.4p1-0.3.13.patch:
+---------------------------------------
+Integrate openssh-lpk-0.3.10_5.4p1-64bit.patchfrom upstream repo r25.
+- Uses ulong for handling timeouts on 64-bit better.
+Ported-from: contrib-openssh-lpk-5.4p1-0.3.12.patch
+
+2010/03/27
+contrib-openssh-lpk-5.4p1-0.3.12.patch:
+---------------------------------------
+Integrate openssh-5.3p1+lpk+pubkeyattrib.patch from upstream repo (originally
+from Julian.Zeiss at fiducia.de).
+- Adds new config option LpkPubKeyAttr for the name of the key attribute (still
+  sshPublicKey by default).
+- Includes LPK suffix in version string.
+Ported-from: contrib-openssh-lpk-5.4p1-0.3.11.patch
+
+2010/03/27
+contrib-openssh-lpk-5.4p1-0.3.11.patch:
+---------------------------------------
+Rename to match new upstream scheme.
+Rediff for openssh-5.4p1.
+Ported-from: openssh-lpk-5.3p1-0.3.11.patch
+
+2009/10/09:
+openssh-lpk-5.3p1-0.3.11.patch:
+-------------------------------
+Ported-from: openssh-lpk-5.2p1-0.3.11.patch
+Rediff for openssh-5.3p1.
+
+2009/02/24:
+openssh-lpk-5.2p1-0.3.11.patch:
+-------------------------------
+Ported-from: openssh-lpk-5.2p1-0.3.10.patch
+Moved the servconf.c initialize_server_options block to make additional patching easier.
+
+2009/02/24:
+openssh-lpk-5.2p1-0.3.10.patch:
+-------------------------------
+Ported-from: openssh-lpk-5.1p1-0.3.10.patch
+Rediff for openssh-5.2p1.
+
+2008/08/23:
+openssh-lpk-5.1p1-0.3.10.patch:
+-------------------------------
+Ported-from: openssh-lpk-5.1p1-0.3.9.patch
+The 0.3.10 version of the patch includes a fix for 64-bit platforms, as
+discovered by Gentoo, where the bind timeout and search timeout values were not
+being parsed correctly: http://bugs.gentoo.org/210110
+
+2008/08/23:
+openssh-lpk-5.1p1-0.3.9.patch:
+------------------------------
+Ported-from: openssh-lpk-4.6p1-0.3.9.patch
+Rediff for openssh-5.1p1
+
+diff -Nuarp openssh-5.4p1.orig/auth2-pubkey.c openssh-5.4p1-0.3.13/auth2-pubkey.c
+--- openssh-5.4p1.orig/auth2-pubkey.c	2010-03-04 10:53:35.000000000 +0000
++++ openssh-5.4p1-0.3.13/auth2-pubkey.c	2010-03-28 03:46:41.000000000 +0000
+@@ -58,6 +58,10 @@
+ #include "misc.h"
+ #include "authfile.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ /* import */
+ extern ServerOptions options;
+ extern u_char *session_id2;
+@@ -187,10 +191,79 @@ user_key_allowed2(struct passwd *pw, Key
+ 	u_long linenum = 0;
+ 	Key *found;
+ 	char *fp;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++	found_key = 0;
++	/* allocate a new key type */
++	found = key_new(key->type);
++ 
++	/* first check if the options is enabled, then try.. */
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s",pw->pw_name);
++	    if (ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    /* Skip leading whitespace, empty and comment lines. */
++		    for (i = 0 ; i < k->num ; i++) {
++			/* dont forget if multiple keys to reset options */
++			char *cp, *options = NULL;
++
++			for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			if (key_read(found, &cp) != 1) {
++			    /* no key?  check if there are options for this key */
++			    int quoted = 0;
++			    debug2("[LDAP] user_key_allowed: check options: '%s'", cp);
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			    /* Skip remaining whitespace. */
++			    for (; *cp == ' ' || *cp == '\t'; cp++)
++				;
++			    if (key_read(found, &cp) != 1) {
++				debug2("[LDAP] user_key_allowed: advance: '%s'", cp);
++				/* still no key?  advance to next line*/
++				continue;
++			    }
++			}
++
++			if (key_equal(found, key) &&
++				auth_parse_options(pw, options, file, linenum) == 1) {
++			    found_key = 1;
++			    debug("[LDAP] matching key found");
++			    fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
++			    verbose("[LDAP] Found matching %s key: %s", key_type(found), fp);
++
++			    /* restoring memory */
++			    ldap_keys_free(k);
++			    xfree(fp);
++			    restore_uid();
++			    key_free(found);
++			    return found_key;
++			    break;
++			}
++		    }/* end of LDAP for() */
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	debug("trying public key file %s", file);
+ 	f = auth_openkeyfile(file, pw, options.strict_modes);
+ 
+diff -Nuarp openssh-5.4p1.orig/auth-rsa.c openssh-5.4p1-0.3.13/auth-rsa.c
+--- openssh-5.4p1.orig/auth-rsa.c	2010-03-04 10:53:35.000000000 +0000
++++ openssh-5.4p1-0.3.13/auth-rsa.c	2010-03-28 03:27:27.000000000 +0000
+@@ -177,10 +177,96 @@ auth_rsa_key_allowed(struct passwd *pw,
+ 	FILE *f;
+ 	u_long linenum = 0;
+ 	Key *key;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++	/* here is the job */
++	key = key_new(KEY_RSA1);
++
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s", pw->pw_name);
++	    if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    for (i = 0 ; i < k->num ; i++) {
++			char *cp, *options = NULL;
++
++			for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			/*
++			* Check if there are options for this key, and if so,
++			* save their starting address and skip the option part
++			* for now.  If there are no options, set the starting
++			* address to NULL.
++			 */
++			if (*cp < '0' || *cp > '9') {
++			    int quoted = 0;
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			} else
++			    options = NULL;
++
++			/* Parse the key from the line. */
++			if (hostfile_read_key(&cp, &bits, key) == 0) {
++			    debug("[LDAP] line %d: non ssh1 key syntax", i);
++			    continue;
++			}
++			/* cp now points to the comment part. */
++
++			/* Check if the we have found the desired key (identified by its modulus). */
++			if (BN_cmp(key->rsa->n, client_n) != 0)
++			    continue;
++
++			/* check the real bits  */
++			if (bits != (unsigned int)BN_num_bits(key->rsa->n))
++			    logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: "
++				    "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits);
++
++			/* We have found the desired key. */
++			/*
++			* If our options do not allow this key to be used,
++			* do not send challenge.
++			 */
++			if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i))
++			    continue;
++
++			/* break out, this key is allowed */
++			allowed = 1;
++
++			/* add the return stuff etc... */
++			/* Restore the privileged uid. */
++			restore_uid();
++
++			/* return key if allowed */
++			if (allowed && rkey != NULL)
++			    *rkey = key;
++			else
++			    key_free(key);
++
++			ldap_keys_free(k);
++			return (allowed);
++		    }
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	/* The authorized keys. */
+ 	file = authorized_keys_file(pw);
+ 	debug("trying public RSA key file %s", file);
+diff -Nuarp openssh-5.4p1.orig/config.h.in openssh-5.4p1-0.3.13/config.h.in
+--- openssh-5.4p1.orig/config.h.in	2010-03-08 00:30:57.000000000 +0000
++++ openssh-5.4p1-0.3.13/config.h.in	2010-03-28 03:27:27.000000000 +0000
+@@ -575,6 +575,9 @@
+ /* Define to 1 if you have the <linux/if_tun.h> header file. */
+ #undef HAVE_LINUX_IF_TUN_H
+ 
++/* Define if you want LDAP support */
++#undef WITH_LDAP_PUBKEY
++
+ /* Define if your libraries define login() */
+ #undef HAVE_LOGIN
+ 
+diff -Nuarp openssh-5.4p1.orig/configure openssh-5.4p1-0.3.13/configure
+--- openssh-5.4p1.orig/configure	2010-03-08 00:30:59.000000000 +0000
++++ openssh-5.4p1-0.3.13/configure	2010-03-28 03:27:27.000000000 +0000
+@@ -1340,6 +1340,7 @@ Optional Packages:
+   --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
+   --with-libedit[=PATH]   Enable libedit support for sftp
+   --with-audit=module     Enable EXPERIMENTAL audit support (modules=debug,bsm)
++  --with-ldap[=PATH]      Enable LDAP pubkey support (optionally in PATH)
+   --with-ssl-dir=PATH     Specify path to OpenSSL installation
+   --without-openssl-header-check Disable OpenSSL version consistency check
+   --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
+@@ -12845,6 +12846,85 @@ echo "$as_me: error: Unknown audit modul
+ fi
+ 
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++
++# Check whether --with-ldap was given.
++if test "${with_ldap+set}" = set; then
++  withval=$with_ldap;
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++
++cat >>confdefs.h <<\_ACEOF
++#define WITH_LDAP_PUBKEY 1
++_ACEOF
++
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++
++			{ echo "$as_me:$LINENO: checking for LDAP support" >&5
++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++				 #include <ldap.h>
++int
++main ()
++{
++(void)ldap_init(0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++				    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++					{ { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5
++echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;}
++   { (exit 1); exit 1; }; }
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		fi
++
++
++fi
++
++
+ 
+ 
+ 
+@@ -30786,6 +30866,7 @@ echo "                   SELinux support
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff -Nuarp openssh-5.4p1.orig/configure.ac openssh-5.4p1-0.3.13/configure.ac
+--- openssh-5.4p1.orig/configure.ac	2010-03-05 04:04:35.000000000 +0000
++++ openssh-5.4p1-0.3.13/configure.ac	2010-03-28 03:27:27.000000000 +0000
+@@ -1323,6 +1323,37 @@ AC_ARG_WITH(audit,
+ 	esac ]
+ )
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++AC_ARG_WITH(ldap,
++	[  --with-ldap[[=PATH]]      Enable LDAP pubkey support (optionally in PATH)],
++	[
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++			AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support])
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++	
++			AC_MSG_CHECKING([for LDAP support])
++			AC_TRY_COMPILE(
++				[#include <sys/types.h>
++				 #include <ldap.h>],
++				[(void)ldap_init(0, 0);],
++				[AC_MSG_RESULT(yes)],
++				[
++				    AC_MSG_RESULT(no) 
++					AC_MSG_ERROR([** Incomplete or missing ldap libraries **])
++				]
++        	)
++		fi
++	]
++)
++
+ dnl    Checks for library functions. Please keep in alphabetical order
+ AC_CHECK_FUNCS( \
+ 	arc4random \
+@@ -4185,6 +4216,7 @@ echo "                   SELinux support
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff -Nuarp openssh-5.4p1.orig/ldapauth.c openssh-5.4p1-0.3.13/ldapauth.c
+--- openssh-5.4p1.orig/ldapauth.c	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/ldapauth.c	2010-03-28 03:48:56.000000000 +0000
+@@ -0,0 +1,574 @@
++/* 
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#include "includes.h"
++
++#ifdef WITH_LDAP_PUBKEY
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
++#include "ldapauth.h"
++#include "log.h"
++
++/* filter building infos */
++#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)"
++#define FILTER_OR_PREFIX "(|"
++#define FILTER_OR_SUFFIX ")"
++#define FILTER_CN_PREFIX "(cn="
++#define FILTER_CN_SUFFIX ")"
++#define FILTER_UID_FORMAT "(memberUid=%s)"
++#define FILTER_GROUP_SUFFIX ")"
++#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52)
++
++/* just filter building stuff */
++#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1)
++#define REQUEST_GROUP(buffer, prefilter, pwname) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname)
++/*
++XXX OLD group building macros
++#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46)
++#define REQUEST_GROUP(buffer,pwname,grp) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname)
++    */
++
++/*
++XXX stock upstream version without extra filter support
++#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64)
++#define REQUEST_USER(buffer, pwname) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname)
++   */
++
++#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0))
++#define REQUEST_USER(buffer, pwname, customfilter) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \
++    	"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \
++	pwname, (customfilter != NULL ? customfilter : ""))
++
++/* some portable and working tokenizer, lame though */
++static int tokenize(char ** o, size_t size, char * input) {
++    unsigned int i = 0, num;
++    const char * charset = " \t";
++    char * ptr = input;
++
++    /* leading white spaces are ignored */
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++        if (i < size-1) {
++            o[i++] = ptr;
++            ptr += num;
++            if (*ptr)
++                *ptr++ = '\0';
++        }
++    }
++    o[i] = NULL;
++    return SUCCESS;
++}
++
++void ldap_close(ldap_opt_t * ldap) {
++
++    if (!ldap)
++        return;
++
++    if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0)
++	ldap_perror(ldap->ld, "ldap_unbind()");
++
++    ldap->ld = NULL;
++    FLAG_SET_DISCONNECTED(ldap->flags);
++
++    return;
++}
++
++/* init && bind */
++int ldap_connect(ldap_opt_t * ldap) {
++    int version = LDAP_VERSION3;
++
++    if (!ldap->servers)
++        return FAILURE;
++
++    /* Connection Init and setup */
++    ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++    if (!ldap->ld) {
++        ldap_perror(ldap->ld, "ldap_init()");
++        return FAILURE;
++    }
++
++    if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)");
++        return FAILURE;
++    }
++
++    /* Timeouts setup */
++    if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)");
++    }
++    if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)");
++    }
++
++    /* TLS support */
++    if ( (ldap->tls == -1) || (ldap->tls == 1) ) {
++        if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) {
++            /* failed then reinit the initial connect */
++            ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()");
++            if (ldap->tls == 1)
++                return FAILURE;
++
++            ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++            if (!ldap->ld) { 
++                ldap_perror(ldap->ld, "ldap_init()");
++                return FAILURE;
++            }
++
++            if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++                 ldap_perror(ldap->ld, "ldap_set_option()");
++                 return FAILURE;
++            }
++        }
++    }
++
++
++    if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_simple_bind_s()");
++        return FAILURE;
++    }
++
++    /* says it is connected */
++    FLAG_SET_CONNECTED(ldap->flags);
++
++    return SUCCESS;
++}
++
++/* must free allocated ressource */
++static char * ldap_build_host(char *host, int port) {
++    unsigned int size = strlen(host)+11;
++    char * h = (char *) calloc (size, sizeof(char));
++    int rc;
++    if (!h)
++         return NULL;
++
++    rc = snprintf(h, size, "%s:%d ", host, port);
++    if (rc == -1)
++        return NULL;
++    return h;
++}
++
++static int ldap_count_group(const char * input) {
++    const char * charset = " \t";
++    const char * ptr = input;
++    unsigned int count = 0;
++    unsigned int num;
++
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++    count++;
++    ptr += num;
++    ptr++;
++    }
++
++    return count;
++}
++
++/* format filter */
++char * ldap_parse_groups(const char * groups) {
++    unsigned int buffer_size = FILTER_GROUP_SIZE(groups);
++    char * buffer = (char *) calloc(buffer_size, sizeof(char));
++    char * g = NULL;
++    char * garray[32];
++    unsigned int i = 0;
++
++    if ((!groups)||(!buffer))
++        return NULL;
++
++    g = strdup(groups);
++    if (!g) {
++        free(buffer);
++        return NULL;
++    }
++
++    /* first separate into n tokens */
++    if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) {
++        free(g);
++        free(buffer);
++        return NULL;
++    }
++
++    /* build the final filter format */
++    strlcat(buffer, FILTER_GROUP_PREFIX, buffer_size);
++    strlcat(buffer, FILTER_OR_PREFIX, buffer_size);
++    i = 0;
++    while (garray[i]) {
++        strlcat(buffer, FILTER_CN_PREFIX, buffer_size);
++        strlcat(buffer, garray[i], buffer_size);
++        strlcat(buffer, FILTER_CN_SUFFIX, buffer_size);
++        i++;
++    }
++    strlcat(buffer, FILTER_OR_SUFFIX, buffer_size);
++    strlcat(buffer, FILTER_UID_FORMAT, buffer_size);
++    strlcat(buffer, FILTER_GROUP_SUFFIX, buffer_size);
++
++    free(g);
++    return buffer;
++}
++
++/* a bit dirty but leak free  */
++char * ldap_parse_servers(const char * servers) {
++    char * s = NULL;
++    char * tmp = NULL, *urls[32];
++    unsigned int num = 0 , i = 0 , asize = 0;
++    LDAPURLDesc *urld[32];
++
++    if (!servers)
++        return NULL;
++
++    /* local copy of the arg */
++    s = strdup(servers);
++    if (!s)
++        return NULL;
++
++    /* first separate into URL tokens */
++    if ( tokenize(urls, sizeof(urls)/sizeof(*urls), s) < 0)
++        return NULL;
++
++    i = 0;
++    while (urls[i]) {
++        if (! ldap_is_ldap_url(urls[i]) ||
++           (ldap_url_parse(urls[i], &urld[i]) != 0)) {
++                return NULL;
++        }
++        i++;
++    }
++
++    /* now free(s) */
++    free (s);
++
++    /* how much memory do we need */
++    num = i;
++    for (i = 0 ; i < num ; i++)
++        asize += strlen(urld[i]->lud_host)+11;
++
++    /* alloc */
++    s = (char *) calloc( asize+1 , sizeof(char));
++    if (!s) {
++        for (i = 0 ; i < num ; i++)
++            ldap_free_urldesc(urld[i]);
++        return NULL;
++    }
++
++    /* then build the final host string */
++    for (i = 0 ; i < num ; i++) {
++        /* built host part */
++        tmp = ldap_build_host(urld[i]->lud_host, urld[i]->lud_port);
++        strncat(s, tmp, strlen(tmp));
++        ldap_free_urldesc(urld[i]);
++        free(tmp);
++    }
++
++    return s;
++}
++
++void ldap_options_print(ldap_opt_t * ldap) {
++    debug("ldap options:");
++    debug("servers: %s", ldap->servers);
++    if (ldap->u_basedn)
++        debug("user basedn: %s", ldap->u_basedn);
++    if (ldap->g_basedn)
++        debug("group basedn: %s", ldap->g_basedn);
++    if (ldap->binddn)
++        debug("binddn: %s", ldap->binddn);
++    if (ldap->bindpw)
++        debug("bindpw: %s", ldap->bindpw);
++    if (ldap->sgroup)
++        debug("group: %s", ldap->sgroup);
++    if (ldap->filter)
++        debug("filter: %s", ldap->filter);
++}
++
++void ldap_options_free(ldap_opt_t * l) {
++    if (!l)
++        return;
++    if (l->servers)
++        free(l->servers);
++    if (l->u_basedn)
++        free(l->u_basedn);
++    if (l->g_basedn)
++        free(l->g_basedn);
++    if (l->binddn)
++        free(l->binddn);
++    if (l->bindpw)
++        free(l->bindpw);
++    if (l->sgroup)
++        free(l->sgroup);
++    if (l->fgroup)
++        free(l->fgroup);
++    if (l->filter)
++        free(l->filter);
++    if (l->l_conf)
++        free(l->l_conf);
++    free(l);
++}
++
++/* free keys */
++void ldap_keys_free(ldap_key_t * k) {
++    ldap_value_free_len(k->keys);
++    free(k);
++    return;
++}
++
++ldap_key_t * ldap_getuserkey(ldap_opt_t *l, const char * user) {
++    ldap_key_t * k = (ldap_key_t *) calloc (1, sizeof(ldap_key_t));
++    LDAPMessage *res, *e;
++    char * filter;
++    int i;
++    char *attrs[] = {
++      l->pub_key_attr,
++      NULL
++    };
++
++    if ((!k) || (!l))
++         return NULL;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED))
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return NULL;
++
++    /* build  filter for LDAP request */
++    REQUEST_USER(filter, user, l->filter);
++
++    if ( ldap_search_st( l->ld,
++        l->u_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        attrs, 0, &l->s_timeout, &res ) != LDAP_SUCCESS) {
++        
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++        free(k);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return NULL;
++    } 
++
++    /* free */
++    free(filter);
++
++    /* check if any results */
++    i = ldap_count_entries(l->ld,res);
++    if (i <= 0) {
++        ldap_msgfree(res);
++        free(k);
++        return NULL;
++    }
++
++    if (i > 1)
++        debug("[LDAP] duplicate entries, using the FIRST entry returned");
++
++    e = ldap_first_entry(l->ld, res);
++    k->keys = ldap_get_values_len(l->ld, e, l->pub_key_attr);
++    k->num = ldap_count_values_len(k->keys);
++
++    ldap_msgfree(res);
++    return k;
++}
++
++
++/* -1 if trouble
++   0 if user is NOT member of current server group
++   1 if user IS MEMBER of current server group 
++ */
++int ldap_ismember(ldap_opt_t * l, const char * user) {
++    LDAPMessage *res;
++    char * filter;
++    int i;
++
++    if ((!l->sgroup) || !(l->g_basedn))
++        return 1;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED)) 
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                 break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return FAILURE;
++
++    /* build filter for LDAP request */
++    REQUEST_GROUP(filter, l->fgroup, user);
++
++    if (ldap_search_st( l->ld, 
++        l->g_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        NULL, 0, &l->s_timeout, &res) != LDAP_SUCCESS) {
++    
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return FAILURE;
++    }
++
++    free(filter);
++
++    /* check if any results */
++    if (ldap_count_entries(l->ld, res) > 0) {
++        ldap_msgfree(res);
++        return 1;
++    }
++
++    ldap_msgfree(res);
++    return 0;
++}
++
++/*
++ * ldap.conf simple parser
++ * XXX TODO:  sanity checks
++ * must either
++ * - free the previous ldap_opt_before replacing entries
++ * - free each necessary previously parsed elements
++ * ret:
++ * -1 on FAILURE, 0 on SUCCESS
++ */
++int ldap_parse_lconf(ldap_opt_t * l) {
++    FILE * lcd; /* ldap.conf descriptor */
++    char buf[BUFSIZ];
++    char * s = NULL, * k = NULL, * v = NULL;
++    int li, len;
++
++    lcd = fopen (l->l_conf, "r");
++    if (lcd == NULL) {
++        /* debug("Cannot open %s", l->l_conf); */
++        perror("ldap_parse_lconf()");
++        return FAILURE;
++    }
++    
++    while (fgets (buf, sizeof (buf), lcd) != NULL) {
++
++        if (*buf == '\n' || *buf == '#')
++            continue;
++
++        k = buf;
++        v = k;
++        while (*v != '\0' && *v != ' ' && *v != '\t')
++            v++;
++
++        if (*v == '\0')
++            continue;
++
++        *(v++) = '\0';
++
++        while (*v == ' ' || *v == '\t')
++            v++;
++
++        li = strlen (v) - 1;
++        while (v[li] == ' ' || v[li] == '\t' || v[li] == '\n')
++            --li;
++        v[li + 1] = '\0';
++
++        if (!strcasecmp (k, "uri")) {
++            if ((l->servers = ldap_parse_servers(v)) == NULL) {
++                fatal("error in ldap servers");
++            return FAILURE;
++            }
++
++        }
++        else if (!strcasecmp (k, "base")) { 
++            s = strchr (v, '?');
++            if (s != NULL) {
++                len = s - v;
++                l->u_basedn = malloc (len + 1);
++                strncpy (l->u_basedn, v, len);
++                l->u_basedn[len] = '\0';
++            } else {
++                l->u_basedn = strdup (v);
++            }
++        }
++        else if (!strcasecmp (k, "binddn")) {
++            l->binddn = strdup (v);
++        }
++        else if (!strcasecmp (k, "bindpw")) {
++            l->bindpw = strdup (v);
++        }
++        else if (!strcasecmp (k, "timelimit")) {
++            l->s_timeout.tv_sec = atoi (v);
++                }
++        else if (!strcasecmp (k, "bind_timelimit")) {
++            l->b_timeout.tv_sec = atoi (v);
++        }
++        else if (!strcasecmp (k, "ssl")) {
++            if (!strcasecmp (v, "start_tls"))
++                l->tls = 1;
++        }
++    }
++
++    fclose (lcd);
++    return SUCCESS;
++}
++
++#endif /* WITH_LDAP_PUBKEY */
+diff -Nuarp openssh-5.4p1.orig/ldapauth.h openssh-5.4p1-0.3.13/ldapauth.h
+--- openssh-5.4p1.orig/ldapauth.h	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/ldapauth.h	2010-03-28 03:48:56.000000000 +0000
+@@ -0,0 +1,127 @@
++/*
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ 
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#ifndef LDAPAUTH_H
++#define LDAPAUTH_H
++
++#define LDAP_DEPRECATED 1
++
++#include <string.h>
++#include <time.h>
++#include <ldap.h>
++#include <lber.h>
++
++/* tokens in use for config */
++#define _DEFAULT_LPK_TOKEN "UseLPK"
++#define _DEFAULT_SRV_TOKEN "LpkServers"
++#define _DEFAULT_USR_TOKEN "LpkUserDN"
++#define _DEFAULT_GRP_TOKEN "LpkGroupDN"
++#define _DEFAULT_BDN_TOKEN "LpkBindDN"
++#define _DEFAULT_BPW_TOKEN "LpkBindPw"
++#define _DEFAULT_MYG_TOKEN "LpkServerGroup"
++#define _DEFAULT_FIL_TOKEN "LpkFilter"
++#define _DEFAULT_TLS_TOKEN "LpkForceTLS"
++#define _DEFAULT_BTI_TOKEN "LpkBindTimelimit"
++#define _DEFAULT_STI_TOKEN "LpkSearchTimelimit"
++#define _DEFAULT_LDP_TOKEN "LpkLdapConf"
++
++#define _DEFAULT_PUB_TOKEN "LpkPubKeyAttr"
++
++/* default options */
++#define _DEFAULT_LPK_ON 0
++#define _DEFAULT_LPK_SERVERS NULL
++#define _DEFAULT_LPK_UDN NULL
++#define _DEFAULT_LPK_GDN NULL
++#define _DEFAULT_LPK_BINDDN NULL
++#define _DEFAULT_LPK_BINDPW NULL
++#define _DEFAULT_LPK_SGROUP NULL
++#define _DEFAULT_LPK_FILTER NULL
++#define _DEFAULT_LPK_TLS -1
++#define _DEFAULT_LPK_BTIMEOUT 10
++#define _DEFAULT_LPK_STIMEOUT 10
++#define _DEFAULT_LPK_LDP NULL
++#define _DEFAULT_LPK_PUB "sshPublicKey"
++
++/* flags */
++#define FLAG_EMPTY	    0x00000000
++#define FLAG_CONNECTED	    0x00000001
++
++/* flag macros */
++#define FLAG_SET_EMPTY(x)		x&=(FLAG_EMPTY)
++#define FLAG_SET_CONNECTED(x)		x|=(FLAG_CONNECTED)
++#define FLAG_SET_DISCONNECTED(x)	x&=~(FLAG_CONNECTED)
++
++/* defines */
++#define FAILURE -1
++#define SUCCESS 0
++
++/* 
++ *
++ * defined files path 
++ * (should be relocated to pathnames.h,
++ * if one day it's included within the tree) 
++ *
++ */
++#define _PATH_LDAP_CONFIG_FILE "/etc/ldap.conf"
++
++/* structures */
++typedef struct ldap_options {
++    int on;			/* Use it or NOT */
++    LDAP * ld;			/* LDAP file desc */
++    char * servers;		/* parsed servers for ldaplib failover handling */
++    char * u_basedn;		/* user basedn */
++    char * g_basedn;		/* group basedn */
++    char * binddn;		/* binddn */
++    char * bindpw;		/* bind password */
++    char * sgroup;		/* server group */
++    char * fgroup;		/* group filter */
++    char * filter;		/* additional filter */
++    char * l_conf;		/* use ldap.conf */
++    int tls;			/* TLS only */
++    struct timeval b_timeout;   /* bind timeout */
++    struct timeval s_timeout;   /* search timeout */
++    unsigned int flags;		/* misc flags (reconnection, future use?) */
++    char * pub_key_attr;	/* Pubkey-Attribute */
++} ldap_opt_t;
++
++typedef struct ldap_keys {
++    struct berval ** keys;	/* the public keys retrieved */
++    unsigned int num;		/* number of keys */
++} ldap_key_t;
++
++
++/* function headers */
++void ldap_close(ldap_opt_t *);
++int ldap_connect(ldap_opt_t *);
++char * ldap_parse_groups(const char *);
++char * ldap_parse_servers(const char *);
++void ldap_options_print(ldap_opt_t *);
++void ldap_options_free(ldap_opt_t *);
++void ldap_keys_free(ldap_key_t *);
++int ldap_parse_lconf(ldap_opt_t *);
++ldap_key_t * ldap_getuserkey(ldap_opt_t *, const char *);
++int ldap_ismember(ldap_opt_t *, const char *);
++
++#endif
+diff -Nuarp openssh-5.4p1.orig/lpk-user-example.txt openssh-5.4p1-0.3.13/lpk-user-example.txt
+--- openssh-5.4p1.orig/lpk-user-example.txt	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/lpk-user-example.txt	2010-03-28 03:27:27.000000000 +0000
+@@ -0,0 +1,117 @@
++
++Post to ML -> User Made Quick Install Doc.
++Contribution from John Lane <john at lane.uk.net>
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++
++OpenSSH LDAP keystore Patch
++===========================
++
++NOTE: these notes are a transcript of a specific installation
++      they work for me, your specifics may be different!
++      from John Lane March 17th 2005         john at lane.uk.net
++
++This is a patch to OpenSSH 4.0p1 to allow it to obtain users' public keys
++from their LDAP record as an alternative to ~/.ssh/authorized_keys.
++
++(Assuming here that necessary build stuff is in $BUILD)
++
++cd $BUILD/openssh-4.0p1
++patch -Np1 -i $BUILD/openssh-lpk-4.0p1-0.3.patch
++mkdir -p /var/empty &&
++./configure --prefix=/usr --sysconfdir=/etc/ssh \
++    --libexecdir=/usr/sbin --with-md5-passwords --with-pam \
++    --with-libs="-lldap" --with-cppflags="-DWITH_LDAP_PUBKEY"
++Now do.
++make &&
++make install
++
++Add the following config to /etc/ssh/ssh_config
++UseLPK yes
++LpkServers ldap://myhost.mydomain.com
++LpkUserDN  ou=People,dc=mydomain,dc=com
++
++We need to tell sshd about the SSL keys during boot, as root's
++environment does not exist at that time. Edit /etc/rc.d/init.d/sshd.
++Change the startup code from this:
++                echo "Starting SSH Server..."
++                loadproc /usr/sbin/sshd
++                ;;
++to this:
++                echo "Starting SSH Server..."
++                LDAPRC="/root/.ldaprc" loadproc /usr/sbin/sshd
++                ;;
++
++Re-start the sshd daemon:
++/etc/rc.d/init.d/sshd restart
++
++Install the additional LDAP schema
++cp $BUILD/openssh-lpk-0.2.schema  /etc/openldap/schema/openssh.schema
++
++Now add the openSSH LDAP schema to /etc/openldap/slapd.conf:
++Add the following to the end of the existing block of schema includes
++include         /etc/openldap/schema/openssh.schema
++
++Re-start the LDAP server:
++/etc/rc.d/init.d/slapd restart
++
++To add one or more public keys to a user, eg "testuser" :
++ldapsearch -x -W -Z -LLL -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com" > /tmp/testuser
++
++append the following to this /tmp/testuser file
++objectclass: ldapPublicKey
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KS
++qIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z8XwSsuAoR1t86t+5dlI
++7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++Then do a modify:
++ldapmodify -x -D "uid=testuser,ou=People,dc=mydomain,dc=com" -W -f
++/tmp/testuser -Z
++Enter LDAP Password:
++modifying entry "uid=testuser,ou=People,dc=mydomain,dc=com"
++And check the modify is ok:
++ldapsearch -x -W -Z -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com"
++Enter LDAP Password:
++# extended LDIF
++#
++# LDAPv3
++# base <uid=testuser,ou=People,dc=mydomain,dc=com> with scope sub
++# filter: (objectclass=*)
++# requesting: ALL
++#
++
++# testuser, People, mydomain.com
++dn: uid=testuser,ou=People,dc=mydomain,dc=com
++uid: testuser
++cn: testuser
++objectClass: account
++objectClass: posixAccount
++objectClass: top
++objectClass: shadowAccount
++objectClass: ldapPublicKey
++shadowLastChange: 12757
++shadowMax: 99999
++shadowWarning: 7
++loginShell: /bin/bash
++uidNumber: 9999
++gidNumber: 501
++homeDirectory: /home/testuser
++userPassword:: e1NTSEF9UDgwV1hnM1VjUDRJK0k1YnFiL1d4ZUJObXlZZ3Z3UTU=
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KSqIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z
++8XwSsuAoR1t86t+5dlI7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++# search result
++search: 3
++result: 0 Success
++
++# numResponses: 2
++# numEntries: 1
++
++Now start a ssh session to user "testuser" from usual ssh client (e.g.
++puTTY). Login should succeed.
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+diff -Nuarp openssh-5.4p1.orig/Makefile.in openssh-5.4p1-0.3.13/Makefile.in
+--- openssh-5.4p1.orig/Makefile.in	2010-02-24 07:18:51.000000000 +0000
++++ openssh-5.4p1-0.3.13/Makefile.in	2010-03-28 03:28:04.000000000 +0000
+@@ -91,7 +91,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passw
+ 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
+ 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+-	roaming_common.o roaming_serv.o
++	roaming_common.o roaming_serv.o ldapauth.o
+ 
+ MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
+ MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
+diff -Nuarp openssh-5.4p1.orig/openssh-lpk_openldap.schema openssh-5.4p1-0.3.13/openssh-lpk_openldap.schema
+--- openssh-5.4p1.orig/openssh-lpk_openldap.schema	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/openssh-lpk_openldap.schema	2010-03-28 03:27:27.000000000 +0000
+@@ -0,0 +1,19 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Based on the proposal of : Mark Ruijter
++#
++
++
++# octetString SYNTAX
++attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff -Nuarp openssh-5.4p1.orig/openssh-lpk_sun.schema openssh-5.4p1-0.3.13/openssh-lpk_sun.schema
+--- openssh-5.4p1.orig/openssh-lpk_sun.schema	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/openssh-lpk_sun.schema	2010-03-28 03:27:27.000000000 +0000
+@@ -0,0 +1,21 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Schema for Sun Directory Server.
++# Based on the original schema, modified by Stefan Fischer.
++#
++
++dn: cn=schema
++
++# octetString SYNTAX
++attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff -Nuarp openssh-5.4p1.orig/README.lpk openssh-5.4p1-0.3.13/README.lpk
+--- openssh-5.4p1.orig/README.lpk	1970-01-01 00:00:00.000000000 +0000
++++ openssh-5.4p1-0.3.13/README.lpk	2010-03-28 03:27:27.000000000 +0000
+@@ -0,0 +1,267 @@
++OpenSSH LDAP PUBLIC KEY PATCH 
++Copyright (c) 2003 Eric AUGE (eau at phear.org)
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products
++   derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++purposes of this patch:
++
++This patch would help to have authentication centralization policy
++using ssh public key authentication.
++This patch could be an alternative to other "secure" authentication system
++working in a similar way (Kerberos, SecurID, etc...), except the fact 
++that it's based on OpenSSH and its public key abilities.
++
++>> FYI: <<
++'uid': means unix accounts existing on the current server
++'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config)
++
++example schema:
++
++
++                                  server1 (uid: eau,rival,toto) (lpkServerGroup: unix)
++                ___________      /
++               /           \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix)
++              | LDAP Server |    \
++	      | eau  ,rival |     server2 (uid: rival, eau) (lpkServerGroup: unix)
++	      | titi ,toto  |
++	      | userx,....  |         server5 (uid: eau)  (lpkServerGroup: mail)
++               \___________/ \       /
++	                       ----- - server4 (uid: eau, rival)  (no group configured)
++			             \
++				        etc...
++
++- WHAT WE NEED :
++
++  * configured LDAP server somewhere on the network (i.e. OpenLDAP)
++  * patched sshd (with this patch ;)
++  * LDAP user(/group) entry (look at users.ldif (& groups.ldif)):
++        User entry:
++	- attached to the 'ldapPublicKey' objectclass
++	- attached to the 'posixAccount' objectclass
++	- with a filled 'sshPublicKey' attribute 
++	Example:
++		dn: uid=eau,ou=users,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: person
++		objectclass: organizationalPerson
++		objectclass: posixAccount
++		objectclass: ldapPublicKey
++		description: Eric AUGE Account
++		userPassword: blah
++		cn: Eric AUGE
++		sn: Eric AUGE
++		uid: eau
++		uidNumber: 1034
++		gidNumber: 1
++		homeDirectory: /export/home/eau
++		sshPublicKey: ssh-dss AAAAB3...
++		sshPublicKey: ssh-dss AAAAM5...
++
++	Group entry:
++	- attached to the 'posixGroup' objectclass
++	- with a 'cn' groupname attribute
++	- with multiple 'memberUid' attributes filled with usernames allowed in this group
++	Example:
++		# few members
++		dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: posixGroup
++		description: Unix based servers group
++		cn: unix
++		gidNumber: 1002
++		memberUid: eau
++		memberUid: user1
++		memberUid: user2
++
++
++- HOW IT WORKS :
++
++  * without patch
++  If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..)
++  and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled).
++
++  * with the patch
++  If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled.
++  It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. 
++  (usually in $HOME/.ssh/authorized_keys)
++
++  If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into.
++  If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled).
++
++  7 tokens are added to sshd_config :
++  # here is the new patched ldap related tokens
++  # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup
++  UseLPK yes								# look the pub key into LDAP
++  LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3	# which LDAP server for users ? (URL format)
++  LpkUserDN  ou=users,dc=foobar,dc=net					# which base DN for users ?
++  LpkGroupDN ou=groups,dc=foobar,dc=net					# which base DN for groups ? 
++  LpkBindDN cn=manager,dc=foobar,dc=net					# which bind DN ?
++  LpkBindPw asecret							# bind DN credidentials
++  LpkServerGroup agroupname						# the group the server is part of
++
++  Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some
++  flaws you have to take care of.
++
++- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY
++
++  * my way (there is plenty :)
++  - create ldif file (i.e. users.ldif)
++  - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub
++  - my way in 4 steps :
++  Example:
++
++  # you add this to the user entry in the LDIF file :
++  [...]
++  objectclass: posixAccount
++  objectclass: ldapPublicKey
++  [...]
++  sshPubliKey: ssh-dss AAAABDh12DDUR2...
++  [...]
++
++  # insert your entry and you're done :)
++  ldapadd -D balblabla -w bleh < file.ldif 
++  
++  all standard options can be present in the 'sshPublicKey' attribute.
++
++- WHY :
++
++  Simply because, i was looking for a way to centralize all sysadmins authentication, easily,  without completely using LDAP 
++  as authentication method (like pam_ldap etc..).  
++  
++  After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get 
++  public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser'
++  objectclass within LDAP and part of the group the SSH server is in). 
++
++  Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase 
++  so each user can change it as much as he wants). 
++
++  Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only).
++
++- RULES :  
++  Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. 
++  and the additionnal lpk.schema.
++
++  This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication 
++  (pamldap, nss_ldap, etc..).
++
++  This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..).
++  
++  Referring to schema at the beginning of this file if user 'eau' is only in group 'unix'
++  'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'.
++  If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able
++  to log in 'server5' (i hope you got the idea, my english is bad :).
++
++  Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP
++  server.
++  When you want to allow a new user to have access to the server parc, you just add him an account on 
++  your servers, you add his public key into his entry on the LDAP server, it's done. 
++
++  Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys).
++
++  When the user needs to change his passphrase he can do it directly from his workstation by changing 
++  his own key set lock passphrase, and all servers are automatically aware.
++ 
++  With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself
++  so he can add/modify/delete himself his public key when needed.
++
++\xAD FLAWS :
++  LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP 
++  allow write to users dn, somebody could replace someuser's public key by its own and impersonate some 
++  of your users in all your server farm be VERY CAREFUL.
++  
++  MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login 
++  as the impersonnated user.
++
++  If LDAP server is down then, fallback on passwd auth.
++  
++  the ldap code part has not been well audited yet.
++
++- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif)
++    --- CUT HERE ---
++    dn: uid=jdoe,ou=users,dc=foobar,dc=net
++    objectclass: top
++    objectclass: person
++    objectclass: organizationalPerson
++    objectclass: posixAccount
++    objectclass: ldapPublicKey
++    description: My account
++    cn: John Doe
++    sn: John Doe
++    uid: jdoe
++    uidNumber: 100
++    gidNumber: 100
++    homeDirectory: /home/jdoe
++    sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB....
++    [...]
++    --- CUT HERE ---
++
++- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif)
++    --- CUT HERE ---
++    dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++    objectclass: top
++    objectclass: posixGroup
++    description: Unix based servers group
++    cn: unix
++    gidNumber: 1002
++    memberUid: jdoe
++    memberUid: user1
++    memberUid: user2
++    [...]
++    --- CUT HERE ---
++
++>> FYI: << 
++Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry
++
++- COMPILING:
++  1. Apply the patch
++  2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes
++  3. make
++  4. it's done.
++
++- BLA :
++  I hope this could help, and i hope to be clear enough,, or give ideas.  questions/comments/improvements are welcome.
++  
++- TODO :
++  Redesign differently.
++
++- DOCS/LINK :
++  http://pacsec.jp/core05/psj05-barisani-en.pdf
++  http://fritz.potsdam.edu/projects/openssh-lpk/
++  http://fritz.potsdam.edu/projects/sshgate/
++  http://dev.inversepath.com/trac/openssh-lpk
++  http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm )
++
++- CONTRIBUTORS/IDEAS/GREETS :
++  - Falk Siemonsmeier.
++  - Jacob Rief.
++  - Michael Durchgraf.
++  - frederic peters.
++  - Finlay dobbie.
++  - Stefan Fisher.
++  - Robin H. Johnson.
++  - Adrian Bridgett.
++
++- CONTACT :
++  - Eric AUGE <eau at phear.org>
++  - Andrea Barisani <andrea at inversepath.com>
+diff -Nuarp openssh-5.4p1.orig/servconf.c openssh-5.4p1-0.3.13/servconf.c
+--- openssh-5.4p1.orig/servconf.c	2010-03-04 10:53:35.000000000 +0000
++++ openssh-5.4p1-0.3.13/servconf.c	2010-03-28 03:51:50.000000000 +0000
+@@ -42,6 +42,10 @@
+ #include "channels.h"
+ #include "groupaccess.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ static void add_listen_addr(ServerOptions *, char *, int);
+ static void add_one_listen_addr(ServerOptions *, char *, int);
+ 
+@@ -108,6 +112,25 @@ initialize_server_options(ServerOptions
+ 	options->num_allow_groups = 0;
+ 	options->num_deny_groups = 0;
+ 	options->ciphers = NULL;
++#ifdef WITH_LDAP_PUBKEY
++	/* XXX dirty */
++	options->lpk.ld = NULL;
++	options->lpk.on = -1;
++	options->lpk.servers = NULL;
++	options->lpk.u_basedn = NULL;
++	options->lpk.g_basedn = NULL;
++	options->lpk.binddn = NULL;
++	options->lpk.bindpw = NULL;
++	options->lpk.sgroup = NULL;
++	options->lpk.filter = NULL;
++	options->lpk.fgroup = NULL;
++	options->lpk.l_conf = NULL;
++	options->lpk.tls = -1;
++	options->lpk.b_timeout.tv_sec = -1;
++	options->lpk.s_timeout.tv_sec = -1;
++	options->lpk.flags = FLAG_EMPTY;
++	options->lpk.pub_key_attr = NULL;
++#endif
+ 	options->macs = NULL;
+ 	options->protocol = SSH_PROTO_UNKNOWN;
+ 	options->gateway_ports = -1;
+@@ -266,6 +289,35 @@ fill_default_server_options(ServerOption
+ 	if (options->zero_knowledge_password_authentication == -1)
+ 		options->zero_knowledge_password_authentication = 0;
+ 
++#ifdef WITH_LDAP_PUBKEY
++	if (options->lpk.on == -1)
++	    options->lpk.on = _DEFAULT_LPK_ON;
++	if (options->lpk.servers == NULL)
++	    options->lpk.servers = _DEFAULT_LPK_SERVERS;
++	if (options->lpk.u_basedn == NULL)
++	    options->lpk.u_basedn = _DEFAULT_LPK_UDN;
++	if (options->lpk.g_basedn == NULL)
++	    options->lpk.g_basedn = _DEFAULT_LPK_GDN;
++	if (options->lpk.binddn == NULL)
++	    options->lpk.binddn = _DEFAULT_LPK_BINDDN;
++	if (options->lpk.bindpw == NULL)
++	    options->lpk.bindpw = _DEFAULT_LPK_BINDPW;
++	if (options->lpk.sgroup == NULL)
++	    options->lpk.sgroup = _DEFAULT_LPK_SGROUP;
++	if (options->lpk.filter == NULL)
++	    options->lpk.filter = _DEFAULT_LPK_FILTER;
++	if (options->lpk.tls == -1)
++	    options->lpk.tls = _DEFAULT_LPK_TLS;
++	if (options->lpk.b_timeout.tv_sec == -1)
++	    options->lpk.b_timeout.tv_sec = _DEFAULT_LPK_BTIMEOUT;
++	if (options->lpk.s_timeout.tv_sec == -1)
++	    options->lpk.s_timeout.tv_sec = _DEFAULT_LPK_STIMEOUT;
++	if (options->lpk.l_conf == NULL)
++	    options->lpk.l_conf = _DEFAULT_LPK_LDP;
++	if (options->lpk.pub_key_attr == NULL)
++	    options->lpk.pub_key_attr = _DEFAULT_LPK_PUB;
++#endif
++
+ 	/* Turn privilege separation on by default */
+ 	if (use_privsep == -1)
+ 		use_privsep = 1;
+@@ -312,6 +364,12 @@ typedef enum {
+ 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
+ 	sRevokedKeys, sTrustedUserCAKeys,
+ 	sDeprecated, sUnsupported
++#ifdef WITH_LDAP_PUBKEY
++	,sLdapPublickey, sLdapServers, sLdapUserDN
++	,sLdapGroupDN, sBindDN, sBindPw, sMyGroup
++	,sLdapFilter, sForceTLS, sBindTimeout
++	,sSearchTimeout, sLdapConf ,sLpkPubKeyAttr 
++#endif
+ } ServerOpCodes;
+ 
+ #define SSHCFG_GLOBAL	0x01	/* allowed in main section of sshd_config */
+@@ -422,6 +480,22 @@ static struct {
+ 	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
+ 	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
+ 	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
++#ifdef WITH_LDAP_PUBKEY
++	{ _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
++	{ _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
++	{ _DEFAULT_USR_TOKEN, sLdapUserDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_GRP_TOKEN, sLdapGroupDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_BDN_TOKEN, sBindDN, SSHCFG_GLOBAL },
++	{ _DEFAULT_BPW_TOKEN, sBindPw, SSHCFG_GLOBAL },
++	{ _DEFAULT_MYG_TOKEN, sMyGroup, SSHCFG_GLOBAL },
++	{ _DEFAULT_FIL_TOKEN, sLdapFilter, SSHCFG_GLOBAL },
++	{ _DEFAULT_TLS_TOKEN, sForceTLS, SSHCFG_GLOBAL },
++	{ _DEFAULT_BTI_TOKEN, sBindTimeout, SSHCFG_GLOBAL },
++	{ _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL },
++	{ _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL },
++	{ "LpkPubKeyAttr", sLpkPubKeyAttr, SSHCFG_GLOBAL },
++#endif
++
+ 	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
+ 	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
+ 	{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
+@@ -665,6 +739,7 @@ process_server_config_line(ServerOptions
+ 	int cmdline = 0, *intptr, value, n;
+ 	SyslogFacility *log_facility_ptr;
+ 	LogLevel *log_level_ptr;
++ 	unsigned long lvalue, *longptr;
+ 	ServerOpCodes opcode;
+ 	int port;
+ 	u_int i, flags = 0;
+@@ -679,6 +754,7 @@ process_server_config_line(ServerOptions
+ 	if (!arg || !*arg || *arg == '#')
+ 		return 0;
+ 	intptr = NULL;
++	longptr = NULL;
+ 	charptr = NULL;
+ 	opcode = parse_token(arg, filename, linenum, &flags);
+ 
+@@ -1349,6 +1425,125 @@ process_server_config_line(ServerOptions
+ 		while (arg)
+ 		    arg = strdelim(&cp);
+ 		break;
++#ifdef WITH_LDAP_PUBKEY
++	case sLdapPublickey:
++		intptr = &options->lpk.on;
++		goto parse_flag;
++	case sLdapServers:
++		/* arg = strdelim(&cp); */
++		p = line;
++		while(*p++);
++		arg = p;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		if ((options->lpk.servers = ldap_parse_servers(arg)) == NULL)
++		    fatal("%s line %d: error in ldap servers", filename, linenum);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapUserDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.u_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapGroupDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.g_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing binddn",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.binddn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindPw:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing bindpw",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.bindpw = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sMyGroup:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing groupname",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.sgroup = xstrdup(arg);
++		if (options->lpk.sgroup)
++		    options->lpk.fgroup = ldap_parse_groups(options->lpk.sgroup);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapFilter:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing filter",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.filter = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sForceTLS:
++		intptr = &options->lpk.tls;
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing yes/no argument.",
++			    filename, linenum);
++		value = 0;	/* silence compiler */
++		if (strcmp(arg, "yes") == 0)
++			value = 1;
++		else if (strcmp(arg, "no") == 0)
++			value = 0;
++		else if (strcmp(arg, "try") == 0)
++			value = -1;
++		else
++			fatal("%s line %d: Bad yes/no argument: %s",
++				filename, linenum, arg);
++		if (*intptr == -1)
++			*intptr = value;
++		break;
++	case sBindTimeout:
++		longptr = (unsigned long *) &options->lpk.b_timeout.tv_sec;
++parse_ulong:
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing integer value.",
++			    filename, linenum);
++		lvalue = atol(arg);
++		if (*activep && *longptr == -1)
++			*longptr = lvalue;
++		break;
++
++	case sSearchTimeout:
++		longptr = (unsigned long *) &options->lpk.s_timeout.tv_sec;
++		goto parse_ulong;
++		break;
++	case sLdapConf:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing LpkLdapConf", filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.l_conf = xstrdup(arg);
++		memset(arg, 0, strlen(arg));
++		break;
++	case sLpkPubKeyAttr:
++		arg = cp;
++                if (!arg || *arg == '\0')
++                    fatal("%s line %d: missing pubkeyattr",filename,linenum);
++                arg[strlen(arg)] = '\0';
++                options->lpk.pub_key_attr = xstrdup(arg);
++                memset(arg,0,strlen(arg));
++                break;
++
++#endif
+ 
+ 	default:
+ 		fatal("%s line %d: Missing handler for opcode %s (%d)",
+diff -Nuarp openssh-5.4p1.orig/servconf.h openssh-5.4p1-0.3.13/servconf.h
+--- openssh-5.4p1.orig/servconf.h	2010-03-04 10:53:35.000000000 +0000
++++ openssh-5.4p1-0.3.13/servconf.h	2010-03-28 03:27:27.000000000 +0000
+@@ -16,6 +16,10 @@
+ #ifndef SERVCONF_H
+ #define SERVCONF_H
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #define MAX_PORTS		256	/* Max # ports. */
+ 
+ #define MAX_ALLOW_USERS		256	/* Max # users on allow list. */
+@@ -150,6 +154,9 @@ typedef struct {
+ 	int	use_pam;		/* Enable auth via PAM */
+ 
+ 	int	permit_tun;
++#ifdef WITH_LDAP_PUBKEY
++        ldap_opt_t lpk;
++#endif
+ 
+ 	int	num_permitted_opens;
+ 
+diff -Nuarp openssh-5.4p1.orig/sshd.c openssh-5.4p1-0.3.13/sshd.c
+--- openssh-5.4p1.orig/sshd.c	2010-03-07 12:05:17.000000000 +0000
++++ openssh-5.4p1-0.3.13/sshd.c	2010-03-28 03:27:27.000000000 +0000
+@@ -127,6 +127,10 @@ int allow_severity;
+ int deny_severity;
+ #endif /* LIBWRAP */
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #ifndef O_NOCTTY
+ #define O_NOCTTY	0
+ #endif
+@@ -1530,6 +1534,16 @@ main(int ac, char **av)
+ 		exit(1);
+ 	}
+ 
++#ifdef WITH_LDAP_PUBKEY
++    /* ldap_options_print(&options.lpk); */
++    /* XXX initialize/check ldap connection and set *LD */
++    if (options.lpk.on) {
++        if (options.lpk.l_conf && (ldap_parse_lconf(&options.lpk) < 0) )
++            error("[LDAP] could not parse %s", options.lpk.l_conf);
++        if (ldap_connect(&options.lpk) < 0)
++            error("[LDAP] could not initialize ldap connection");
++    }
++#endif
+ 	debug("sshd version %.100s", SSH_RELEASE);
+ 
+ 	/* Store privilege separation user for later use if required. */
+diff -Nuarp openssh-5.4p1.orig/sshd_config openssh-5.4p1-0.3.13/sshd_config
+--- openssh-5.4p1.orig/sshd_config	2009-10-11 10:51:09.000000000 +0000
++++ openssh-5.4p1-0.3.13/sshd_config	2010-03-28 03:48:56.000000000 +0000
+@@ -107,6 +107,22 @@
+ # no default banner path
+ #Banner none
+ 
++# here are the new patched ldap related tokens
++# entries in your LDAP must have posixAccount & ldapPublicKey objectclass
++#UseLPK yes
++#LpkLdapConf /etc/ldap.conf
++#LpkServers  ldap://10.1.7.1/ ldap://10.1.7.2/
++#LpkUserDN   ou=users,dc=phear,dc=org
++#LpkGroupDN  ou=groups,dc=phear,dc=org
++#LpkBindDN cn=Manager,dc=phear,dc=org
++#LpkBindPw secret
++#LpkServerGroup mail
++#LpkFilter (hostAccess=master.phear.org)
++#LpkForceTLS no
++#LpkSearchTimelimit 3
++#LpkBindTimelimit 3
++#LpkPubKeyAttr sshPublicKey
++
+ # override default of no subsystems
+ Subsystem	sftp	/usr/libexec/sftp-server
+ 
+diff -Nuarp openssh-5.4p1.orig/sshd_config.5 openssh-5.4p1-0.3.13/sshd_config.5
+--- openssh-5.4p1.orig/sshd_config.5	2010-03-04 23:41:45.000000000 +0000
++++ openssh-5.4p1-0.3.13/sshd_config.5	2010-03-28 03:27:27.000000000 +0000
+@@ -1043,6 +1043,62 @@ Specifies the full pathname of the
+ program.
+ The default is
+ .Pa /usr/X11R6/bin/xauth .
++.It Cm UseLPK
++Specifies whether LDAP public key retrieval must be used or not. It allow
++an easy centralisation of public keys within an LDAP directory. The argument must be
++.Dq yes
++or
++.Dq no .
++.It Cm LpkLdapConf
++Specifies whether LDAP Public keys should parse the specified ldap.conf file
++instead of sshd_config Tokens. The argument must be a valid path to an ldap.conf
++file like
++.Pa /etc/ldap.conf
++.It Cm LpkServers
++Specifies LDAP one or more [:space:] separated server's url the following form may be used:
++.Pp
++LpkServers ldaps://127.0.0.1 ldap://127.0.0.2 ldap://127.0.0.3
++.It Cm LpkUserDN
++Specifies the LDAP user DN.
++.Pp
++LpkUserDN ou=users,dc=phear,dc=org
++.It Cm LpkGroupDN
++Specifies the LDAP groups DN.
++.Pp
++LpkGroupDN ou=groups,dc=phear,dc=org
++.It Cm LpkBindDN
++Specifies the LDAP bind DN to use if necessary.
++.Pp
++LpkBindDN cn=Manager,dc=phear,dc=org
++.It Cm LpkBindPw
++Specifies the LDAP bind credential. 
++.Pp
++LpkBindPw secret
++.It Cm LpkServerGroup
++Specifies one or more [:space:] separated group the server is part of. 
++.Pp
++LpkServerGroup unix mail prod
++.It Cm LpkFilter
++Specifies an additional LDAP filter to use for finding SSH keys
++.Pp
++LpkFilter (hostAccess=master.phear.org)
++.It Cm LpkForceTLS
++Specifies if the LDAP server connection must be tried, forced or not used. The argument must be 
++.Dq yes
++or
++.Dq no
++or
++.Dq try .
++.It Cm LpkSearchTimelimit
++Sepcifies the search time limit before the search is considered over. value is
++in seconds.
++.Pp
++LpkSearchTimelimit 3
++.It Cm LpkBindTimelimit
++Sepcifies the bind time limit before the connection is considered dead. value is
++in seconds.
++.Pp
++LpkBindTimelimit 3
+ .El
+ .Sh TIME FORMATS
+ .Xr sshd 8
+diff -Nuarp openssh-5.4p1.orig/version.h openssh-5.4p1-0.3.13/version.h
+--- openssh-5.4p1.orig/version.h	2010-03-07 22:03:34.000000000 +0000
++++ openssh-5.4p1-0.3.13/version.h	2010-03-28 03:50:04.000000000 +0000
+@@ -2,5 +2,6 @@
+ 
+ #define SSH_VERSION	"OpenSSH_5.4"
+ 
++#define SSH_LPK		"lpk"
+ #define SSH_PORTABLE	"p1"
+-#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_LPK


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 Sep 16 19:36:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 17:36:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10980] csw/mgar/gar/v2
Message-ID: <E1OwINX-0005wb-UF@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10980
          http://gar.svn.sourceforge.net/gar/?rev=10980&view=rev
Author:   dmichelsen
Date:     2010-09-16 17:36:11 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
mGAR v2: Add clean and rebuild targets, still some work to do

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2010-09-16 14:44:05 UTC (rev 10979)
+++ csw/mgar/gar/v2/gar.lib.mk	2010-09-16 17:36:11 UTC (rev 10980)
@@ -629,6 +629,41 @@
 	@( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) )
 	@$(MAKECOOKIE)
 
+#################### CLEAN RULES ####################
+
+CLEAN_ARGS ?= clean
+ 
+# build from a standard gnu-style makefile's default rule.
+clean-%/Makefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/makefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/GNUmakefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/Jamfile:
+	$(error *** Don't know how to clean Jamfiles)
+
+clean-%/Rakefile:
+	$(error *** Don't know how to clean Rakefiles)
+
+clean-%/rakefile:
+	$(error *** Don't know how to clean Rakefiles)
+
+clean-%/setup.rb:
+	$(error *** Don't know how to clean Ruby setups)
+
+clean-%/setup.py:
+	$(error *** Don't know how to clean Python builds)
+
 #################### TEST RULES ####################
 
 TEST_TARGET ?= test

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-09-16 14:44:05 UTC (rev 10979)
+++ csw/mgar/gar/v2/gar.mk	2010-09-16 17:36:11 UTC (rev 10980)
@@ -151,6 +151,7 @@
 $(call _modulate_target,build,$(2),$(4))
 $(call _modulate_target_nocookie,reset-build,$(2),$(4))
 $(call _modulate_target,test,$(2),$(4))
+$(call _modulate_target_nocookie,reset-test,$(2),$(4))
 $(call _modulate_target,install,$(2),$(4))
 $(call _modulate_target_nocookie,reset-install,$(2),$(4))
 #$(call _modulate_target,merge,$(2),$(4))
@@ -555,6 +556,7 @@
 reset-configure: $(addprefix reset-configure-,$(MODULATIONS))
 	rm -f $(COOKIEDIR)/configure
 
+# XXX: pre-*, post-*
 reset-configure-modulated:
 	rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS))
 
@@ -578,6 +580,16 @@
 build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated
 	@$(MAKECOOKIE)
 
+.PHONY: reset-build reset-build-modulated
+rebuild: reset-build build
+
+reset-build: $(addprefix reset-build-,$(MODULATIONS))
+	rm -f $(COOKIEDIR)/build
+
+# XXX: pre-*, post-*
+reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS))
+	rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS) post-build-modulated))
+
 # returns true if build has completed successfully, false
 # otherwise
 build-p:
@@ -591,6 +603,8 @@
 test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated
 	$(DONADA)
 
+# XXX: retest
+
 # strip - Strip executables
 ifneq ($(GARFLAVOR),DBG)
 POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS)


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

From dmichelsen at users.sourceforge.net  Thu Sep 16 20:45:05 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Sep 2010 18:45:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[10981] csw/mgar/gar/v2/gar.mk
Message-ID: <E1OwJSD-0004bN-9Y@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10981
          http://gar.svn.sourceforge.net/gar/?rev=10981&view=rev
Author:   dmichelsen
Date:     2010-09-16 18:45:05 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
mGAR v2: Add EXPANDVARS

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-09-16 17:36:11 UTC (rev 10980)
+++ csw/mgar/gar/v2/gar.mk	2010-09-16 18:45:05 UTC (rev 10981)
@@ -405,7 +405,9 @@
 extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \
 		$(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \
 		announce-modulation \
-		pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter global,$(MODULATION)),,post-extract-gitsnap)
+		pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \
+		$(if $(filter global,$(MODULATION)),,post-extract-gitsnap) \
+		$(foreach FILE,$(EXPANDVARS),expandvars-$(FILE))
 	@$(DONADA)
 
 # This target ensures that the values used by git when making a commit
@@ -443,6 +445,15 @@
 extract-p:
 	@$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
 
+# The rule takes all files from EXPANDVARS and replaces all occurrences of @<var>@ in the file
+# with the values of <var> from the Makefile.
+_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR)))
+
+expandvars-%:
+	$(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$*
+	@$(MAKECOOKIE)
+
+
 # checkpatch	- Do a "patch -C" instead of a "patch".  Note
 # 				  that it may give incorrect results if multiple
 # 				  patches deal with the same file.


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

From jdeppe at users.sourceforge.net  Thu Sep 16 22:31:24 2010
From: jdeppe at users.sourceforge.net (jdeppe at users.sourceforge.net)
Date: Thu, 16 Sep 2010 20:31:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[10982] csw/mgar/pkg/rbgems
Message-ID: <E1OwL76-0007vT-QH@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10982
          http://gar.svn.sourceforge.net/gar/?rev=10982&view=rev
Author:   jdeppe
Date:     2010-09-16 20:31:24 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Initial import for curb - libcurl binding for ruby

Added Paths:
-----------
    csw/mgar/pkg/rbgems/curb/
    csw/mgar/pkg/rbgems/curb/Makefile
    csw/mgar/pkg/rbgems/curb/checksums

Added: csw/mgar/pkg/rbgems/curb/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/curb/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/curb/Makefile	2010-09-16 20:31:24 UTC (rev 10982)
@@ -0,0 +1,17 @@
+GARNAME = curb
+GARVERSION = 0.7.8
+CATEGORIES = rbgems
+
+DESCRIPTION = libcurl bindings for ruby
+define BLURB
+  libcurl biindings for ruby
+endef
+
+DISTFILES = 
+
+PACKAGES = CSWgem-curb
+CATALOGNAME = gem_curb
+
+LICENSE =
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/curb/checksums
===================================================================
--- csw/mgar/pkg/rbgems/curb/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/curb/checksums	2010-09-16 20:31:24 UTC (rev 10982)
@@ -0,0 +1 @@
+1b8db2c3e22d9a81c710a150c0e13ba1  curb-0.7.8.gem


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

From jdeppe at users.sourceforge.net  Thu Sep 16 22:44:30 2010
From: jdeppe at users.sourceforge.net (jdeppe at users.sourceforge.net)
Date: Thu, 16 Sep 2010 20:44:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10983] csw/mgar/pkg/rbgems/curb
Message-ID: <E1OwLJm-0008HN-1s@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10983
          http://gar.svn.sourceforge.net/gar/?rev=10983&view=rev
Author:   jdeppe
Date:     2010-09-16 20:44:29 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Reorg to standards

Added Paths:
-----------
    csw/mgar/pkg/rbgems/curb/branches/
    csw/mgar/pkg/rbgems/curb/tags/


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

From jdeppe at users.sourceforge.net  Thu Sep 16 22:44:53 2010
From: jdeppe at users.sourceforge.net (jdeppe at users.sourceforge.net)
Date: Thu, 16 Sep 2010 20:44:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10984] csw/mgar/pkg/rbgems/curb
Message-ID: <E1OwLK9-0008Hp-8A@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10984
          http://gar.svn.sourceforge.net/gar/?rev=10984&view=rev
Author:   jdeppe
Date:     2010-09-16 20:44:53 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Reorg to standards

Added Paths:
-----------
    csw/mgar/pkg/rbgems/curb/trunk/
    csw/mgar/pkg/rbgems/curb/trunk/Makefile
    csw/mgar/pkg/rbgems/curb/trunk/checksums

Added: csw/mgar/pkg/rbgems/curb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/curb/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/curb/trunk/Makefile	2010-09-16 20:44:53 UTC (rev 10984)
@@ -0,0 +1,17 @@
+GARNAME = curb
+GARVERSION = 0.7.8
+CATEGORIES = rbgems
+
+DESCRIPTION = libcurl bindings for ruby
+define BLURB
+  libcurl biindings for ruby
+endef
+
+DISTFILES = 
+
+PACKAGES = CSWgem-curb
+CATALOGNAME = gem_curb
+
+LICENSE =
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/curb/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/curb/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/curb/trunk/checksums	2010-09-16 20:44:53 UTC (rev 10984)
@@ -0,0 +1 @@
+1b8db2c3e22d9a81c710a150c0e13ba1  curb-0.7.8.gem


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

From jdeppe at users.sourceforge.net  Thu Sep 16 22:45:22 2010
From: jdeppe at users.sourceforge.net (jdeppe at users.sourceforge.net)
Date: Thu, 16 Sep 2010 20:45:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10985] csw/mgar/pkg/rbgems/curb
Message-ID: <E1OwLKc-0008Mp-4I@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10985
          http://gar.svn.sourceforge.net/gar/?rev=10985&view=rev
Author:   jdeppe
Date:     2010-09-16 20:45:21 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Reorg to standards

Removed Paths:
-------------
    csw/mgar/pkg/rbgems/curb/Makefile
    csw/mgar/pkg/rbgems/curb/checksums

Deleted: csw/mgar/pkg/rbgems/curb/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/curb/Makefile	2010-09-16 20:44:53 UTC (rev 10984)
+++ csw/mgar/pkg/rbgems/curb/Makefile	2010-09-16 20:45:21 UTC (rev 10985)
@@ -1,17 +0,0 @@
-GARNAME = curb
-GARVERSION = 0.7.8
-CATEGORIES = rbgems
-
-DESCRIPTION = libcurl bindings for ruby
-define BLURB
-  libcurl biindings for ruby
-endef
-
-DISTFILES = 
-
-PACKAGES = CSWgem-curb
-CATALOGNAME = gem_curb
-
-LICENSE =
-
-include gar/category.mk

Deleted: csw/mgar/pkg/rbgems/curb/checksums
===================================================================
--- csw/mgar/pkg/rbgems/curb/checksums	2010-09-16 20:44:53 UTC (rev 10984)
+++ csw/mgar/pkg/rbgems/curb/checksums	2010-09-16 20:45:21 UTC (rev 10985)
@@ -1 +0,0 @@
-1b8db2c3e22d9a81c710a150c0e13ba1  curb-0.7.8.gem


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

From jdeppe at users.sourceforge.net  Thu Sep 16 22:46:34 2010
From: jdeppe at users.sourceforge.net (jdeppe at users.sourceforge.net)
Date: Thu, 16 Sep 2010 20:46:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10986] csw/mgar/pkg/rbgems/curb/trunk/
Message-ID: <E1OwLLm-0008OC-4U@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10986
          http://gar.svn.sourceforge.net/gar/?rev=10986&view=rev
Author:   jdeppe
Date:     2010-09-16 20:46:33 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Added gar externals

Property Changed:
----------------
    csw/mgar/pkg/rbgems/curb/trunk/


Property changes on: csw/mgar/pkg/rbgems/curb/trunk
___________________________________________________________________
Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



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

From wahwah at users.sourceforge.net  Thu Sep 16 23:11:49 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 16 Sep 2010 21:11:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10987]
	csw/mgar/pkg/puppet/branches/puppet-2.6.x
Message-ID: <E1OwLkD-0002Ah-7B@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10987
          http://gar.svn.sourceforge.net/gar/?rev=10987&view=rev
Author:   wahwah
Date:     2010-09-16 21:11:48 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
puppet-2.6: The package builds now.

Modified Paths:
--------------
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums

Modified: csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2010-09-16 20:46:33 UTC (rev 10986)
+++ csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2010-09-16 21:11:48 UTC (rev 10987)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 GARNAME = puppet
-GARVERSION = 0.25.5
+GARVERSION = 2.6.1
 CATEGORIES = apps
 
 define BLURB
@@ -36,11 +36,9 @@
 # Disabling SMF support for puppetd.  There are problems with it.  It's a
 # better choice to run it from cron.
 # INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
-INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd
+INITSMF += /etc$(prefix)/init\.d/cswpuppetmasterd
 USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
 
-CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/cswpuppetd|class=none
-
 # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
 # service isn't started upon the installation of CSWpuppet.
 PACKAGES += CSWpuppetmaster
@@ -77,6 +75,8 @@
 
 CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
 CRONTABS = $(CRONDIR)/root
+CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none
+CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby
 
 include gar/category.mk
 
@@ -84,14 +84,14 @@
 	ginstall -m 755 -d $(DESTDIR)
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run
-	ginstall -m 755 -d $(DESTDIR)$(prefix)/etc/init.d
+	ginstall -m 755 -d $(DESTDIR)/etc$(prefix)/init.d
 	# $(sysconfdir)/pkg/<pkgname>/crontabs
 	ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
 	ginstall -m 644 \
 		$(FILEDIR)/CSWpuppet.cron.root \
 		$(DESTDIR)$(CRONDIR)/root
-	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(prefix)/etc/init.d
-	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(prefix)/etc/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)/etc$(prefix)/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
 	(cd $(WORKSRC) && \
 	gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
 	gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \

Modified: csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums	2010-09-16 20:46:33 UTC (rev 10986)
+++ csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums	2010-09-16 21:11:48 UTC (rev 10987)
@@ -1,7 +1 @@
-abaa404420106f9f28e9e1218b4e365b  0001-pkgutil-support.patch
-9c27c0cdca051eae986b56b91ef889ca  0002-Using-the-single-option-of-pkgutil.patch
-e3557aa5762e540cfe98b077c671dc54  CSWpuppet.cron.root
-0af8b2be6a2c9ecc6bb4a1878fcbefec  cswpuppetd
-aba2c79e589b9bd1c881a22aa663a213  cswpuppetmasterd
-3ab0d4f9801075bc78b68b766b496fc7  cswusergroup
-2988385801c967f7262cdf08640c9e07  puppet-0.25.5.tar.gz
+5cbdc667722ae60bbc24acca2e3494d6  puppet-2.6.1.tar.gz


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

From gadavis at users.sourceforge.net  Thu Sep 16 23:44:01 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 21:44:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10988] csw/mgar/pkg/netcdf/trunk/
Message-ID: <E1OwMFN-0003kH-FD@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10988
          http://gar.svn.sourceforge.net/gar/?rev=10988&view=rev
Author:   gadavis
Date:     2010-09-16 21:44:01 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Change trunk gar version to gar-fortran

Property Changed:
----------------
    csw/mgar/pkg/netcdf/trunk/


Property changes on: csw/mgar/pkg/netcdf/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-fortran



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

From gadavis at users.sourceforge.net  Fri Sep 17 00:04:23 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 22:04:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10989] csw/mgar/gar/v2-fortran
Message-ID: <E1OwMZ5-0002sx-20@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10989
          http://gar.svn.sourceforge.net/gar/?rev=10989&view=rev
Author:   gadavis
Date:     2010-09-16 22:04:22 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Merge in changes from v2 "trunk": svn merge -r 10927:HEAD ../v2

Modified Paths:
--------------
    csw/mgar/gar/v2-fortran/gar.lib.mk
    csw/mgar/gar/v2-fortran/gar.mk
    csw/mgar/gar/v2-fortran/lib/python/pkg-review-template.html
    csw/mgar/gar/v2-fortran/lib/python/pkgdb.py

Property Changed:
----------------
    csw/mgar/gar/v2-fortran/
    csw/mgar/gar/v2-fortran/pkglib/csw/depend


Property changes on: csw/mgar/gar/v2-fortran
___________________________________________________________________
Modified: svn:mergeinfo
   - /csw/mgar/gar/v2:4936-6678
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-sqlite:10434-10449
   + /csw/mgar/gar/v2:4936-6678,10928-10988
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-sqlite:10434-10449

Modified: csw/mgar/gar/v2-fortran/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-fortran/gar.lib.mk	2010-09-16 21:44:01 UTC (rev 10988)
+++ csw/mgar/gar/v2-fortran/gar.lib.mk	2010-09-16 22:04:22 UTC (rev 10989)
@@ -629,6 +629,41 @@
 	@( cd $* ; $(BUILD_ENV) python ./setup.py $(PYBUILD_CMD) $(BUILD_ARGS) )
 	@$(MAKECOOKIE)
 
+#################### CLEAN RULES ####################
+
+CLEAN_ARGS ?= clean
+ 
+# build from a standard gnu-style makefile's default rule.
+clean-%/Makefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/makefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/GNUmakefile:
+	@echo " ==> Running clean in $*"
+	@$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS)
+	@rm -f $(COOKIEDIR)/build-$*
+
+clean-%/Jamfile:
+	$(error *** Don't know how to clean Jamfiles)
+
+clean-%/Rakefile:
+	$(error *** Don't know how to clean Rakefiles)
+
+clean-%/rakefile:
+	$(error *** Don't know how to clean Rakefiles)
+
+clean-%/setup.rb:
+	$(error *** Don't know how to clean Ruby setups)
+
+clean-%/setup.py:
+	$(error *** Don't know how to clean Python builds)
+
 #################### TEST RULES ####################
 
 TEST_TARGET ?= test

Modified: csw/mgar/gar/v2-fortran/gar.mk
===================================================================
--- csw/mgar/gar/v2-fortran/gar.mk	2010-09-16 21:44:01 UTC (rev 10988)
+++ csw/mgar/gar/v2-fortran/gar.mk	2010-09-16 22:04:22 UTC (rev 10989)
@@ -151,6 +151,7 @@
 $(call _modulate_target,build,$(2),$(4))
 $(call _modulate_target_nocookie,reset-build,$(2),$(4))
 $(call _modulate_target,test,$(2),$(4))
+$(call _modulate_target_nocookie,reset-test,$(2),$(4))
 $(call _modulate_target,install,$(2),$(4))
 $(call _modulate_target_nocookie,reset-install,$(2),$(4))
 #$(call _modulate_target,merge,$(2),$(4))
@@ -404,7 +405,9 @@
 extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \
 		$(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \
 		announce-modulation \
-		pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter global,$(MODULATION)),,post-extract-gitsnap)
+		pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \
+		$(if $(filter global,$(MODULATION)),,post-extract-gitsnap) \
+		$(foreach FILE,$(EXPANDVARS),expandvars-$(FILE))
 	@$(DONADA)
 
 # This target ensures that the values used by git when making a commit
@@ -442,6 +445,15 @@
 extract-p:
 	@$(foreach COOKIEFILE,$(EXTRACT_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
 
+# The rule takes all files from EXPANDVARS and replaces all occurrences of @<var>@ in the file
+# with the values of <var> from the Makefile.
+_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR)))
+
+expandvars-%:
+	$(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$*
+	@$(MAKECOOKIE)
+
+
 # checkpatch	- Do a "patch -C" instead of a "patch".  Note
 # 				  that it may give incorrect results if multiple
 # 				  patches deal with the same file.
@@ -555,6 +567,7 @@
 reset-configure: $(addprefix reset-configure-,$(MODULATIONS))
 	rm -f $(COOKIEDIR)/configure
 
+# XXX: pre-*, post-*
 reset-configure-modulated:
 	rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS))
 
@@ -578,6 +591,16 @@
 build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated
 	@$(MAKECOOKIE)
 
+.PHONY: reset-build reset-build-modulated
+rebuild: reset-build build
+
+reset-build: $(addprefix reset-build-,$(MODULATIONS))
+	rm -f $(COOKIEDIR)/build
+
+# XXX: pre-*, post-*
+reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS))
+	rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS) post-build-modulated))
+
 # returns true if build has completed successfully, false
 # otherwise
 build-p:
@@ -591,6 +614,8 @@
 test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated
 	$(DONADA)
 
+# XXX: retest
+
 # strip - Strip executables
 ifneq ($(GARFLAVOR),DBG)
 POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS)

Modified: csw/mgar/gar/v2-fortran/lib/python/pkg-review-template.html
===================================================================
--- csw/mgar/gar/v2-fortran/lib/python/pkg-review-template.html	2010-09-16 21:44:01 UTC (rev 10988)
+++ csw/mgar/gar/v2-fortran/lib/python/pkg-review-template.html	2010-09-16 22:04:22 UTC (rev 10989)
@@ -50,6 +50,18 @@
   margin: 0px;
   padding: 2px;
 }
+ul.error_tags li {
+  list-style: none;
+  background-color: #FDD;
+  padding: 0px;
+  margin: 0px;
+}
+ul.overrides li {
+  list-style: none;
+  background-color: #FFD;
+  padding: 0px;
+  margin: 0px;
+}
 </style>
 </head>
 <body>
@@ -75,6 +87,8 @@
   </h2>
       <ul>
         <li><a href="#${pkg.basic_stats.md5_sum}-pkginfo">pkginfo</a></li>
+        <li><a href="#${pkg.basic_stats.md5_sum}-error_tags">error tags</a></li>
+        <li><a href="#${pkg.basic_stats.md5_sum}-overrides">overrides</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-binaries_dump_info">binaries_dump_info</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-depends">depends</a></li>
         <li><a href="#${pkg.basic_stats.md5_sum}-files_metadata">files_metadata</a></li>
@@ -192,6 +206,49 @@
   </tr>
 #end for
   </table>
+
+  <h2>
+    <a name="${pkg.basic_stats.md5_sum}-error_tags">
+      Error tags
+    </a>
+  </h2>
+#if $pkg.error_tags
+  <ul class="error_tags">
+#for etag in $pkg.error_tags
+  <li>
+      <code>
+        $etag.pkgname
+        $etag.tag_name
+        $etag.tag_info
+      </code>
+    </li>
+#end for
+  </ul>
+#else
+  <p>No error tags.</p>
+#end if
+
+  <h2>
+    <a name="${pkg.basic_stats.md5_sum}-overrides">
+      Overrides
+    </a>
+  </h2>
+#if $pkg.overrides
+  <ul class="overrides">
+#for override in $pkg.overrides
+    <li>
+      <code>
+        $override.pkgname
+        $override.tag_name
+        $override.tag_info
+      </code>
+    </li>
+#end for
+  </ul>
+#else
+  <p>No overrides.</p>
+#end if
+
 #if $pkg.binaries_dump_info
   <h2>
     <a name="${pkg.basic_stats.md5_sum}-binaries_dump_info">

Modified: csw/mgar/gar/v2-fortran/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2-fortran/lib/python/pkgdb.py	2010-09-16 21:44:01 UTC (rev 10988)
+++ csw/mgar/gar/v2-fortran/lib/python/pkgdb.py	2010-09-16 22:04:22 UTC (rev 10989)
@@ -35,7 +35,62 @@
 stats_version:  $stats_version
 """
 
+DEFAULT_TEMPLATE_FILENAME = "../lib/python/pkg-review-template.html"
 
+
+class HtmlGenerator(object):
+
+  def __init__(self, md5_sums, template=None):
+    self.md5_sums = md5_sums
+    self.template = template
+
+  def GetErrorTagsResult(self, srv4):
+    res = m.CheckpkgErrorTag.select(
+        m.CheckpkgErrorTag.q.srv4_file==srv4)
+    return res
+
+  def GetOverrideResult(self, srv4):
+    res = m.CheckpkgOverride.select(
+        m.CheckpkgOverride.q.srv4_file==srv4)
+    return res
+
+  def GenerateHtml(self):
+    pkgstats = []
+    # Add error tags
+    for md5_sum in self.md5_sums:
+      srv4 = GetPkg(md5_sum)
+      data = cPickle.loads(str(srv4.data))
+      if "OPENCSW_REPOSITORY" in data["pkginfo"]:
+        build_src = data["pkginfo"]["OPENCSW_REPOSITORY"]
+        build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src)
+        build_src_url_trac = re.sub(
+            r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)',
+            r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3',
+            build_src)
+      else:
+        build_src = None
+        build_src_url_svn = None
+        build_src_url_trac = None
+      data["build_src"] = build_src
+      data["build_src_url_svn"] = build_src_url_svn
+      data["build_src_url_trac"] = build_src_url_trac
+      data["error_tags"] = list(self.GetErrorTagsResult(srv4))
+      data["overrides"] = list(self.GetOverrideResult(srv4))
+      pkgstats.append(data)
+    # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py".
+    if not self.template:
+      tmpl_filename = os.path.join(os.path.split(__file__)[0],
+                                   DEFAULT_TEMPLATE_FILENAME)
+    else:
+      tmpl_filename = self.template
+    tmpl_str = open(tmpl_filename, "r").read()
+    t = Template(tmpl_str, searchList=[{
+      "pkgstats": pkgstats,
+      "hachoir_machines": package_checks.HACHOIR_MACHINES,
+      }])
+    return unicode(t)
+
+
 def GetPkg(some_id):
   logging.debug("Selecting from db: %s", repr(some_id))
   res = m.Srv4FileStats.select(
@@ -99,41 +154,8 @@
       t = Template(SHOW_PKG_TMPL, searchList=[srv4])
       sys.stdout.write(unicode(t))
   if command == 'gen-html':
-    pkgstats = []
-    # Add error tags
-    for md5_sum in md5_sums:
-      srv4 = GetPkg(md5_sum)
-      data = cPickle.loads(str(srv4.data))
-      if "OPENCSW_REPOSITORY" in data["pkginfo"]:
-        build_src = data["pkginfo"]["OPENCSW_REPOSITORY"]
-        build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src)
-        build_src_url_trac = re.sub(
-            r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)',
-            r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3',
-            build_src)
-      else:
-        build_src = None
-        build_src_url_svn = None
-        build_src_url_trac = None
-      data["build_src"] = build_src
-      data["build_src_url_svn"] = build_src_url_svn
-      data["build_src_url_trac"] = build_src_url_trac
-      pkgstats.append(data)
-    # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py".
-    if not options.pkg_review_template:
-      tmpl_filename = os.path.join(os.path.split(__file__)[0],
-                                   "..",
-                                   "lib",
-                                   "python",
-                                   "pkg-review-template.html")
-    else:
-      tmpl_filename = options.pkg_review_template
-    tmpl_str = open(tmpl_filename, "r").read()
-    t = Template(tmpl_str, searchList=[{
-      "pkgstats": pkgstats,
-      "hachoir_machines": package_checks.HACHOIR_MACHINES,
-      }])
-    sys.stdout.write(unicode(t))
+    g = HtmlGenerator(md5_sums, options.pkg_review_template)
+    sys.stdout.write(g.GenerateHtml())
 
 
 if __name__ == '__main__':


Property changes on: csw/mgar/gar/v2-fortran/pkglib/csw/depend
___________________________________________________________________
Modified: svn:mergeinfo
   - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
/csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449
   + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678,10928-10988
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
/csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449


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

From gadavis at users.sourceforge.net  Fri Sep 17 00:07:48 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 22:07:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10990]
	csw/mgar/gar/v2-fortran/gar.conf.mk
Message-ID: <E1OwMcO-0002zz-6I@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10990
          http://gar.svn.sourceforge.net/gar/?rev=10990&view=rev
Author:   gadavis
Date:     2010-09-16 22:07:47 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Fix value of FC for GCC3

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

Modified: csw/mgar/gar/v2-fortran/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-16 22:04:22 UTC (rev 10989)
+++ csw/mgar/gar/v2-fortran/gar.conf.mk	2010-09-16 22:07:47 UTC (rev 10990)
@@ -480,7 +480,7 @@
    SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77
    SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77
  SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77
-     GCC3_FC ?= $(GCC3_CC_HOME)/bin/f77
+     GCC3_FC ?= $(GCC3_CC_HOME)/bin/g77
      GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran
     SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95
     SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95


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

From gadavis at users.sourceforge.net  Fri Sep 17 00:29:30 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 22:29:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10991]
	csw/mgar/pkg/netcdf/trunk/Makefile
Message-ID: <E1OwMxO-0005BA-0D@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10991
          http://gar.svn.sourceforge.net/gar/?rev=10991&view=rev
Author:   gadavis
Date:     2010-09-16 22:29:29 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Manual merge of changes from branch gar-fortran 109663:10990

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 22:07:47 UTC (rev 10990)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 22:29:29 UTC (rev 10991)
@@ -33,21 +33,35 @@
 		 --with-zlib=/opt/csw
 
 ## 64 bit build fails in fortran binding tests
-## Disabling 64 bit builds until we can tweak GAR to handle Fortran  & ARCH
-BUILD64 = 0
+BUILD64 = 1
 
 ## Needed for "Large file support" in NetCDF
 EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
-## Can't use Sun Studio with shared libs:
-##  * non-redistributable libs in /opt/SUNWspro prevent Sun Studio
-## Can't use GCC4
-##  * C++ is way broken for 32-bit Sparc
-##    During the 32-bit sparc build, the C++ bindings were barfing with an error
-##    about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
-##    http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
-##  * Fortran to C bindings fail test on 64-bit sparc
+## non-redistributable libs in /opt/SUNWspro
 GARCOMPILER = GCC3
 
 DEBUG_PACKAGING = 1
+## Add GCC4 lib dir to CFLAGS and friends because gcc3core_rt puts it's 
+## libgcc_s.so in /opt/csw/lib and this breaks the build in all sorts of weird 
+## places.
+## Rationale: Automake keeps wanting to put /opt/csw/lib in the front of the 
+## -L options during the linking phase, so the GCC3 libgcc_s gets pulled in 
+## first and an unresolved symbol error occurs. By adding to the 
+## CFLAGS/FFLAGS/FCFLAGS/CXXFLAGS, it is pulled in before AM_LDFLAGS in the 
+## linking stage in most automake-generated Makefiles. Ugly hack but it works.
+##
+## Adding -dalign to *FLAGS in attempt to fix bus error in nf_test/ftst_vars4
+## in fuction nf_put_vlen_element
+#EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+## OPT_FLAGS_GCC = -O2 -pipe
 include gar/category.mk
+
+## During the 32-bit sparc build, the C++ bindings were barfing with an error 
+## about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
+## Per http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html
+## replacing -march=v8 with -m32 seems to solve the problem
+ARCHFLAGS_GCC4_sparcv8 = -m32 -mcpu=v8


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

From gadavis at users.sourceforge.net  Fri Sep 17 00:51:06 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 22:51:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10992]
	csw/mgar/pkg/netcdf/trunk/Makefile
Message-ID: <E1OwNII-0005q8-GB@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10992
          http://gar.svn.sourceforge.net/gar/?rev=10992&view=rev
Author:   gadavis
Date:     2010-09-16 22:51:06 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Fix build on opencsw farm, disable f90 build since we're using GCC3

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 22:29:29 UTC (rev 10991)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 22:51:06 UTC (rev 10992)
@@ -19,12 +19,14 @@
 ## building 64-bit
 BUILD_ARGS = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
 
+CONFIGURE_ENV = F77=$(F77) FC=$(FC) CC=$(CC) CXX=$(CXX)
 CONFIGURE_ARGS = $(DIRPATHS) \
 		 --enable-netcdf-4 \
 		 --enable-dap \
 		 --enable-ncgen4 \
 		 --enable-shared \
 		 --enable-separate-fortran \
+		 --disable-f90 \
 		 --enable-cxx4 \
 		 --enable-docs-install \
 		 --enable-udunits \


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

From gadavis at users.sourceforge.net  Fri Sep 17 01:19:57 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 23:19:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10993]
	csw/mgar/pkg/netcdf/branches/netcdf-4/
Message-ID: <E1OwNkD-00056q-JE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10993
          http://gar.svn.sourceforge.net/gar/?rev=10993&view=rev
Author:   gadavis
Date:     2010-09-16 23:19:57 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Splitting build steps for netcdf v4 out prior to backrev

Added Paths:
-----------
    csw/mgar/pkg/netcdf/branches/netcdf-4/


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

From gadavis at users.sourceforge.net  Fri Sep 17 01:20:54 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Thu, 16 Sep 2010 23:20:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10994] csw/mgar/pkg/netcdf/trunk
Message-ID: <E1OwNl8-0007RF-1J@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10994
          http://gar.svn.sourceforge.net/gar/?rev=10994&view=rev
Author:   gadavis
Date:     2010-09-16 23:20:53 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
4.x fails tests under solaris 9, backreving to 3.6.3

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 23:19:57 UTC (rev 10993)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-09-16 23:20:53 UTC (rev 10994)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = netcdf
-GARVERSION = 4.1.1
+GARVERSION = 3.6.3
 CATEGORIES = lib
 DESCRIPTION = machine-independent data formats for array-oriented scientific data
 SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/
@@ -21,18 +21,10 @@
 
 CONFIGURE_ENV = F77=$(F77) FC=$(FC) CC=$(CC) CXX=$(CXX)
 CONFIGURE_ARGS = $(DIRPATHS) \
-		 --enable-netcdf-4 \
-		 --enable-dap \
-		 --enable-ncgen4 \
 		 --enable-shared \
 		 --enable-separate-fortran \
 		 --disable-f90 \
-		 --enable-cxx4 \
-		 --enable-docs-install \
-		 --enable-udunits \
-		 --disable-logging \
-		 --with-hdf5=/opt/csw \
-		 --with-zlib=/opt/csw
+		 --enable-docs-install
 
 ## 64 bit build fails in fortran binding tests
 BUILD64 = 1

Modified: csw/mgar/pkg/netcdf/trunk/checksums
===================================================================
--- csw/mgar/pkg/netcdf/trunk/checksums	2010-09-16 23:19:57 UTC (rev 10993)
+++ csw/mgar/pkg/netcdf/trunk/checksums	2010-09-16 23:20:53 UTC (rev 10994)
@@ -1 +1 @@
-79c5ff14c80d5e18dd8f1fceeae1c8e1  netcdf-4.1.1.tar.gz
+334e9bdc010b6cd03fd6531a45fe50ad  netcdf-3.6.3.tar.gz


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

From dmichelsen at users.sourceforge.net  Fri Sep 17 23:24:58 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 17 Sep 2010 21:24:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[10995]
 csw/mgar/pkg/libserf/tags/libserf-0.6.1, REV=2010.05 .18/
Message-ID: <E1OwiQU-0000Rf-Fe@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10995
          http://gar.svn.sourceforge.net/gar/?rev=10995&view=rev
Author:   dmichelsen
Date:     2010-09-17 21:24:58 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
libser: Tag 0.6.1,REV=2010.05.18

Added Paths:
-----------
    csw/mgar/pkg/libserf/tags/libserf-0.6.1,REV=2010.05.18/


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 Sep 17 23:26:10 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 17 Sep 2010 21:26:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10996] csw/mgar/pkg/libserf/trunk
Message-ID: <E1OwiRe-0000yM-La@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10996
          http://gar.svn.sourceforge.net/gar/?rev=10996&view=rev
Author:   dmichelsen
Date:     2010-09-17 21:26:10 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
libserf: Update to 0.7.0

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

Removed Paths:
-------------
    csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2010-09-17 21:24:58 UTC (rev 10995)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2010-09-17 21:26:10 UTC (rev 10996)
@@ -1,5 +1,5 @@
 GARNAME = libserf
-GARVERSION = 0.6.1
+GARVERSION = 0.7.0
 DISTNAME = serf-$(GARVERSION)
 CATEGORIES = lib
 
@@ -14,7 +14,6 @@
 
 MASTER_SITES = http://serf.googlecode.com/files/
 DISTFILES  = $(DISTNAME).tar.bz2
-PATCHFILES = 0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
 
 RUNTIME_DEP_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
 
@@ -23,6 +22,8 @@
 
 LICENSE = LICENSE
 
+VENDOR_URL = http://code.google.com/p/serf/
+
 # Make sure the current directory comes before everything else
 INCLUDE_FLAGS = -I. -I$(includedir)
 
@@ -43,7 +44,6 @@
 
 include gar/category.mk
 
-#EXTRA_LDFLAGS = -R/opt/csw/bdb44/lib
 APR_LIBTOOL = $(shell /opt/csw/apache2/bin/apr-config --apr-libtool)
 post-configure-modulated:
 	gcp $(APR_LIBTOOL) $(WORKSRC)

Modified: csw/mgar/pkg/libserf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libserf/trunk/checksums	2010-09-17 21:24:58 UTC (rev 10995)
+++ csw/mgar/pkg/libserf/trunk/checksums	2010-09-17 21:26:10 UTC (rev 10996)
@@ -1,2 +1 @@
-85656f49ab1a0a811b620f4b177d8c5a  0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
-14267fa2b49aa3484366e713970384a5  serf-0.6.1.tar.bz2
+5c4b6d8b44135abbde289b49122bb7af  serf-0.7.0.tar.bz2

Deleted: csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
===================================================================
--- csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch	2010-09-17 21:24:58 UTC (rev 10995)
+++ csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch	2010-09-17 21:26:10 UTC (rev 10996)
@@ -1,25 +0,0 @@
-From 6c411f42f71cab30ee81d30b142596ad331cdeb8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 17 May 2010 22:15:13 +0200
-Subject: [PATCH] Do not cast lvalue as left side is already of type char*
-
----
- outgoing.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/outgoing.c b/outgoing.c
-index 11d58aa..b4b3a50 100644
---- a/outgoing.c
-+++ b/outgoing.c
-@@ -470,7 +470,7 @@ static apr_status_t socket_writev(serf_connection_t *conn)
-                             sizeof(struct iovec) * (conn->vec_len - i));
-                     conn->vec_len -= i;
-                 }
--                ((char *) conn->vec[0].iov_base) += conn->vec[0].iov_len - (len - written);
-+                conn->vec[0].iov_base += conn->vec[0].iov_len - (len - written);
-                 conn->vec[0].iov_len = len - written;
-                 break;
-             }
--- 
-1.7.0
-


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 Sep 18 03:37:06 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 18 Sep 2010 01:37:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10997]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OwmMU-0003Jm-1Q@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10997
          http://gar.svn.sourceforge.net/gar/?rev=10997&view=rev
Author:   bdwalton
Date:     2010-09-18 01:37:05 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: add basic split out package metainfo

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-17 21:26:10 UTC (rev 10996)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:37:05 UTC (rev 10997)
@@ -18,8 +18,28 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
-PACKAGES  = CSWapache2
+PACKAGES  = CSWapache2 CSWapache2rt CSWapache2c
+PACKAGES += CSWapache2-devel CSWapache2-manual
+PACKAGES += CSWap2prefork CSWap2worker CSWap2suexec
 
+CATALOGNAME_CSWapache2 = apache2
+CATALOGNAME_CSWapache2rt = apache2rt
+CATALOGNAME_CSWapache2c = apache2c
+CATALOGNAME_CSWapache2-devel = apache2_devel
+CATALOGNAME_CSWapache2-manual = apache2_manual
+CATALOGNAME_CSWap2prefork = ap2_prefork
+CATALOGNAME_CSWap2worker = ap2_worker
+CATALOGNAME_CSWap2suexec = ap2_suexec
+
+SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
+SPKG_DESC_CSWapache2rt = A high performance Unix-based HTTP server.
+SPKG_DESC_CSWapache2c = A high performance Unix-based HTTP server.
+SPKG_DESC_CSWapache2-devel = The development files for Apache2.
+SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
+SPKG_DESC_CSWap2prefork = The standard preforking mpm for Apache2.
+SPKG_DESC_CSWap2worker = The standard threaded worker mpm for Apache2.
+SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
+
 # Standard package bits
 DISTFILES += CSWapache2.killproc cswapache2
 
@@ -29,9 +49,19 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
-RUNTIME_DEP_PKGS_CSWapache2        = CSWexpat CSWiconv
-RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
+RUNTIME_DEP_PKGS_CSWapache2	   = CSWapache2c CSWap2prefork
+RUNTIME_DEP_PKGS_CSWapache2c       = CSWexpat CSWiconv
+RUNTIME_DEP_PKGS_CSWapache2c      += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2c      += CSWapr CSWapr-util CSWbdb48
+RUNTIME_DEP_PKGS_CSWapache2c	   = CSWapache2rt
+RUNTIME_DEP_PKGS_CSWapache2rt      = CSWexpat CSWiconv
+RUNTIME_DEP_PKGS_CSWapache2rt     += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2rt     += CSWapr CSWapr-util CSWbdb48
+RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
+RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2prefork	   = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2worker	   = CSWapache2
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib


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 Sep 18 03:48:30 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 18 Sep 2010 01:48:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10998]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OwmXW-0007fR-1U@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10998
          http://gar.svn.sourceforge.net/gar/?rev=10998&view=rev
Author:   bdwalton
Date:     2010-09-18 01:48:29 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: add an untested cut at modulating in order to build multiple mpms

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:37:05 UTC (rev 10997)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:48:29 UTC (rev 10998)
@@ -13,6 +13,13 @@
 # work around dumb checkpkg not recognizing the license file ...
 LICENSE = LICENSE
 
+# Build multiple mpm's and merge them all into one install
+EXTRA_MODULATORS = MPM
+MODULATIONS_MPM = prefork worker
+
+MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
+MERGE_SCRIPTS_isa-default-mpm-worker = copy-only
+
 include files/config.mk
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -78,10 +85,9 @@
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
-CONFIGURE_ARGS += --with-mpm=prefork
+CONFIGURE_ARGS += --with-mpm=$(MPM)
 CONFIGURE_ARGS += --disable-static
 
-
 # Fixup target variables
 APACHE_ROOT   = $(DESTDIR)$(prefix)/apache2
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib


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 Sep 18 03:57:44 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 18 Sep 2010 01:57:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[10999]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OwmgS-0003tj-Rd@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10999
          http://gar.svn.sourceforge.net/gar/?rev=10999&view=rev
Author:   bdwalton
Date:     2010-09-18 01:57:44 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: use distinct descriptions

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:48:29 UTC (rev 10998)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:57:44 UTC (rev 10999)
@@ -39,8 +39,8 @@
 CATALOGNAME_CSWap2suexec = ap2_suexec
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
-SPKG_DESC_CSWapache2rt = A high performance Unix-based HTTP server.
-SPKG_DESC_CSWapache2c = A high performance Unix-based HTTP server.
+SPKG_DESC_CSWapache2rt = Apache2 runtime support.
+SPKG_DESC_CSWapache2c = Apache2 core files.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2prefork = The standard preforking mpm for Apache2.


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 Sep 18 04:33:18 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 18 Sep 2010 02:33:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[11000]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OwnEs-0004oV-64@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11000
          http://gar.svn.sourceforge.net/gar/?rev=11000&view=rev
Author:   bdwalton
Date:     2010-09-18 02:33:17 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: make postinstall step modulation specific

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 01:57:44 UTC (rev 10999)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 02:33:17 UTC (rev 11000)
@@ -109,7 +109,7 @@
 
 rename-httpd:
 	@if test -f $(APACHE_ROOT)/sbin/httpd ; then \
-	    ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.prefork ) ; \
+	    ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \
 	fi
 
 # Copy in specialized templates


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 Sep 18 16:52:55 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 18 Sep 2010 14:52:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[11001]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Owymd-0004li-Fc@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11001
          http://gar.svn.sourceforge.net/gar/?rev=11001&view=rev
Author:   bdwalton
Date:     2010-09-18 14:52:55 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: correct merge scripts; only build modules for prefork mpm

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 02:33:17 UTC (rev 11000)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 14:52:55 UTC (rev 11001)
@@ -18,7 +18,7 @@
 MODULATIONS_MPM = prefork worker
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
-MERGE_SCRIPTS_isa-default-mpm-worker = copy-only
+MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
 
 include files/config.mk
 
@@ -87,6 +87,9 @@
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
 CONFIGURE_ARGS += --with-mpm=$(MPM)
 CONFIGURE_ARGS += --disable-static
+ifneq ($(MPM),prefork)
+CONFIGURE_ARGS += --enable-modules=none
+endif
 
 # Fixup target variables
 APACHE_ROOT   = $(DESTDIR)$(prefix)/apache2


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

From bdwalton at users.sourceforge.net  Sun Sep 19 04:19:53 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 02:19:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[11002]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Ox9VR-0007f5-4n@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11002
          http://gar.svn.sourceforge.net/gar/?rev=11002&view=rev
Author:   bdwalton
Date:     2010-09-19 02:19:52 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: might as well build the event mpm too

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 14:52:55 UTC (rev 11001)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 02:19:52 UTC (rev 11002)
@@ -15,7 +15,7 @@
 
 # Build multiple mpm's and merge them all into one install
 EXTRA_MODULATORS = MPM
-MODULATIONS_MPM = prefork worker
+MODULATIONS_MPM = prefork worker event
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
 MERGE_SCRIPTS_isa-default-mpm-worker = copy-all


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

From bdwalton at users.sourceforge.net  Sun Sep 19 04:21:40 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 02:21:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[11003]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Ox9XA-0006Qd-1F@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11003
          http://gar.svn.sourceforge.net/gar/?rev=11003&view=rev
Author:   bdwalton
Date:     2010-09-19 02:21:39 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: build all modules as .so when we're building prefork

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 02:19:52 UTC (rev 11002)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 02:21:39 UTC (rev 11003)
@@ -89,6 +89,8 @@
 CONFIGURE_ARGS += --disable-static
 ifneq ($(MPM),prefork)
 CONFIGURE_ARGS += --enable-modules=none
+else
+CONFIGURE_ARGS += --enable-mods-shared=all
 endif
 
 # Fixup target variables


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

From bdwalton at users.sourceforge.net  Sun Sep 19 04:38:07 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 02:38:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[11004] csw/mgar/pkg/ruby/trunk/Makefile
Message-ID: <E1Ox9n5-0008BW-Dk@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11004
          http://gar.svn.sourceforge.net/gar/?rev=11004&view=rev
Author:   bdwalton
Date:     2010-09-19 02:38:07 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
ruby: standard rbconfig is .SOS12 now, not .SOS11

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

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-09-19 02:21:39 UTC (rev 11003)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-09-19 02:38:07 UTC (rev 11004)
@@ -130,9 +130,9 @@
 
 multiconfig:
 	@echo "Setting up the CSW rbconfig stuff so we can switch between compilers"
-	@mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11
+	@mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12
 	@gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4
-	@gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG)
+	@gln -n -s $(RBCONFIG).SOS12 $(DESTDIR)$(RBCONFIG)
 	@gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/
 	@chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig
 	@ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/


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

From bdwalton at users.sourceforge.net  Sun Sep 19 05:00:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 03:00:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[11005]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxA8V-0007lx-Q3@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11005
          http://gar.svn.sourceforge.net/gar/?rev=11005&view=rev
Author:   bdwalton
Date:     2010-09-19 03:00:15 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: set merge script for event mpm

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 02:38:07 UTC (rev 11004)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 03:00:15 UTC (rev 11005)
@@ -19,6 +19,7 @@
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
 MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
+MERGE_SCRIPTS_isa-default-mpm-event = copy-all
 
 include files/config.mk
 


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

From bdwalton at users.sourceforge.net  Sun Sep 19 05:11:18 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 03:11:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[11006]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxAJC-0006Ey-Ko@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11006
          http://gar.svn.sourceforge.net/gar/?rev=11006&view=rev
Author:   bdwalton
Date:     2010-09-19 03:11:18 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: add package for the event mpm

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 03:00:15 UTC (rev 11005)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 03:11:18 UTC (rev 11006)
@@ -28,7 +28,7 @@
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2rt CSWapache2c
 PACKAGES += CSWapache2-devel CSWapache2-manual
-PACKAGES += CSWap2prefork CSWap2worker CSWap2suexec
+PACKAGES += CSWap2prefork CSWap2worker CSWap2event CSWap2suexec
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2rt = apache2rt
@@ -37,6 +37,7 @@
 CATALOGNAME_CSWapache2-manual = apache2_manual
 CATALOGNAME_CSWap2prefork = ap2_prefork
 CATALOGNAME_CSWap2worker = ap2_worker
+CATALOGNAME_CSWap2event = ap2_event
 CATALOGNAME_CSWap2suexec = ap2_suexec
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
@@ -46,6 +47,7 @@
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2prefork = The standard preforking mpm for Apache2.
 SPKG_DESC_CSWap2worker = The standard threaded worker mpm for Apache2.
+SPKG_DESC_CSWap2event = The standard event mpm for Apache2.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
 
 # Standard package bits


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

From bdwalton at users.sourceforge.net  Sun Sep 19 08:44:39 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 06:44:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[11007]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxDdf-0007wK-Q7@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11007
          http://gar.svn.sourceforge.net/gar/?rev=11007&view=rev
Author:   bdwalton
Date:     2010-09-19 06:44:39 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: add a first (rough) cut at package splitting

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 03:11:18 UTC (rev 11006)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 06:44:39 UTC (rev 11007)
@@ -101,6 +101,18 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
+PKGFILES_CSWapache2c = $(libexecdir)/.*so $(sysconfdir)/.* $(sbindir)/.*
+PKGFILES_CSWapache2c = $(sharedstatedir)/.* $(localstatedir)/.*
+PKGFILES_CSWapache2rt = $(bindir)/ap.*config $(mandir)/man8/.*apxs.*
+PKGFILES_CSWapache2rt += $(libdir)/.*apr.* $(libdir)/apr-util-1/.*
+PKGFILES_CSWapache2rt += $(sharedstatedir)/build/.*  $(sbindir)/apxs
+PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork
+PKGFILES_CSWap2event = $(sbindir)/httpd.event
+PKGFILES_CSWap2worker = $(sbindir)/httpd.worker
+PKGFILES_CSWap2suexec = .*suexec.*
+PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWapache2-manual = $(docdir)/manual/.* $(sysconfdir)/extra/httpd-manual.conf
+
 include gar/category.mk
 include files/rules.mk
 


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

From bdwalton at users.sourceforge.net  Sun Sep 19 08:49:28 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 06:49:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[11008]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxDiK-0005Xr-EZ@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11008
          http://gar.svn.sourceforge.net/gar/?rev=11008&view=rev
Author:   bdwalton
Date:     2010-09-19 06:49:27 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: add a makecookie for the pre-configure step

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 06:44:39 UTC (rev 11007)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 06:49:27 UTC (rev 11008)
@@ -84,6 +84,7 @@
 
 pre-configure-modulated:
 	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
+	$(MAKECOOKIE)
 
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config


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

From bdwalton at users.sourceforge.net  Sun Sep 19 09:28:53 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 07:28:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[11009]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxEKT-00056G-0d@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11009
          http://gar.svn.sourceforge.net/gar/?rev=11009&view=rev
Author:   bdwalton
Date:     2010-09-19 07:28:52 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: tweak pkgfiles to work with funky prefix stuff

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 06:49:27 UTC (rev 11008)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 07:28:52 UTC (rev 11009)
@@ -102,17 +102,17 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
-PKGFILES_CSWapache2c = $(libexecdir)/.*so $(sysconfdir)/.* $(sbindir)/.*
-PKGFILES_CSWapache2c = $(sharedstatedir)/.* $(localstatedir)/.*
-PKGFILES_CSWapache2rt = $(bindir)/ap.*config $(mandir)/man8/.*apxs.*
-PKGFILES_CSWapache2rt += $(libdir)/.*apr.* $(libdir)/apr-util-1/.*
-PKGFILES_CSWapache2rt += $(sharedstatedir)/build/.*  $(sbindir)/apxs
-PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork
-PKGFILES_CSWap2event = $(sbindir)/httpd.event
-PKGFILES_CSWap2worker = $(sbindir)/httpd.worker
-PKGFILES_CSWap2suexec = .*suexec.*
+PKGFILES_CSWapache2c = .*libexecdir/.*so .*etc/.*
+PKGFILES_CSWapache2c = .*share/.* .*var/.*
+PKGFILES_CSWapache2rt = .*/bin/ap.*config .*man/man8/.*apxs.*
+PKGFILES_CSWapache2rt += .*lib/.*apr.* .*lib/apr-util-1/.*
+PKGFILES_CSWapache2rt += .*share/build/.*  .*sbin/apxs
+PKGFILES_CSWap2prefork = .*sbin/httpd.prefork
+PKGFILES_CSWap2event = .*sbin/httpd.event
+PKGFILES_CSWap2worker = .*sbin/httpd.worker
+PKGFILES_CSWap2suexec = .*sbin/suexec .*libexecdir/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWapache2-manual = $(docdir)/manual/.* $(sysconfdir)/extra/httpd-manual.conf
+PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 
 include gar/category.mk
 include files/rules.mk


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

From bdwalton at users.sourceforge.net  Sun Sep 19 15:28:34 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 13:28:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[11010]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxJwY-0001Wp-L8@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11010
          http://gar.svn.sourceforge.net/gar/?rev=11010&view=rev
Author:   bdwalton
Date:     2010-09-19 13:28:34 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: more pkgfiles splitting tweaks (no bundled apr)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 07:28:52 UTC (rev 11009)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:28:34 UTC (rev 11010)
@@ -102,11 +102,10 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
+PKGFILES_CSWapache2 = /opt/csw/apache2/
 PKGFILES_CSWapache2c = .*libexecdir/.*so .*etc/.*
 PKGFILES_CSWapache2c = .*share/.* .*var/.*
-PKGFILES_CSWapache2rt = .*/bin/ap.*config .*man/man8/.*apxs.*
-PKGFILES_CSWapache2rt += .*lib/.*apr.* .*lib/apr-util-1/.*
-PKGFILES_CSWapache2rt += .*share/build/.*  .*sbin/apxs
+PKGFILES_CSWapache2rt = .*man/man8/.*apxs.* .*share/build/.*  .*sbin/apxs
 PKGFILES_CSWap2prefork = .*sbin/httpd.prefork
 PKGFILES_CSWap2event = .*sbin/httpd.event
 PKGFILES_CSWap2worker = .*sbin/httpd.worker


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

From bdwalton at users.sourceforge.net  Sun Sep 19 15:42:16 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 13:42:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[11011]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxK9o-0006LI-QO@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11011
          http://gar.svn.sourceforge.net/gar/?rev=11011&view=rev
Author:   bdwalton
Date:     2010-09-19 13:42:16 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: since apr-util is external, no need for apache2c, apache2rt (merge both into top-level apache2)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:28:34 UTC (rev 11010)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:42:16 UTC (rev 11011)
@@ -26,13 +26,10 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
-PACKAGES  = CSWapache2 CSWapache2rt CSWapache2c
-PACKAGES += CSWapache2-devel CSWapache2-manual
+PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual
 PACKAGES += CSWap2prefork CSWap2worker CSWap2event CSWap2suexec
 
 CATALOGNAME_CSWapache2 = apache2
-CATALOGNAME_CSWapache2rt = apache2rt
-CATALOGNAME_CSWapache2c = apache2c
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual
 CATALOGNAME_CSWap2prefork = ap2_prefork
@@ -41,8 +38,6 @@
 CATALOGNAME_CSWap2suexec = ap2_suexec
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
-SPKG_DESC_CSWapache2rt = Apache2 runtime support.
-SPKG_DESC_CSWapache2c = Apache2 core files.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2prefork = The standard preforking mpm for Apache2.
@@ -60,13 +55,9 @@
 DISTFILES += update20to22
 
 RUNTIME_DEP_PKGS_CSWapache2	   = CSWapache2c CSWap2prefork
-RUNTIME_DEP_PKGS_CSWapache2c       = CSWexpat CSWiconv
-RUNTIME_DEP_PKGS_CSWapache2c      += CSWoldaprt CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2c      += CSWapr CSWapr-util CSWbdb48
-RUNTIME_DEP_PKGS_CSWapache2c	   = CSWapache2rt
-RUNTIME_DEP_PKGS_CSWapache2rt      = CSWexpat CSWiconv
-RUNTIME_DEP_PKGS_CSWapache2rt     += CSWoldaprt CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWapache2rt     += CSWapr CSWapr-util CSWbdb48
+RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
+RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork	   = CSWapache2
@@ -102,10 +93,10 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
-PKGFILES_CSWapache2 = /opt/csw/apache2/
-PKGFILES_CSWapache2c = .*libexecdir/.*so .*etc/.*
-PKGFILES_CSWapache2c = .*share/.* .*var/.*
-PKGFILES_CSWapache2rt = .*man/man8/.*apxs.* .*share/build/.*  .*sbin/apxs
+PKGFILES_CSWapache2  = .*libexecdir/.*so .*etc/.*
+PKGFILES_CSWapache2 += .*share/htdocs.* .*share/error.* .*share/icons.*
+PKGFILES_CSWapache2 += .*var/.*
+PKGFILES_CSWapache2 += .*man/man8/.*apxs.* .*share/build/.*  .*sbin/apxs
 PKGFILES_CSWap2prefork = .*sbin/httpd.prefork
 PKGFILES_CSWap2event = .*sbin/httpd.event
 PKGFILES_CSWap2worker = .*sbin/httpd.worker


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

From bdwalton at users.sourceforge.net  Sun Sep 19 15:46:52 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 13:46:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[11012]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxKEG-0002G0-L4@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11012
          http://gar.svn.sourceforge.net/gar/?rev=11012&view=rev
Author:   bdwalton
Date:     2010-09-19 13:46:52 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: minor dep update (apache2c removal); add suplus-dep checkpkg overrides

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:42:16 UTC (rev 11011)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:46:52 UTC (rev 11012)
@@ -54,16 +54,30 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
-RUNTIME_DEP_PKGS_CSWapache2	   = CSWapache2c CSWap2prefork
+RUNTIME_DEP_PKGS_CSWapache2	   = CSWap2prefork
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2prefork	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2worker	   = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2event	   = CSWapache2 CSWapr-util CSWexpat
+RUNTIME_DEP_PKGS_CSWap2event	  += CSWbdb48 CSWapr CSWiconv
+RUNTIME_DEP_PKGS_CSWap2prefork	   = CSWapache2 CSWapr-util CSWexpat
+RUNTIME_DEP_PKGS_CSWap2prefork	  += CSWbdb48 CSWapr CSWiconv
+RUNTIME_DEP_PKGS_CSWap2worker	   = CSWapache2 CSWapr-util CSWexpat
+RUNTIME_DEP_PKGS_CSWap2worker	  += CSWbdb48 CSWapr CSWiconv
 
+CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2worker  += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2event   += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2prefork
+CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapr-util
+
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
 


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

From bdwalton at users.sourceforge.net  Sun Sep 19 15:54:36 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 13:54:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[11013]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxKLk-0006fF-69@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11013
          http://gar.svn.sourceforge.net/gar/?rev=11013&view=rev
Author:   bdwalton
Date:     2010-09-19 13:54:36 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: -manual package is archall

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:46:52 UTC (rev 11012)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:54:36 UTC (rev 11013)
@@ -29,6 +29,8 @@
 PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual
 PACKAGES += CSWap2prefork CSWap2worker CSWap2event CSWap2suexec
 
+ARCHALL_CSWapache2-manual = 1
+
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual


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

From bdwalton at users.sourceforge.net  Sun Sep 19 16:09:33 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 14:09:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[11014]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxKaD-0003F7-LL@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11014
          http://gar.svn.sourceforge.net/gar/?rev=11014&view=rev
Author:   bdwalton
Date:     2010-09-19 14:09:33 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: allow top-level package to gobble everything not grabbed by subpackages

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 13:54:36 UTC (rev 11013)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 14:09:33 UTC (rev 11014)
@@ -109,10 +109,6 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
-PKGFILES_CSWapache2  = .*libexecdir/.*so .*etc/.*
-PKGFILES_CSWapache2 += .*share/htdocs.* .*share/error.* .*share/icons.*
-PKGFILES_CSWapache2 += .*var/.*
-PKGFILES_CSWapache2 += .*man/man8/.*apxs.* .*share/build/.*  .*sbin/apxs
 PKGFILES_CSWap2prefork = .*sbin/httpd.prefork
 PKGFILES_CSWap2event = .*sbin/httpd.event
 PKGFILES_CSWap2worker = .*sbin/httpd.worker


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

From bdwalton at users.sourceforge.net  Sun Sep 19 16:15:56 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 14:15:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[11015]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxKgO-0007HN-9k@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11015
          http://gar.svn.sourceforge.net/gar/?rev=11015&view=rev
Author:   bdwalton
Date:     2010-09-19 14:15:56 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: update checkpkg overrides after package file shuffling

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 14:09:33 UTC (rev 11014)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 14:15:56 UTC (rev 11015)
@@ -74,11 +74,9 @@
 CHECKPKG_OVERRIDES_CSWap2worker  += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2event   += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2prefork
 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapr-util
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2prefork
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib


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

From bdwalton at users.sourceforge.net  Sun Sep 19 18:34:44 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 16:34:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[11016]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxMqi-0001PF-6k@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11016
          http://gar.svn.sourceforge.net/gar/?rev=11016&view=rev
Author:   bdwalton
Date:     2010-09-19 16:34:43 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: mark apache2 incompatible with the old core/rt packages

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 14:15:56 UTC (rev 11015)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 16:34:43 UTC (rev 11016)
@@ -56,6 +56,8 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
+INCOMPATIBLE_PKGS_CSWapache2	   = CSWapache2c CSWapache2rt
+
 RUNTIME_DEP_PKGS_CSWapache2	   = CSWap2prefork
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib


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

From bdwalton at users.sourceforge.net  Sun Sep 19 22:45:12 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 20:45:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[11017]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxQl6-0004Rv-H0@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11017
          http://gar.svn.sourceforge.net/gar/?rev=11017&view=rev
Author:   bdwalton
Date:     2010-09-19 20:45:12 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: drop the mpm specific ap2 modules, ship as part of primary package, use alternatives

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 16:34:43 UTC (rev 11016)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 20:45:12 UTC (rev 11017)
@@ -26,25 +26,18 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
-PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual
-PACKAGES += CSWap2prefork CSWap2worker CSWap2event CSWap2suexec
+PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec
 
 ARCHALL_CSWapache2-manual = 1
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual
-CATALOGNAME_CSWap2prefork = ap2_prefork
-CATALOGNAME_CSWap2worker = ap2_worker
-CATALOGNAME_CSWap2event = ap2_event
 CATALOGNAME_CSWap2suexec = ap2_suexec
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
-SPKG_DESC_CSWap2prefork = The standard preforking mpm for Apache2.
-SPKG_DESC_CSWap2worker = The standard threaded worker mpm for Apache2.
-SPKG_DESC_CSWap2event = The standard event mpm for Apache2.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
 
 # Standard package bits
@@ -56,29 +49,20 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 
-INCOMPATIBLE_PKGS_CSWapache2	   = CSWapache2c CSWapache2rt
 
-RUNTIME_DEP_PKGS_CSWapache2	   = CSWap2prefork
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWap2worker CSWap2perfork
+INCOMPATIBLE_PKGS_CSWapache2 += CSWapache2c
+
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2event	   = CSWapache2 CSWapr-util CSWexpat
-RUNTIME_DEP_PKGS_CSWap2event	  += CSWbdb48 CSWapr CSWiconv
-RUNTIME_DEP_PKGS_CSWap2prefork	   = CSWapache2 CSWapr-util CSWexpat
-RUNTIME_DEP_PKGS_CSWap2prefork	  += CSWbdb48 CSWapr CSWiconv
-RUNTIME_DEP_PKGS_CSWap2worker	   = CSWapache2 CSWapr-util CSWexpat
-RUNTIME_DEP_PKGS_CSWap2worker	  += CSWbdb48 CSWapr CSWiconv
 
-CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2worker  += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2event   += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWap2prefork
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -109,9 +93,6 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
-PKGFILES_CSWap2prefork = .*sbin/httpd.prefork
-PKGFILES_CSWap2event = .*sbin/httpd.event
-PKGFILES_CSWap2worker = .*sbin/httpd.worker
 PKGFILES_CSWap2suexec = .*sbin/suexec .*libexecdir/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf


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

From bdwalton at users.sourceforge.net  Sun Sep 19 23:37:17 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 21:37:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[11018]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxRZV-00020N-QR@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11018
          http://gar.svn.sourceforge.net/gar/?rev=11018&view=rev
Author:   bdwalton
Date:     2010-09-19 21:37:17 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: add alternatives for httpd* files

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 20:45:12 UTC (rev 11017)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 21:37:17 UTC (rev 11018)
@@ -63,6 +63,7 @@
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -73,6 +74,11 @@
 # the Makefile.
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
+ALTERNATIVES_CSWapache2 = prefork worker event
+ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.prefork 100
+ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.worker 50
+ALTERNATIVE_event = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.event 40
+
 pre-configure-modulated:
 	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
 	$(MAKECOOKIE)


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

From bdwalton at users.sourceforge.net  Sun Sep 19 23:47:05 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 19 Sep 2010 21:47:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[11019] csw/mgar/pkg/apache2/trunk/files
Message-ID: <E1OxRiz-0007vj-Me@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11019
          http://gar.svn.sourceforge.net/gar/?rev=11019&view=rev
Author:   bdwalton
Date:     2010-09-19 21:47:05 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
apache2: drop some old manual protoype, space files

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.space
    csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWapache2.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWapache2c.prototype
    csw/mgar/pkg/apache2/trunk/files/CSWapache2c.space
    csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.prototype

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,3 +0,0 @@
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/sbin 0755 root bin
-f none /opt/csw/apache2/sbin/httpd.prefork 0755 root bin

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.space
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.space	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.space	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1 +0,0 @@
-$BASEDIR 4

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,8 +0,0 @@
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/libexec 0755 root bin
-f none /opt/csw/apache2/libexec/mod_suexec.so 0755 root bin
-d none /opt/csw/apache2/man 0755 root bin
-d none /opt/csw/apache2/man/man8 0755 root bin
-f none /opt/csw/apache2/man/man8/suexec.8 0644 root bin
-d none /opt/csw/apache2/sbin 0755 root bin
-f none /opt/csw/apache2/sbin/suexec 4755 root bin

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,143 +0,0 @@
-d none /opt/csw/apache2/include 0755 root bin
-f none /opt/csw/apache2/include/apr_md4.h 0644 root bin
-f none /opt/csw/apache2/include/ap_regex.h 0644 root bin
-f none /opt/csw/apache2/include/apr_random.h 0644 root bin
-f none /opt/csw/apache2/include/ap_config_auto.h 0644 root bin
-f none /opt/csw/apache2/include/ap_compat.h 0644 root bin
-f none /opt/csw/apache2/include/ap_listen.h 0644 root bin
-f none /opt/csw/apache2/include/mod_rewrite.h 0644 root bin
-f none /opt/csw/apache2/include/apr_base64.h 0644 root bin
-f none /opt/csw/apache2/include/apr_fnmatch.h 0644 root bin
-f none /opt/csw/apache2/include/os.h 0644 root bin
-f none /opt/csw/apache2/include/apr_strmatch.h 0644 root bin
-f none /opt/csw/apache2/include/apr_thread_pool.h 0644 root bin
-f none /opt/csw/apache2/include/ap_config.h 0644 root bin
-f none /opt/csw/apache2/include/apr_optional_hooks.h 0644 root bin
-f none /opt/csw/apache2/include/apr_optional.h 0644 root bin
-f none /opt/csw/apache2/include/ap_config_layout.h 0644 root bin
-f none /opt/csw/apache2/include/util_ebcdic.h 0644 root bin
-f none /opt/csw/apache2/include/apr_xml.h 0644 root bin
-f none /opt/csw/apache2/include/mod_dbd.h 0644 root bin
-f none /opt/csw/apache2/include/apr_pools.h 0644 root bin
-f none /opt/csw/apache2/include/apr_errno.h 0644 root bin
-f none /opt/csw/apache2/include/apr_support.h 0644 root bin
-f none /opt/csw/apache2/include/util_cfgtree.h 0644 root bin
-f none /opt/csw/apache2/include/http_vhost.h 0644 root bin
-f none /opt/csw/apache2/include/apr_md5.h 0644 root bin
-f none /opt/csw/apache2/include/mod_include.h 0644 root bin
-f none /opt/csw/apache2/include/mod_core.h 0644 root bin
-f none /opt/csw/apache2/include/apr_user.h 0644 root bin
-f none /opt/csw/apache2/include/ap_mmn.h 0644 root bin
-f none /opt/csw/apache2/include/apr_version.h 0644 root bin
-f none /opt/csw/apache2/include/apr_file_info.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ldap_rebind.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ldap_option.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ldap_url.h 0644 root bin
-f none /opt/csw/apache2/include/mod_log_config.h 0644 root bin
-f none /opt/csw/apache2/include/mod_auth.h 0644 root bin
-f none /opt/csw/apache2/include/apr_date.h 0644 root bin
-f none /opt/csw/apache2/include/apr_signal.h 0644 root bin
-f none /opt/csw/apache2/include/util_md5.h 0644 root bin
-f none /opt/csw/apache2/include/util_charset.h 0644 root bin
-f none /opt/csw/apache2/include/apr_thread_mutex.h 0644 root bin
-f none /opt/csw/apache2/include/httpd.h 0644 root bin
-f none /opt/csw/apache2/include/apr_buckets.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ring.h 0644 root bin
-f none /opt/csw/apache2/include/util_time.h 0644 root bin
-f none /opt/csw/apache2/include/apu_want.h 0644 root bin
-f none /opt/csw/apache2/include/apr_sdbm.h 0644 root bin
-f none /opt/csw/apache2/include/util_ldap.h 0644 root bin
-f none /opt/csw/apache2/include/util_xml.h 0644 root bin
-f none /opt/csw/apache2/include/util_filter.h 0644 root bin
-f none /opt/csw/apache2/include/apu.h 0644 root bin
-f none /opt/csw/apache2/include/apr_hooks.h 0644 root bin
-f none /opt/csw/apache2/include/apu_version.h 0644 root bin
-f none /opt/csw/apache2/include/apr_strings.h 0644 root bin
-f none /opt/csw/apache2/include/mpm.h 0644 root bin
-f none /opt/csw/apache2/include/apr_memcache.h 0644 root bin
-f none /opt/csw/apache2/include/apr_file_io.h 0644 root bin
-f none /opt/csw/apache2/include/http_request.h 0644 root bin
-f none /opt/csw/apache2/include/apr_thread_proc.h 0644 root bin
-f none /opt/csw/apache2/include/apr_env.h 0644 root bin
-f none /opt/csw/apache2/include/apr_mmap.h 0644 root bin
-f none /opt/csw/apache2/include/ap_regkey.h 0644 root bin
-f none /opt/csw/apache2/include/mod_status.h 0644 root bin
-f none /opt/csw/apache2/include/http_main.h 0644 root bin
-f none /opt/csw/apache2/include/scoreboard.h 0644 root bin
-f none /opt/csw/apache2/include/apr_dso.h 0644 root bin
-f none /opt/csw/apache2/include/apr_portable.h 0644 root bin
-f none /opt/csw/apache2/include/http_protocol.h 0644 root bin
-f none /opt/csw/apache2/include/apr_hash.h 0644 root bin
-f none /opt/csw/apache2/include/apr_allocator.h 0644 root bin
-f none /opt/csw/apache2/include/apr_thread_cond.h 0644 root bin
-f none /opt/csw/apache2/include/mod_ssl.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ldap_init.h 0644 root bin
-f none /opt/csw/apache2/include/apr_atomic.h 0644 root bin
-f none /opt/csw/apache2/include/apr_queue.h 0644 root bin
-f none /opt/csw/apache2/include/apr_anylock.h 0644 root bin
-f none /opt/csw/apache2/include/mpm_common.h 0644 root bin
-f none /opt/csw/apache2/include/http_connection.h 0644 root bin
-f none /opt/csw/apache2/include/apr_dbm.h 0644 root bin
-f none /opt/csw/apache2/include/mod_dav.h 0644 root bin
-f none /opt/csw/apache2/include/apr_reslist.h 0644 root bin
-f none /opt/csw/apache2/include/ap_release.h 0644 root bin
-f none /opt/csw/apache2/include/unixd.h 0644 root bin
-f none /opt/csw/apache2/include/util_script.h 0644 root bin
-f none /opt/csw/apache2/include/apr.h 0644 root bin
-f none /opt/csw/apache2/include/ap_mpm.h 0644 root bin
-f none /opt/csw/apache2/include/apr_shm.h 0644 root bin
-f none /opt/csw/apache2/include/http_core.h 0644 root bin
-f none /opt/csw/apache2/include/apr_inherit.h 0644 root bin
-f none /opt/csw/apache2/include/apr_getopt.h 0644 root bin
-f none /opt/csw/apache2/include/apr_sha1.h 0644 root bin
-f none /opt/csw/apache2/include/apr_uuid.h 0644 root bin
-f none /opt/csw/apache2/include/ap_provider.h 0644 root bin
-f none /opt/csw/apache2/include/apr_want.h 0644 root bin
-f none /opt/csw/apache2/include/http_config.h 0644 root bin
-f none /opt/csw/apache2/include/apr_dbd.h 0644 root bin
-f none /opt/csw/apache2/include/apr_global_mutex.h 0644 root bin
-f none /opt/csw/apache2/include/mpm_default.h 0644 root bin
-f none /opt/csw/apache2/include/apr_poll.h 0644 root bin
-f none /opt/csw/apache2/include/apr_time.h 0644 root bin
-f none /opt/csw/apache2/include/mod_proxy.h 0644 root bin
-f none /opt/csw/apache2/include/apr_xlate.h 0644 root bin
-f none /opt/csw/apache2/include/apr_network_io.h 0644 root bin
-f none /opt/csw/apache2/include/http_log.h 0644 root bin
-f none /opt/csw/apache2/include/apr_tables.h 0644 root bin
-f none /opt/csw/apache2/include/mod_cgi.h 0644 root bin
-f none /opt/csw/apache2/include/apr_uri.h 0644 root bin
-f none /opt/csw/apache2/include/apr_thread_rwlock.h 0644 root bin
-f none /opt/csw/apache2/include/apr_ldap.h 0644 root bin
-f none /opt/csw/apache2/include/apr_lib.h 0644 root bin
-f none /opt/csw/apache2/include/apr_general.h 0644 root bin
-f none /opt/csw/apache2/include/apr_rmm.h 0644 root bin
-f none /opt/csw/apache2/include/apr_proc_mutex.h 0644 root bin
-d none /opt/csw/apache2/lib 0755 root bin
-f none /opt/csw/apache2/lib/apr.exp 0644 root bin
-f none /opt/csw/apache2/lib/aprutil.exp 0644 root bin
-f none /opt/csw/apache2/lib/libapr-1.a 0644 root bin
-f none /opt/csw/apache2/lib/libapr-1.la 0755 root bin
-f none /opt/csw/apache2/lib/libaprutil-1.a 0644 root bin
-f none /opt/csw/apache2/lib/libaprutil-1.la 0755 root bin
-d none /opt/csw/apache2/lib/pkgconfig 0755 root bin
-f none /opt/csw/apache2/lib/pkgconfig/apr-1.pc 0644 root bin
-f none /opt/csw/apache2/lib/pkgconfig/apr-util-1.pc 0644 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_ldap.a 0644 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_ldap.la 0755 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_dbd_sqlite3.la 0755 root bin
-d none /opt/csw/apache2/libexec 0755 root bin
-f none /opt/csw/apache2/libexec/httpd.exp 0644 root bin
-d none /opt/csw/apache2/share 0755 root bin
-f none /opt/csw/apache2/share/build/rules.mk 0644 root bin
-f none /opt/csw/apache2/share/build/special.mk 0644 root bin
-f none /opt/csw/apache2/share/build/config_vars.mk 0644 root bin
-f none /opt/csw/apache2/share/build/library.mk 0644 root bin
-f none /opt/csw/apache2/share/build/apr_rules.mk 0644 root bin
-f none /opt/csw/apache2/share/build/make_var_export.awk 0644 root bin
-f none /opt/csw/apache2/share/build/ltlib.mk 0644 root bin
-f none /opt/csw/apache2/share/build/mkdir.sh 0755 root bin
-f none /opt/csw/apache2/share/build/config.nice 0755 root bin
-f none /opt/csw/apache2/share/build/instdso.sh 0755 root bin
-f none /opt/csw/apache2/share/build/make_exports.awk 0644 root bin
-f none /opt/csw/apache2/share/build/libtool 0755 root bin
-f none /opt/csw/apache2/share/build/program.mk 0644 root bin

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,768 +0,0 @@
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/etc 0755 root bin
-d none /opt/csw/apache2/etc/extra 0755 root bin
-f none /opt/csw/apache2/etc/extra/httpd-manual.conf 0644 root bin
-d none /opt/csw/apache2/share 0755 root bin
-f none /opt/csw/apache2/share/manual/sections.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/suexec.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/dso.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/license.html 0644 root bin
-f none /opt/csw/apache2/share/manual/env.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/license.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/upgrading.html 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/server-wide.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html 0644 root bin
-f none /opt/csw/apache2/share/manual/dso.html 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/sections.html.ja.utf8 0644 root bin
-d none /opt/csw/apache2/share/manual/developer 0755 root bin
-f none /opt/csw/apache2/share/manual/developer/thread_safety.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/filters.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/request.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/request.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/documenting.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/API.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/modules.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/modules.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/debugging.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/thread_safety.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/documenting.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/hooks.html 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/debugging.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/hooks.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/filters.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/modules.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/developer/API.html 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/LICENSE 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/logs.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/sections.html 0644 root bin
-f none /opt/csw/apache2/share/manual/env.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.ko.euc-kr 0644 root bin
-d none /opt/csw/apache2/share/manual/images 0755 root bin
-f none /opt/csw/apache2/share/manual/images/down.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/custom_errordocs.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig3.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/left.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig1.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/favicon.ico 0644 root bin
-f none /opt/csw/apache2/share/manual/images/pixel.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig2.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/filter_arch.tr.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/index.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/caching_fig1.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/sub.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_filter_new.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_rewrite_fig1.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_rewrite_fig2.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/feather.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_filter_new.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_rewrite_fig2.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_rewrite_fig1.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/feather.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/caching_fig1.tr.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_filter_old.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig2.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig1.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/caching_fig1.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/up.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/home.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/filter_arch.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/mod_filter_new.tr.png 0644 root bin
-f none /opt/csw/apache2/share/manual/images/right.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/apache_header.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/images/ssl_intro_fig3.gif 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/server-wide.html 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/server-wide.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html 0644 root bin
-f none /opt/csw/apache2/share/manual/urlmapping.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/dns-caveats.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/server-wide.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/filter.html 0644 root bin
-d none /opt/csw/apache2/share/manual/mod 0755 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_charset_lite.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_version.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_disk_cache.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_default.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_deflate.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_logio.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_anon.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_dbm.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_so.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_userdir.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_vhost_alias.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_anon.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_substitute.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_file.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_file.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/module-dict.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_ftp.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ext_filter.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mem_cache.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_lock.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_headers.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_config.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_unique_id.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_expires.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_lock.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_actions.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_negotiation.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/beos.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_userdir.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directive-dict.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cern_meta.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_rewrite.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_actions.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/worker.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_imagemap.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_anon.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ssl.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_so.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_balancer.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mime_magic.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_logio.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/module-dict.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_setenvif.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbm.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_userdir.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ssl.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_negotiation.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_common.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mime.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_lock.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_vhost_alias.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_ajp.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_example.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_actions.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dumpio.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/module-dict.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_logio.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_fs.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgi.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/prefork.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_version.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_balancer.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mem_cache.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_config.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/worker.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ldap.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/module-dict.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_file_cache.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_expires.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_unique_id.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_host.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ldap.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directive-dict.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_isapi.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directive-dict.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mem_cache.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_file.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/core.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_suexec.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_autoindex.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mime.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/event.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_connect.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_info.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_substitute.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_basic.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_userdir.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dir.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_info.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_alias.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_charset_lite.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_setenvif.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_dbm.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_echo.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_autoindex.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_filter.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_fs.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_common.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ident.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_digest.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_so.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_autoindex.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_file.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_deflate.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/beos.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_alias.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgi.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbm.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_logio.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_winnt.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_alias.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_alias.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_usertrack.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_suexec.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_disk_cache.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_filter.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_digest.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_winnt.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_user.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_forensic.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_default.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dir.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/prefork.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_netware.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_usertrack.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_suexec.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_asis.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_winnt.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/core.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_speling.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_groupfile.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_alias.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mime.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_common.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_connect.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_netware.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_dbm.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_autoindex.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_default.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_user.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ext_filter.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_speling.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_owner.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ident.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpmt_os2.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_balancer.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_speling.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/beos.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_owner.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cache.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_forensic.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_winnt.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/module-dict.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_default.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dbd.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_alias.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgid.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_echo.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_ajp.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_include.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_echo.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/prefork.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_rewrite.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_basic.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/worker.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_host.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgid.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_status.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cache.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authnz_ldap.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dir.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cache.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_owner.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_setenvif.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_info.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_actions.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_unique_id.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_fs.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_basic.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_disk_cache.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dir.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav_fs.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_autoindex.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_default.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/core.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgid.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_include.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_expires.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_forensic.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_config.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_config.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_forensic.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_vhost_alias.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_groupfile.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dbd.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/worker.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgi.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_env.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/beos.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbd.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_imagemap.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_status.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_setenvif.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_version.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_asis.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_ajp.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/core.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_userdir.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/beos.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_status.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbd.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_version.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_http.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_http.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_negotiation.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dav.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_so.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_actions.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_basic.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_common.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_file_cache.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_info.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_isapi.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dir.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_suexec.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/prefork.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_headers.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_groupfile.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_alias.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_owner.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_echo.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_anon.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_user.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_connect.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cache.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/worker.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_asis.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_include.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directive-dict.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_status.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_host.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_auth_digest.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_env.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_logio.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ext_filter.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_imagemap.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_expires.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_nw_ssl.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dumpio.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/quickreference.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/core.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authnz_ldap.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_setenvif.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbm.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_example.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/index.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_groupfile.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_default.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_asis.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_isapi.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgid.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_log_config.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_file_cache.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_user.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authz_host.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ext_filter.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_unique_id.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpmt_os2.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_headers.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_env.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_headers.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mem_cache.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_env.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cgi.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_proxy_ftp.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_disk_cache.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_deflate.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cern_meta.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_default.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/prefork.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ident.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_ident.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_mime_magic.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_charset_lite.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_default.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_cern_meta.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_status.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_example.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_suexec.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_deflate.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/event.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_dumpio.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_nw_ssl.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directives.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mpm_common.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_env.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_authn_dbm.html 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_speling.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/mod_so.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mod/directive-dict.html 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.pt-br 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.ko.euc-kr 0644 root bin
-d none /opt/csw/apache2/share/manual/platform 0755 root bin
-f none /opt/csw/apache2/share/manual/platform/win_compiling.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/windows.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/win_compiling.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/ebcdic.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/perf-hp.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/netware.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/ebcdic.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/windows.html 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/netware.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/perf-hp.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/ebcdic.html 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/windows.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/perf-hp.html 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/win_compiling.html 0644 root bin
-f none /opt/csw/apache2/share/manual/platform/netware.html 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/urlmapping.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/env.html 0644 root bin
-f none /opt/csw/apache2/share/manual/dns-caveats.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html 0644 root bin
-f none /opt/csw/apache2/share/manual/caching.html 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/upgrading.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/sections.html.fr 0644 root bin
-d none /opt/csw/apache2/share/manual/ssl 0755 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_compat.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/index.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_compat.html 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_faq.html 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_howto.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_faq.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_intro.html 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_intro.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_howto.html 0644 root bin
-f none /opt/csw/apache2/share/manual/ssl/ssl_intro.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/sections.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/dns-caveats.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html 0644 root bin
-f none /opt/csw/apache2/share/manual/dso.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/suexec.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.pt-br 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/caching.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/suexec.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/upgrading.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/env.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/upgrading.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/sitemap.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/caching.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/configuring.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/logs.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/logs.html 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/dns-caveats.html.tr.utf8 0644 root bin
-d none /opt/csw/apache2/share/manual/misc 0755 root bin
-f none /opt/csw/apache2/share/manual/misc/perf-tuning.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/relevant_standards.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/security_tips.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/perf-tuning.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/relevant_standards.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/security_tips.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/relevant_standards.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/password_encryptions.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/security_tips.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/security_tips.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/rewriteguide.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/rewriteguide.html 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/perf-tuning.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/password_encryptions.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/misc/rewriteguide.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/urlmapping.html 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/suexec.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/dso.html.ja.utf8 0644 root bin
-d none /opt/csw/apache2/share/manual/faq 0755 root bin
-f none /opt/csw/apache2/share/manual/faq/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/faq/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/faq/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/convenience.map 0644 root bin
-f none /opt/csw/apache2/share/manual/server-wide.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html 0644 root bin
-d none /opt/csw/apache2/share/manual/howto 0755 root bin
-f none /opt/csw/apache2/share/manual/howto/public_html.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/htaccess.html.pt-br 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/htaccess.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/htaccess.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/auth.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/auth.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/ssi.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/public_html.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/htaccess.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/auth.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/auth.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/htaccess.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/public_html.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/cgi.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/access.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/cgi.html 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/ssi.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/cgi.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/ssi.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/public_html.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/ssi.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/access.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/index.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/howto/cgi.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.de 0644 root bin
-d none /opt/csw/apache2/share/manual/vhosts 0755 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/details.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/mass.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/mass.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/details.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/details.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/details.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/details.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/ip-based.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/examples.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/mass.html 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/fd-limits.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/mass.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/vhosts/name-based.html 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html 0644 root bin
-f none /opt/csw/apache2/share/manual/dns-caveats.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_2.html.pt-br 0644 root bin
-f none /opt/csw/apache2/share/manual/new_features_2_0.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/urlmapping.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/bind.html.de 0644 root bin
-d none /opt/csw/apache2/share/manual/rewrite 0755 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_intro.html 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_tech.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_flags.html 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide_advanced.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_flags.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide_advanced.html 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_intro.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_tech.html 0644 root bin
-f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide.html 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.fr 0644 root bin
-f none /opt/csw/apache2/share/manual/sections.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/handler.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/dso.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/logs.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/env.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/suexec.html 0644 root bin
-f none /opt/csw/apache2/share/manual/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html 0644 root bin
-f none /opt/csw/apache2/share/manual/urlmapping.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/content-negotiation.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/custom-error.html.ko.euc-kr 0644 root bin
-d none /opt/csw/apache2/share/manual/programs 0755 root bin
-f none /opt/csw/apache2/share/manual/programs/configure.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apxs.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html.ru.koi8-r 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httpd.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/configure.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htpasswd.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/other.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/suexec.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/ab.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/rotatelogs.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/suexec.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htdbm.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htpasswd.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/configure.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htcacheclean.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/configure.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/ab.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htdigest.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/dbmmanage.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htdigest.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/dbmmanage.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httxt2dbm.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httpd.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apachectl.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/logresolve.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/logresolve.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apachectl.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/other.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htcacheclean.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/dbmmanage.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httxt2dbm.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htdbm.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/ab.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/ab.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httpd.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/logresolve.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/httpd.html.tr.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apachectl.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/rotatelogs.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htcacheclean.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apachectl.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apxs.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/rotatelogs.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/other.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htpasswd.html 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/suexec.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/htdigest.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/apxs.html.en 0644 root bin
-f none /opt/csw/apache2/share/manual/programs/index.html.ko.euc-kr 0644 root bin
-f none /opt/csw/apache2/share/manual/install.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/caching.html.tr.utf8 0644 root bin
-d none /opt/csw/apache2/share/manual/style 0755 root bin
-f none /opt/csw/apache2/share/manual/style/build.properties 0644 root bin
-d none /opt/csw/apache2/share/manual/style/xsl 0755 root bin
-d none /opt/csw/apache2/share/manual/style/xsl/util 0755 root bin
-d none /opt/csw/apache2/share/manual/style/latex 0755 root bin
-f none /opt/csw/apache2/share/manual/style/latex/atbeginend.sty 0644 root bin
-f none /opt/csw/apache2/share/manual/style/faq.dtd 0644 root bin
-f none /opt/csw/apache2/share/manual/style/modulesynopsis.dtd 0644 root bin
-f none /opt/csw/apache2/share/manual/style/manualpage.dtd 0644 root bin
-d none /opt/csw/apache2/share/manual/style/css 0755 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual-loose-100pc.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual-chm.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual-zip.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual-print.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/css/manual-zip-100pc.css 0644 root bin
-f none /opt/csw/apache2/share/manual/style/lang.dtd 0644 root bin
-f none /opt/csw/apache2/share/manual/style/sitemap.dtd 0644 root bin
-f none /opt/csw/apache2/share/manual/style/common.dtd 0644 root bin
-d none /opt/csw/apache2/share/manual/style/lang 0755 root bin
-f none /opt/csw/apache2/share/manual/style/version.ent 0644 root bin
-f none /opt/csw/apache2/share/manual/invoking.html.de 0644 root bin
-f none /opt/csw/apache2/share/manual/stopping.html.es 0644 root bin
-f none /opt/csw/apache2/share/manual/logs.html.ja.utf8 0644 root bin
-f none /opt/csw/apache2/share/manual/mpm.html 0644 root bin
-f none /opt/csw/apache2/share/manual/glossary.html 0644 root bin

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2.prototype
===================================================================
Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,386 +0,0 @@
-d none /etc/opt 0755 root sys
-d none /etc/opt/csw 0755 root bin
-d none /etc/opt/csw/init.d 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswapache2 0755 root bin
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/etc 0755 root bin
-d none /opt/csw/apache2/etc/extra 0755 root bin
-f none /opt/csw/apache2/etc/extra/httpd-autoindex.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-dav.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-default.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-info.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-languages.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-mpm.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-multilang-errordoc.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-ssl.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-userdir.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/extra/httpd-vhosts.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/httpd.conf.CSW 0644 root bin
-f none /opt/csw/apache2/etc/magic.CSW 0644 root bin
-f none /opt/csw/apache2/etc/mime.types.CSW 0644 root bin
-d none /opt/csw/apache2/etc/original 0755 root bin
-d none /opt/csw/apache2/etc/original/extra 0755 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-autoindex.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-dav.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-default.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-info.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-languages.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-manual.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-mpm.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-multilang-errordoc.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-ssl.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-userdir.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/extra/httpd-vhosts.conf 0644 root bin
-f none /opt/csw/apache2/etc/original/httpd.conf 0644 root bin
-d none /opt/csw/apache2/libexec 0755 root bin
-f none /opt/csw/apache2/libexec/mod_actions.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_alias.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_asis.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_auth_basic.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_auth_digest.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_alias.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_anon.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_dbd.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_dbm.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_default.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authn_file.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authnz_ldap.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_dbm.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_default.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_groupfile.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_host.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_owner.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_authz_user.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_autoindex.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_bucketeer.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_cache.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_cern_meta.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_cgi.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_cgid.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_charset_lite.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dav.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dav_fs.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dav_lock.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dbd.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_deflate.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dir.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_disk_cache.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_dumpio.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_env.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_expires.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_ext_filter.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_file_cache.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_filter.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_headers.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_ident.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_imagemap.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_include.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_info.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_ldap.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_log_config.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_log_forensic.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_logio.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_mem_cache.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_mime.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_mime_magic.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_negotiation.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy_ajp.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy_balancer.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy_connect.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy_ftp.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_proxy_http.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_rewrite.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_setenvif.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_speling.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_ssl.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_status.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_unique_id.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_userdir.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_usertrack.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_version.so 0755 root bin
-f none /opt/csw/apache2/libexec/mod_vhost_alias.so 0755 root bin
-d none /opt/csw/apache2/man 0755 root bin
-d none /opt/csw/apache2/man/man1 0755 root bin
-f none /opt/csw/apache2/man/man1/dbmmanage.1 0644 root bin
-f none /opt/csw/apache2/man/man1/htdbm.1 0644 root bin
-f none /opt/csw/apache2/man/man1/htdigest.1 0644 root bin
-f none /opt/csw/apache2/man/man1/htpasswd.1 0644 root bin
-d none /opt/csw/apache2/man/man8 0755 root bin
-f none /opt/csw/apache2/man/man8/ab.8 0644 root bin
-f none /opt/csw/apache2/man/man8/apachectl.8 0644 root bin
-f none /opt/csw/apache2/man/man8/htcacheclean.8 0644 root bin
-f none /opt/csw/apache2/man/man8/httpd.8 0644 root bin
-f none /opt/csw/apache2/man/man8/logresolve.8 0644 root bin
-f none /opt/csw/apache2/man/man8/rotatelogs.8 0644 root bin
-d none /opt/csw/apache2/sbin 0755 root bin
-f none /opt/csw/apache2/sbin/ab 0755 root bin
-f none /opt/csw/apache2/sbin/apachectl 0755 root bin
-f none /opt/csw/apache2/sbin/checkgid 0755 root bin
-f none /opt/csw/apache2/sbin/dbmmanage 0755 root bin
-f none /opt/csw/apache2/sbin/envvars 0644 root bin
-f none /opt/csw/apache2/sbin/envvars-std 0644 root bin
-f none /opt/csw/apache2/sbin/htcacheclean 0755 root bin
-f none /opt/csw/apache2/sbin/htdbm 0755 root bin
-f none /opt/csw/apache2/sbin/htdigest 0755 root bin
-f none /opt/csw/apache2/sbin/htpasswd 0755 root bin
-f none /opt/csw/apache2/sbin/httxt2dbm 0755 root bin
-f none /opt/csw/apache2/sbin/logresolve 0755 root bin
-f none /opt/csw/apache2/sbin/rotatelogs 0755 root bin
-f none /opt/csw/apache2/sbin/update20to22 0755 root bin
-d none /opt/csw/apache2/share 0755 root bin
-d none /opt/csw/apache2/share/cgi-bin 0755 root bin
-f none /opt/csw/apache2/share/cgi-bin/printenv 0644 root bin
-f none /opt/csw/apache2/share/cgi-bin/test-cgi 0644 root bin
-d none /opt/csw/apache2/share/error 0755 root bin
-f none /opt/csw/apache2/share/error/HTTP_BAD_GATEWAY.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_BAD_REQUEST.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_FORBIDDEN.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_GONE.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_INTERNAL_SERVER_ERROR.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_LENGTH_REQUIRED.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_METHOD_NOT_ALLOWED.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_NOT_FOUND.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_NOT_IMPLEMENTED.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_PRECONDITION_FAILED.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_REQUEST_TIME_OUT.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_REQUEST_URI_TOO_LARGE.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_SERVICE_UNAVAILABLE.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_UNAUTHORIZED.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/HTTP_VARIANT_ALSO_VARIES.html.var 0644 root bin
-f none /opt/csw/apache2/share/error/README 0644 root bin
-f none /opt/csw/apache2/share/error/contact.html.var 0644 root bin
-d none /opt/csw/apache2/share/error/include 0755 root bin
-f none /opt/csw/apache2/share/error/include/bottom.html 0644 root bin
-f none /opt/csw/apache2/share/error/include/spacer.html 0644 root bin
-f none /opt/csw/apache2/share/error/include/top.html 0644 root bin
-d none /opt/csw/apache2/share/htdocs 0755 root bin
-f none /opt/csw/apache2/share/htdocs/index.html.CSW 0644 root bin
-d none /opt/csw/apache2/share/icons 0755 root bin
-f none /opt/csw/apache2/share/icons/README 0644 root bin
-f none /opt/csw/apache2/share/icons/README.html 0644 root bin
-f none /opt/csw/apache2/share/icons/a.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/a.png 0644 root bin
-f none /opt/csw/apache2/share/icons/alert.black.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/alert.black.png 0644 root bin
-f none /opt/csw/apache2/share/icons/alert.red.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/alert.red.png 0644 root bin
-f none /opt/csw/apache2/share/icons/apache_pb.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/apache_pb.png 0644 root bin
-f none /opt/csw/apache2/share/icons/apache_pb2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/apache_pb2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/apache_pb2_ani.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/back.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/back.png 0644 root bin
-f none /opt/csw/apache2/share/icons/ball.gray.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/ball.gray.png 0644 root bin
-f none /opt/csw/apache2/share/icons/ball.red.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/ball.red.png 0644 root bin
-f none /opt/csw/apache2/share/icons/binary.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/binary.png 0644 root bin
-f none /opt/csw/apache2/share/icons/binhex.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/binhex.png 0644 root bin
-f none /opt/csw/apache2/share/icons/blank.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/blank.png 0644 root bin
-f none /opt/csw/apache2/share/icons/bomb.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/bomb.png 0644 root bin
-f none /opt/csw/apache2/share/icons/box1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/box1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/box2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/box2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/broken.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/broken.png 0644 root bin
-f none /opt/csw/apache2/share/icons/burst.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/burst.png 0644 root bin
-f none /opt/csw/apache2/share/icons/c.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/c.png 0644 root bin
-f none /opt/csw/apache2/share/icons/comp.blue.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/comp.blue.png 0644 root bin
-f none /opt/csw/apache2/share/icons/comp.gray.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/comp.gray.png 0644 root bin
-f none /opt/csw/apache2/share/icons/compressed.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/compressed.png 0644 root bin
-f none /opt/csw/apache2/share/icons/continued.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/continued.png 0644 root bin
-f none /opt/csw/apache2/share/icons/dir.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/dir.png 0644 root bin
-f none /opt/csw/apache2/share/icons/diskimg.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/diskimg.png 0644 root bin
-f none /opt/csw/apache2/share/icons/down.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/down.png 0644 root bin
-f none /opt/csw/apache2/share/icons/dvi.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/dvi.png 0644 root bin
-f none /opt/csw/apache2/share/icons/f.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/f.png 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.open.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.open.png 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.png 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.sec.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/folder.sec.png 0644 root bin
-f none /opt/csw/apache2/share/icons/forward.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/forward.png 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.png 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.red.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.red.png 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.sec.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/generic.sec.png 0644 root bin
-f none /opt/csw/apache2/share/icons/hand.right.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/hand.right.png 0644 root bin
-f none /opt/csw/apache2/share/icons/hand.up.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/hand.up.png 0644 root bin
-f none /opt/csw/apache2/share/icons/icon.sheet.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/icon.sheet.png 0644 root bin
-f none /opt/csw/apache2/share/icons/image1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/image1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/image2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/image2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/image3.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/image3.png 0644 root bin
-f none /opt/csw/apache2/share/icons/index.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/index.png 0644 root bin
-f none /opt/csw/apache2/share/icons/layout.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/layout.png 0644 root bin
-f none /opt/csw/apache2/share/icons/left.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/left.png 0644 root bin
-f none /opt/csw/apache2/share/icons/link.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/link.png 0644 root bin
-f none /opt/csw/apache2/share/icons/movie.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/movie.png 0644 root bin
-f none /opt/csw/apache2/share/icons/p.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/p.png 0644 root bin
-f none /opt/csw/apache2/share/icons/patch.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/patch.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pdf.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pdf.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie0.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie0.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie3.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie3.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie4.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie4.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie5.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie5.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie6.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie6.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie7.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie7.png 0644 root bin
-f none /opt/csw/apache2/share/icons/pie8.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/pie8.png 0644 root bin
-f none /opt/csw/apache2/share/icons/portal.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/portal.png 0644 root bin
-f none /opt/csw/apache2/share/icons/ps.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/ps.png 0644 root bin
-f none /opt/csw/apache2/share/icons/quill.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/quill.png 0644 root bin
-f none /opt/csw/apache2/share/icons/right.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/right.png 0644 root bin
-f none /opt/csw/apache2/share/icons/screw1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/screw1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/screw2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/screw2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/script.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/script.png 0644 root bin
-d none /opt/csw/apache2/share/icons/small 0755 root bin
-f none /opt/csw/apache2/share/icons/small/back.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/back.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/binary.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/binary.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/binhex.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/binhex.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/blank.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/blank.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/broken.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/broken.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/burst.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/burst.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/comp1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/comp1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/comp2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/comp2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/compressed.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/compressed.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/continued.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/continued.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/dir.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/dir.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/dir2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/dir2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/doc.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/doc.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/forward.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/forward.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic3.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/generic3.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/image.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/image.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/image2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/image2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/index.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/index.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/key.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/key.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/movie.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/movie.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/patch.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/patch.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/ps.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/ps.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/rainbow.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/rainbow.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/sound.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/sound.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/sound2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/sound2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/tar.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/tar.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/text.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/text.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/transfer.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/transfer.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/unknown.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/unknown.png 0644 root bin
-f none /opt/csw/apache2/share/icons/small/uu.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/small/uu.png 0644 root bin
-f none /opt/csw/apache2/share/icons/sound1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/sound1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/sound2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/sound2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/sphere1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/sphere1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/sphere2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/sphere2.png 0644 root bin
-f none /opt/csw/apache2/share/icons/tar.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/tar.png 0644 root bin
-f none /opt/csw/apache2/share/icons/tex.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/tex.png 0644 root bin
-f none /opt/csw/apache2/share/icons/text.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/text.png 0644 root bin
-f none /opt/csw/apache2/share/icons/transfer.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/transfer.png 0644 root bin
-f none /opt/csw/apache2/share/icons/unknown.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/unknown.png 0644 root bin
-f none /opt/csw/apache2/share/icons/up.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/up.png 0644 root bin
-f none /opt/csw/apache2/share/icons/uu.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/uu.png 0644 root bin
-f none /opt/csw/apache2/share/icons/uuencoded.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/uuencoded.png 0644 root bin
-f none /opt/csw/apache2/share/icons/world1.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/world1.png 0644 root bin
-f none /opt/csw/apache2/share/icons/world2.gif 0644 root bin
-f none /opt/csw/apache2/share/icons/world2.png 0644 root bin
-d none /opt/csw/apache2/var 0755 root bin
-d none /opt/csw/apache2/var/log 0755 root bin
-d none /opt/csw/apache2/var/run 0755 root bin

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.space
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.space	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.space	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1 +0,0 @@
-$BASEDIR 4

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.prototype
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.prototype	2010-09-19 21:37:17 UTC (rev 11018)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.prototype	2010-09-19 21:47:05 UTC (rev 11019)
@@ -1,30 +0,0 @@
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/bin 0755 root bin
-f none /opt/csw/apache2/bin/apr-1-config 0755 root bin
-f none /opt/csw/apache2/bin/apu-1-config 0755 root bin
-s none /opt/csw/apache2/bin/apr-config=apr-1-config
-s none /opt/csw/apache2/bin/apu-config=apu-1-config
-d none /opt/csw/apache2/lib 0755 root bin
-s none /opt/csw/apache2/lib/libaprutil-1.so=libaprutil-1.so.0.3.9
-s none /opt/csw/apache2/lib/libaprutil-1.so.0=libaprutil-1.so.0.3.9
-s none /opt/csw/apache2/lib/libapr-1.so.0=libapr-1.so.0.3.8
-d none /opt/csw/apache2/lib/apr-util-1 0755 root bin
-s none /opt/csw/apache2/lib/apr-util-1/apr_dbd_sqlite3.so=apr_dbd_sqlite3-1.so
-s none /opt/csw/apache2/lib/apr-util-1/apr_ldap.so=apr_ldap-1.so
-f none /opt/csw/apache2/lib/apr-util-1/apr_dbd_sqlite3.la 0755 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_dbd_sqlite3-1.so 0755 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_dbd_sqlite3.a 0644 root bin
-f none /opt/csw/apache2/lib/apr-util-1/apr_ldap-1.so 0755 root bin
-d none /opt/csw/apache2/lib/pkgconfig 0755 root bin
-f none /opt/csw/apache2/lib/libapr-1.so.0.3.8 0755 root bin
-s none /opt/csw/apache2/lib/libapr-1.so=libapr-1.so.0.3.8
-f none /opt/csw/apache2/lib/libaprutil-1.so.0.3.9 0755 root bin
-d none /opt/csw/apache2/man 0755 root bin
-d none /opt/csw/apache2/man/man8 0755 root bin
-f none /opt/csw/apache2/man/man8/apxs.8 0644 root bin
-d none /opt/csw/apache2/sbin 0755 root bin
-f none /opt/csw/apache2/sbin/apxs 0755 root bin
-d none /opt/csw/apache2/share 0755 root bin
-d none /opt/csw/apache2/share/build 0755 root bin
-f none /opt/csw/apache2/share/build/config_vars.mk 0644 root bin
-f none /opt/csw/apache2/share/build/instdso.sh 0755 root bin


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 Sep 20 02:29:20 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 00:29:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[11020] csw/mgar/pkg/apache2/trunk
Message-ID: <E1OxUG0-0006q8-RI@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11020
          http://gar.svn.sourceforge.net/gar/?rev=11020&view=rev
Author:   bdwalton
Date:     2010-09-20 00:29:20 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: drop more old apr patches (using external apr now); move files/*mk back into the Makefile directly

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

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/apr-lfs.diff
    csw/mgar/pkg/apache2/trunk/files/apr_atomic.c.diff
    csw/mgar/pkg/apache2/trunk/files/apr_dbd_mysql.c
    csw/mgar/pkg/apache2/trunk/files/apu-iconv.diff
    csw/mgar/pkg/apache2/trunk/files/config.mk
    csw/mgar/pkg/apache2/trunk/files/configure.apr.diff
    csw/mgar/pkg/apache2/trunk/files/rules.mk

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-20 00:29:20 UTC (rev 11020)
@@ -10,6 +10,9 @@
   best around in terms of functionality, efficiency, security and speed.
 endef
 
+# Source location
+MASTER_SITES  = http://www.ibiblio.com/pub/mirrors/apache/httpd/
+
 # work around dumb checkpkg not recognizing the license file ...
 LICENSE = LICENSE
 
@@ -21,8 +24,20 @@
 MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
 MERGE_SCRIPTS_isa-default-mpm-event = copy-all
 
-include files/config.mk
+# Visitor information
+SPKG_SOURCEURL = http://httpd.apache.org/
 
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += config.layout
+# Standard package bits
+DISTFILES += CSWapache2.killproc cswapache2
+
+# Configuration templates
+DISTFILES += httpd.conf.CSW
+DISTFILES += httpd-mpm.conf.CSW
+DISTFILES += httpd-ssl.conf.CSW
+DISTFILES += update20to22
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
@@ -40,16 +55,6 @@
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
 
-# Standard package bits
-DISTFILES += CSWapache2.killproc cswapache2
-
-# Configuration templates
-DISTFILES += httpd.conf.CSW
-DISTFILES += httpd-mpm.conf.CSW
-DISTFILES += httpd-ssl.conf.CSW
-DISTFILES += update20to22
-
-
 INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWap2worker CSWap2perfork
 INCOMPATIBLE_PKGS_CSWapache2 += CSWapache2c
 
@@ -79,18 +84,51 @@
 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.worker 50
 ALTERNATIVE_event = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.event 40
 
-pre-configure-modulated:
-	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
-	$(MAKECOOKIE)
-
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
 CONFIGURE_ARGS += --with-mpm=$(MPM)
 CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --enable-layout=csw
+CONFIGURE_ARGS += --enable-rule=SSL_EXPERIMENTAL
+CONFIGURE_ARGS += --enable-ssl
+CONFIGURE_ARGS += --with-z=$(prefix)
+CONFIGURE_ARGS += --with-ssl=$(prefix)
+
 ifneq ($(MPM),prefork)
 CONFIGURE_ARGS += --enable-modules=none
 else
+CONFIGURE_ARGS += --enable-suexec
+CONFIGURE_ARGS += --with-suexec-caller=nobody
+CONFIGURE_ARGS += --with-suexec-docroot=$(prefix)/apache2/share/htdocs
+CONFIGURE_ARGS += --with-suexec-userdir=public_html
+CONFIGURE_ARGS += --with-suexec-uidmin=100
+CONFIGURE_ARGS += --with-suexec-gidmin=100
+CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log
+CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec
+CONFIGURE_ARGS += --enable-authn-alias
+CONFIGURE_ARGS += --enable-authnz-ldap
+CONFIGURE_ARGS += --enable-file-cache
+CONFIGURE_ARGS += --enable-cache
+CONFIGURE_ARGS += --enable-disk-cache
+CONFIGURE_ARGS += --enable-mem-cache
+CONFIGURE_ARGS += --enable-bucketeer
+CONFIGURE_ARGS += --enable-charset-lite
+CONFIGURE_ARGS += --enable-ldap
+CONFIGURE_ARGS += --enable-log-forensic
+CONFIGURE_ARGS += --enable-mime-magic
+CONFIGURE_ARGS += --enable-cern-meta
+CONFIGURE_ARGS += --enable-usertrack
+CONFIGURE_ARGS += --enable-unique-id
+CONFIGURE_ARGS += --enable-version
+CONFIGURE_ARGS += --enable-proxy
+CONFIGURE_ARGS += --enable-proxy-connect
+CONFIGURE_ARGS += --enable-proxy-ftp
+CONFIGURE_ARGS += --enable-proxy-http
+CONFIGURE_ARGS += --enable-proxy-ajp
+CONFIGURE_ARGS += --enable-proxy-balancer
+CONFIGURE_ARGS += --enable-cgid
+CONFIGURE_ARGS += --enable-dav-lock
 CONFIGURE_ARGS += --enable-mods-shared=all
 endif
 
@@ -104,17 +142,19 @@
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 
 include gar/category.mk
-include files/rules.mk
 
 CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS)
 
 FIXCONFIG_DIRS     = $(DESTDIR)
 FIXCONFIG_RMPATHS  = $(DESTDIR)
-#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util
-#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util/include
-#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr
-#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr/include
 
+pre-configure-modulated:
+	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
+	@gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \
+		$(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout
+	@$(MAKECOOKIE)
+
+
 post-install-modulated: rename-httpd copy-local-files create-templates
 
 rename-httpd:

Deleted: csw/mgar/pkg/apache2/trunk/files/apr-lfs.diff
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/apr-lfs.diff	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/apr-lfs.diff	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru httpd-2.2.6.orig/srclib/apr/configure httpd-2.2.6/srclib/apr/configure
---- httpd-2.2.6.orig/srclib/apr/configure	2007-09-04 16:08:55.000000000 -0400
-+++ httpd-2.2.6/srclib/apr/configure	2007-10-19 21:15:14.257260000 -0400
-@@ -25213,7 +25213,7 @@
-     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_LARGEFILE64_SOURCE\""
-     CPPFLAGS="-D_LARGEFILE64_SOURCE"
-   else
--    apr_addto_bugger="-D_LARGEFILE64_SOURCE"
-+    apr_addto_bugger="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-     for i in $apr_addto_bugger; do
-       apr_addto_duplicate="0"
-       for j in $CPPFLAGS; do

Deleted: csw/mgar/pkg/apache2/trunk/files/apr_atomic.c.diff
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/apr_atomic.c.diff	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/apr_atomic.c.diff	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,171 +0,0 @@
---- httpd-2.2.4/srclib/apr/atomic/unix/apr_atomic.c.orig	2006-08-03 07:05:27.000000000 -0400
-+++ httpd-2.2.4/srclib/apr/atomic/unix/apr_atomic.c	2007-01-21 23:28:38.160867000 -0500
-@@ -1,9 +1,9 @@
--/* Licensed to the Apache Software Foundation (ASF) under one or more
-- * contributor license agreements.  See the NOTICE file distributed with
-- * this work for additional information regarding copyright ownership.
-- * The ASF licenses this file to You 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
-+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
-+ * applicable.
-+ *
-+ * 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
-  *
-@@ -22,19 +22,69 @@
- 
- #include <stdlib.h>
- 
--#if defined(__GNUC__) && defined(__STRICT_ANSI__) && !defined(USE_GENERIC_ATOMICS)
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+#include <atomic.h>
-+#if defined(USE_GENERIC_ATOMICS)
-+#undef USE_GENERIC_ATOMICS
-+#endif
-+
-+static volatile apr_uint32_t solaris_atomic_cas32(volatile apr_uint32_t *mem,
-+        apr_uint32_t with,
-+        apr_uint32_t cmp)
-+{
-+    volatile uint32_t prev;
-+    prev = atomic_cas_32(mem, cmp, with);
-+    return (apr_uint32_t) prev;
-+}
-+
-+static volatile apr_uint32_t solaris_atomic_add32(volatile apr_uint32_t *mem,
-+        apr_uint32_t val)
-+{
-+    return (apr_uint32_t) atomic_add_32_nv(mem, (int32_t) val);
-+}
-+
-+static volatile apr_uint32_t solaris_atomic_sub32(volatile apr_uint32_t *mem,
-+        apr_uint32_t val)
-+{
-+    volatile uint32_t result;
-+    volatile int32_t sub = (int32_t) -val;
-+    result = atomic_add_32_nv(mem, sub);
-+    return (apr_uint32_t) result;
-+}
-+
-+static volatile int solaris_atomic_dec32(volatile apr_uint32_t *mem)
-+{
-+    volatile int32_t result;
-+    result = (int32_t) atomic_dec_32_nv((volatile uint32_t *) mem);
-+    result -= 1;
-+    return (int) result;
-+}
-+
-+static volatile apr_uint32_t solaris_atomic_swap32(volatile apr_uint32_t *mem, apr_uint32_t val)
-+{
-+    volatile uint32_t result;
-+    result = atomic_swap_32((uint32_t *) mem, (uint32_t *) val);
-+    return (apr_uint32_t) result;
-+}
-+
-+#endif /* SOLARIS */
-+
-+#if defined(__GNUC__) && defined(__STRICT_ANSI__) && !defined(USE_GENERIC_ATOMICS) && !defined(SOLARIS10)
- /* force use of generic atomics if building e.g. with -std=c89, which
-  * doesn't allow inline asm */
- #define USE_GENERIC_ATOMICS
- #endif
- 
--#if (defined(__i386__) || defined(__x86_64__)) \
--    && defined(__GNUC__) && !defined(USE_GENERIC_ATOMICS)
-+#if (defined(__i386__) || defined(__i386) || defined (__amd64) || defined(__x86_64__) || defined (__sparc) || defined (__sparcv9)) \
-+    && !defined(USE_GENERIC_ATOMICS) && defined(SOLARIS2)
- 
- APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, 
-                                            apr_uint32_t with,
-                                            apr_uint32_t cmp)
- {
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+    return solaris_atomic_cas32(mem, with, cmp);
-+#else
-     apr_uint32_t prev;
- 
-     asm volatile ("lock; cmpxchgl %1, %2"             
-@@ -42,17 +92,23 @@
-                   : "r" (with), "m" (*(mem)), "0"(cmp) 
-                   : "memory", "cc");
-     return prev;
-+#endif
- }
- #define APR_OVERRIDE_ATOMIC_CAS32
- 
- static apr_uint32_t inline intel_atomic_add32(volatile apr_uint32_t *mem, 
-                                               apr_uint32_t val)
- {
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+    return solaris_atomic_add32(mem, val);
-+#else
-+
-     asm volatile ("lock; xaddl %0,%1"
-                   : "=r"(val), "=m"(*mem) /* outputs */
-                   : "0"(val), "m"(*mem)   /* inputs */
-                   : "memory", "cc");
-     return val;
-+#endif
- }
- 
- APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, 
-@@ -64,15 +120,22 @@
- 
- APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
- {
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+    solaris_atomic_sub32(mem, val);
-+#else
-     asm volatile ("lock; subl %1, %0"
-                   :
-                   : "m" (*(mem)), "r" (val)
-                   : "memory", "cc");
-+#endif
- }
- #define APR_OVERRIDE_ATOMIC_SUB32
- 
- APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
- {
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+    return solaris_atomic_dec32(mem);
-+#else
-     unsigned char prev;
- 
-     asm volatile ("lock; decl %1;\n\t"
-@@ -81,6 +144,7 @@
-                   : "m" (*(mem))
-                   : "memory", "cc");
-     return prev;
-+#endif
- }
- #define APR_OVERRIDE_ATOMIC_DEC32
- 
-@@ -98,6 +162,9 @@
- 
- APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
- {
-+#if defined(SOLARIS2) && ((SOLARIS2 + 0) >= 10)
-+    return solaris_atomic_swap32(mem, val);
-+#else
-     apr_uint32_t prev = val;
- 
-     asm volatile ("lock; xchgl %0, %1"
-@@ -105,12 +172,13 @@
-                   : "m" (*(mem)), "0"(prev)
-                   : "memory");
-     return prev;
-+#endif
- }
- #define APR_OVERRIDE_ATOMIC_XCHG32
- 
- /*#define apr_atomic_init(pool)        APR_SUCCESS*/
- 
--#endif /* (__linux__ || __EMX__ || __FreeBSD__) && __i386__ */
-+#endif /* (__linux__ || __EMX__ || __FreeBSD__ || __sun) */
- 
- #if (defined(__PPC__) || defined(__ppc__)) && defined(__GNUC__) \
-     && !defined(USE_GENERIC_ATOMICS)

Deleted: csw/mgar/pkg/apache2/trunk/files/apr_dbd_mysql.c
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/apr_dbd_mysql.c	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/apr_dbd_mysql.c	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,1625 +0,0 @@
-/*
-         Copyright (c) 2003-7, WebThing Ltd and other contributors
- 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.  Alternatively, where this program
-is aggregated with the Apache APR-UTIL package version 1.2 or later,
-you can distribute and/or modify it under the terms of the Apache
-License 2.0 as published by the Apache Software Foundation.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-applicable License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-You may obtain a copy of the Apache License 2.0 at:
-http://www.apache.org/licenses/LICENSE-2.0
- 
-*/
-
-/* LICENSE NOTE
- *
- * The current GPL satisfies MySQL licensing terms without
- * invoking any exceptions.  ASF policy doesn't permit GPL
- * software to be distributed by apache.org, but this should
- * not be a problem for third-parties who wish to distribute
- * it alongside the APR and other Apache software.
- * 
- * It is updated to dual license after discussion with Debian
- * and taking into account MySQL's FOSS exception.
- * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
- * http://www.mysql.com/company/legal/licensing/foss-exception.html
- *
- * MAINTAINERS
- *
- * This code was originally written by Nick Kew for MySQL 4.1.
- * and subsequently updated by others to support MySQL 5.0.
- * The current lead maintainer is Bojan Smojver, with others
- * contributing via the developer list at apr.apache.org.
- *
- */
-
-
-#include "apu.h"
-#define HAVE_MYSQL_MYSQL_H
-
-#if APU_HAVE_MYSQL
-
-#include "apu_version.h"
-#include "apu_config.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-
-#ifdef HAVE_MYSQL_H
-#include <mysql.h>
-#include <errmsg.h>
-#elif defined(HAVE_MYSQL_MYSQL_H)
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
-#endif
-
-#include "apr_strings.h"
-#include "apr_buckets.h"
-
-#include "apr_dbd_internal.h"
-
-/* default maximum field size 1 MB */
-#define FIELDSIZE 1048575
-
-struct apr_dbd_prepared_t {
-    MYSQL_STMT* stmt;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int nargs;
-    int nvals;
-    apr_dbd_type_e *types;
-#endif
-};
-
-struct apr_dbd_transaction_t {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int mode;
-#endif
-    int errnum;
-    apr_dbd_t *handle;
-};
-
-struct apr_dbd_t {
-    MYSQL* conn ;
-    apr_dbd_transaction_t* trans ;
-    unsigned long fldsz;
-};
-
-struct apr_dbd_results_t {
-    int random;
-    MYSQL_RES *res;
-    MYSQL_STMT *statement;
-    MYSQL_BIND *bind;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    apr_pool_t *pool;
-#endif
-};
-struct apr_dbd_row_t {
-    MYSQL_ROW row;
-    apr_dbd_results_t *res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    unsigned long *len;
-#endif
-};
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-/* MySQL specific bucket for BLOB types */
-typedef struct apr_bucket_lob apr_bucket_lob;
-/**
- * A bucket referring to a MySQL BLOB
- */
-struct apr_bucket_lob {
-    /** Number of buckets using this memory */
-    apr_bucket_refcount  refcount;
-    /** The row this bucket refers to */
-    const apr_dbd_row_t *row;
-    /** The column this bucket refers to */
-    int col;
-    /** The pool into which any needed structures should
-     *  be created while reading from this bucket */
-    apr_pool_t *readpool;
-};
-
-static void lob_bucket_destroy(void *data);
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block);
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p);
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list);
-
-static const apr_bucket_type_t apr_bucket_type_lob = {
-    "LOB", 5, APR_BUCKET_DATA,
-    lob_bucket_destroy,
-    lob_bucket_read,
-    apr_bucket_setaside_notimpl,
-    apr_bucket_shared_split,
-    apr_bucket_shared_copy
-};
-
-static void lob_bucket_destroy(void *data)
-{
-    apr_bucket_lob *f = data;
-
-    if (apr_bucket_shared_destroy(f)) {
-        /* no need to destroy database objects here; it will get
-         * done automatically when the pool gets cleaned up */
-        apr_bucket_free(f);
-    }
-}
-
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block)
-{
-    apr_bucket_lob *a = e->data;
-    const apr_dbd_row_t *row = a->row;
-    apr_dbd_results_t *res = row->res;
-    int col = a->col;
-    apr_bucket *b = NULL;
-    int rv;
-    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
-    apr_off_t boffset = e->start;
-    MYSQL_BIND *bind = &res->bind[col];
-
-    *str = NULL;  /* in case we die prematurely */
-
-    /* fetch from offset if not at the beginning */
-    if (boffset > 0) {
-        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
-        if (rv != 0) {
-            return APR_EGENERAL;
-        }
-    }
-    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
-    *len = e->length - blength;
-    *str = bind->buffer;
-
-    /* allocate new buffer, since we used this one for the bucket */
-    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
-
-    /*
-     * Change the current bucket to refer to what we read,
-     * even if we read nothing because we hit EOF.
-     */
-    apr_bucket_pool_make(e, *str, *len, res->pool);
-
-    /* If we have more to read from the field, then create another bucket */
-    if (blength > 0) {
-        /* for efficiency, we can just build a new apr_bucket struct
-         * to wrap around the existing LOB bucket */
-        b = apr_bucket_alloc(sizeof(*b), e->list);
-        b->start  = boffset + *len;
-        b->length = blength;
-        b->data   = a;
-        b->type   = &apr_bucket_type_lob;
-        b->free   = apr_bucket_free;
-        b->list   = e->list;
-        APR_BUCKET_INSERT_AFTER(e, b);
-    }
-    else {
-        lob_bucket_destroy(a);
-    }
-
-    return APR_SUCCESS;
-}
-
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p)
-{
-    apr_bucket_lob *f;
-
-    f = apr_bucket_alloc(sizeof(*f), b->list);
-    f->row = row;
-    f->col = col;
-    f->readpool = p;
-
-    b = apr_bucket_shared_make(b, f, offset, len);
-    b->type = &apr_bucket_type_lob;
-
-    return b;
-}
-
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list)
-{
-    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
-    APR_BUCKET_INIT(b);
-    b->free = apr_bucket_free;
-    b->list = list;
-    return apr_bucket_lob_make(b, row, col, offset, len, p);
-}
-
-#endif
-
-static apr_status_t free_result(void *data)
-{
-    mysql_free_result(data);
-    return APR_SUCCESS;
-}
-
-static int dbd_mysql_select(apr_pool_t *pool, apr_dbd_t *sql,
-                            apr_dbd_results_t **results,
-                            const char *query, int seek)
-{
-    int sz;
-    int ret;
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-    ret = mysql_query(sql->conn, query);
-    if (!ret) {
-        if (sz = mysql_field_count(sql->conn), sz > 0) {
-            if (!*results) {
-                *results = apr_palloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*results)->random = seek;
-            (*results)->statement = NULL;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-            (*results)->pool = pool;
-#endif
-            if (seek) {
-                (*results)->res = mysql_store_result(sql->conn);
-            }
-            else {
-                (*results)->res = mysql_use_result(sql->conn);
-            }
-            apr_pool_cleanup_register(pool, (*results)->res,
-                                      free_result,apr_pool_cleanup_null);
-        }
-    } else {
-        ret = mysql_errno(sql->conn);
-    }
-    
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
-    if (sql->trans) {
-#endif
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
-{
-    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
-        return NULL;
-    }
-
-    return mysql_fetch_fields(res->res)[n].name;
-}
-#endif
-
-static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
-                             apr_dbd_row_t **row, int rownum)
-{
-    MYSQL_ROW r = NULL;
-    int ret = 0;
-
-    if (res->statement) {
-        if (res->random) {
-            if (rownum >= 0) {
-                mysql_stmt_data_seek(res->statement, (my_ulonglong)rownum);
-            }
-        }
-        ret = mysql_stmt_fetch(res->statement);
-        switch (ret) {
-        case 1:
-            ret = mysql_stmt_errno(res->statement);
-            break;
-        case MYSQL_NO_DATA:
-            ret = -1;
-            break;
-        default:
-            ret = 0; /* bad luck - get_entry will deal with this */
-            break;
-        }
-    }
-    else {
-        if (res->random) {
-            if (rownum >= 0) {
-                mysql_data_seek(res->res, (my_ulonglong) rownum);
-            }
-        }
-        r = mysql_fetch_row(res->res);
-        if (r == NULL) {
-            ret = -1;
-        }
-    }
-    if (ret == 0) {
-        if (!*row) {
-            *row = apr_palloc(pool, sizeof(apr_dbd_row_t));
-        }
-        (*row)->row = r;
-        (*row)->res = res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        (*row)->len = mysql_fetch_lengths(res->res);
-#endif
-    }
-    else {
-        apr_pool_cleanup_run(pool, res->res, free_result);
-    }
-    return ret;
-}
-#if 0
-/* An improved API that was proposed but not followed up */
-static int dbd_mysql_get_entry(const apr_dbd_row_t *row, int n,
-                               apr_dbd_datum_t *val)
-{
-    MYSQL_BIND *bind;
-    if (row->res->statement) {
-        bind = &row->res->bind[n];
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            val->type = APR_DBD_VALUE_NULL;
-            return -1;
-        }
-        if (*bind->is_null) {
-            val->type = APR_DBD_VALUE_NULL;
-            return -1;
-        }
-        else {
-            val->type = APR_DBD_VALUE_STRING;
-            val->value.stringval = bind->buffer;
-        }
-    }
-    else {
-        val->type = APR_DBD_VALUE_STRING;
-        val->value.stringval = row->row[n];
-    }
-    return 0;
-}
-#else
-
-static const char *dbd_mysql_get_entry(const apr_dbd_row_t *row, int n)
-{
-    MYSQL_BIND *bind;
-    if (row->res->statement) {
-        bind = &row->res->bind[n];
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return NULL;
-        }
-        if (*bind->is_null) {
-            return NULL;
-        }
-        else {
-            return bind->buffer;
-        }
-    }
-    else {
-        return row->row[n];
-    }
-    return NULL;
-}
-#endif
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
-                                        apr_dbd_type_e type, void *data)
-{
-    if (row->res->statement) {
-        MYSQL_BIND *bind = &row->res->bind[n];
-        unsigned long len = *bind->length;
-
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return APR_EGENERAL;
-        }
-
-        if (*bind->is_null) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
-            *(char**)data = bind->buffer;
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_lob_create(row, n, 0, len,
-                                      row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    else {
-        if (row->row[n] == NULL) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *(char**)data = row->row[n];
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_pool_create(row->row[n], row->len[n],
-                                       row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    return 0;
-}
-#endif
-
-static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
-{
-    return mysql_error(sql->conn);
-}
-
-static int dbd_mysql_query(apr_dbd_t *sql, int *nrows, const char *query)
-{
-    int ret;
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-    ret = mysql_query(sql->conn, query);
-    if (ret != 0) {
-        ret = mysql_errno(sql->conn);
-    }
-    *nrows = mysql_affected_rows(sql->conn);
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
-    if (sql->trans) {
-#endif
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static const char *dbd_mysql_escape(apr_pool_t *pool, const char *arg,
-                                    apr_dbd_t *sql)
-{
-    unsigned long len = strlen(arg);
-    char *ret = apr_palloc(pool, 2*len + 1);
-    mysql_real_escape_string(sql->conn, ret, arg, len);
-    return ret;
-}
-
-static apr_status_t stmt_close(void *data)
-{
-    mysql_stmt_close(data);
-    return APR_SUCCESS;
-}
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             int nargs, int nvals, apr_dbd_type_e *types,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    int ret;
-
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        (*statement)->nargs = nargs;
-        (*statement)->nvals = nvals;
-        (*statement)->types = types;
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
-                           const char **values, MYSQL_BIND *bind)
-{
-    int i, j;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_unsigned = 0;
-        bind[i].is_null = NULL;
-
-        if (values[j] == NULL) {
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-        }
-        else {
-            switch (statement->types[i]) {
-            case APR_DBD_TYPE_BLOB:
-            case APR_DBD_TYPE_CLOB:
-                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = atol(values[++j]);
-
-                /* skip table and column */
-                j += 2;
-                break;
-            default:
-                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = strlen(values[j]);
-                break;
-            }
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                     int *nrows, apr_dbd_prepared_t *statement,
-                                     MYSQL_BIND *bind)
-{
-    int ret;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            const char **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                      apr_dbd_results_t **res,
-                                      apr_dbd_prepared_t *statement,
-                                      int random, MYSQL_BIND *bind)
-{
-    int nfields, i;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            (*res)->pool = pool;
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                    }
-                    else {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    }
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             const char **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
-}
-
-static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
-                            const void **values, MYSQL_BIND *bind)
-{
-    void *arg;
-    int i, j;
-    apr_dbd_type_e type;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        arg = (void *)values[j];
-
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = NULL;
-
-        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UTINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_SHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_USHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_INT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UINT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONG:
-            if (sizeof(int) == sizeof(long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(int));
-                *(int*)bind[i].buffer = *(long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONG:
-            if (sizeof(unsigned int) == sizeof(unsigned long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
-                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            if (sizeof(long long) == sizeof(apr_int64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(long long));
-                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
-                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = strlen((const char *)arg);
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            bind[i].buffer = (void *)arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = *(apr_size_t*)values[++j];
-
-            /* skip table and column */
-            j += 2;
-            break;
-        case APR_DBD_TYPE_NULL:
-        default:
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-            break;
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
-                             int *nrows, apr_dbd_prepared_t *statement,
-                             const void **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                              apr_dbd_prepared_t *statement, va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              const void **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                               apr_dbd_results_t **res,
-                               apr_dbd_prepared_t *statement, int random,
-                               va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
-}
-#else
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    char *myquery = apr_pstrdup(pool, query);
-    char *p = myquery;
-    const char *q;
-    int ret;
-    for (q = query; *q; ++q) {
-        if (q[0] == '%') {
-            if (isalpha(q[1])) {
-                *p++ = '?';
-                ++q;
-            }
-            else if (q[1] == '%') {
-                /* reduce %% to % */
-                *p++ = *q++;
-            }
-            else {
-                *p++ = *q;
-            }
-        }
-        else {
-            *p++ = *q;
-        }
-    } 
-    *p = 0;
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, myquery, strlen(myquery));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            int nargs, const char **values)
-{
-    MYSQL_BIND *bind;
-    char *arg;
-    int ret;
-    int i;
-    my_bool is_null = FALSE;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-    nargs = mysql_stmt_param_count(statement->stmt);
-
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-    for (i=0; i < nargs; ++i) {
-        arg = (char*)values[i];
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
-    }
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    MYSQL_BIND *bind;
-    char *arg;
-    int ret;
-    int nargs = 0;
-    int i;
-    my_bool is_null = FALSE;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-    nargs = mysql_stmt_param_count(statement->stmt);
-
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-    for (i=0; i < nargs; ++i) {
-        arg = va_arg(args, char*);
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
-    }
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             int nargs, const char **args)
-{
-    int i;
-    int nfields;
-    char *arg;
-    my_bool is_null = FALSE;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    nargs = mysql_stmt_param_count(statement->stmt);
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-
-    for (i=0; i < nargs; ++i) {
-        arg = (char*)args[i];
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
-    }
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    int i;
-    int nfields;
-    char *arg;
-    my_bool is_null = FALSE;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-    int nargs;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    nargs = mysql_stmt_param_count(statement->stmt);
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-
-    for (i=0; i < nargs; ++i) {
-        arg = va_arg(args, char*);
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
-    }
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-#endif
-
-static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
-{
-    int ret = -1;
-    if (trans) {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        /* rollback on error or explicit rollback request */
-        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
-#else
-        if (trans->errnum) {
-#endif
-            trans->errnum = 0;
-            ret = mysql_rollback(trans->handle->conn);
-        }
-        else {
-            ret = mysql_commit(trans->handle->conn);
-        }
-    }
-    ret |= mysql_autocommit(trans->handle->conn, 1);
-    trans->handle->trans = NULL;
-    return ret;
-}
-/* Whether or not transactions work depends on whether the
- * underlying DB supports them within MySQL.  Unfortunately
- * it fails silently with the default InnoDB.
- */
-
-static int dbd_mysql_transaction(apr_pool_t *pool, apr_dbd_t *handle,
-                                 apr_dbd_transaction_t **trans)
-{
-    /* Don't try recursive transactions here */
-    if (handle->trans) {
-        dbd_mysql_end_transaction(handle->trans) ;
-    }
-    if (!*trans) {
-        *trans = apr_pcalloc(pool, sizeof(apr_dbd_transaction_t));
-    }
-    (*trans)->errnum = mysql_autocommit(handle->conn, 0);
-    (*trans)->handle = handle;
-    handle->trans = *trans;
-    return (*trans)->errnum;
-}
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode;
-}
-
-static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
-                                          int mode)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode = (mode & TXN_MODE_BITS);
-}
-#endif
-
-static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
-{
-    static const char *const delims = " \r\n\t;|,";
-    const char *ptr;
-    int i;
-    const char *key;
-    size_t klen;
-    const char *value;
-    size_t vlen;
-#if MYSQL_VERSION_ID >= 50013
-    my_bool do_reconnect = 1;
-#endif
-    MYSQL *real_conn;
-    unsigned long flags = 0;
-    
-    struct {
-        const char *field;
-        const char *value;
-    } fields[] = {
-        {"host", NULL},
-        {"user", NULL},
-        {"pass", NULL},
-        {"dbname", NULL},
-        {"port", NULL},
-        {"sock", NULL},
-        {"flags", NULL},
-        {"fldsz", NULL},
-        {NULL, NULL}
-    };
-    unsigned int port = 0;
-    apr_dbd_t *sql = apr_pcalloc(pool, sizeof(apr_dbd_t));
-    sql->fldsz = FIELDSIZE;
-    sql->conn = mysql_init(sql->conn);
-    if ( sql->conn == NULL ) {
-        return NULL;
-    }
-    for (ptr = strchr(params, '='); ptr; ptr = strchr(ptr, '=')) {
-        for (key = ptr-1; isspace(*key); --key);
-        klen = 0;
-        while (isalpha(*key)) {
-            /* don't parse backwards off the start of the string */
-            if (key == params) {
-                --key;
-                ++klen;
-                break;
-            }
-            --key;
-            ++klen;
-        }
-        ++key;
-        for (value = ptr+1; isspace(*value); ++value);
-        vlen = strcspn(value, delims);
-        for (i = 0; fields[i].field != NULL; i++) {
-            if (!strncasecmp(fields[i].field, key, klen)) {
-                fields[i].value = apr_pstrndup(pool, value, vlen);
-                break;
-            }
-        }
-        ptr = value+vlen;
-    }
-    if (fields[4].value != NULL) {
-        port = atoi(fields[4].value);
-    }
-    if (fields[6].value != NULL &&
-        !strcmp(fields[6].value, "CLIENT_FOUND_ROWS")) {
-        flags |= CLIENT_FOUND_ROWS; /* only option we know */
-    }
-    if (fields[7].value != NULL) {
-        sql->fldsz = atol(fields[7].value);
-    }
-
-#if MYSQL_VERSION_ID >= 50013
-    /* the MySQL manual says this should be BEFORE mysql_real_connect */
-    mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect);
-#endif
-    
-    real_conn = mysql_real_connect(sql->conn, fields[0].value,
-                                   fields[1].value, fields[2].value,
-                                   fields[3].value, port,
-                                   fields[5].value, flags);
-
-    if(real_conn == NULL) {
-        mysql_close(sql->conn);
-        return NULL;
-    }
-
-#if MYSQL_VERSION_ID >= 50013
-    /* Some say this should be AFTER mysql_real_connect */
-    mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect);
-#endif
-
-    return sql;
-}
-
-static apr_status_t dbd_mysql_close(apr_dbd_t *handle)
-{
-    mysql_close(handle->conn);
-    return APR_SUCCESS;
-}
-
-static apr_status_t dbd_mysql_check_conn(apr_pool_t *pool,
-                                         apr_dbd_t *handle)
-{
-    return mysql_ping(handle->conn) ? APR_EGENERAL : APR_SUCCESS;
-}
-
-static int dbd_mysql_select_db(apr_pool_t *pool, apr_dbd_t* handle,
-                               const char* name)
-{
-    return mysql_select_db(handle->conn, name);
-}
-
-static void *dbd_mysql_native(apr_dbd_t *handle)
-{
-    return handle->conn;
-}
-
-static int dbd_mysql_num_cols(apr_dbd_results_t *res)
-{
-    if (res->statement) {
-        return mysql_stmt_field_count(res->statement);
-    }
-    else {
-        return mysql_num_fields(res->res);
-    }
-}
-
-static int dbd_mysql_num_tuples(apr_dbd_results_t *res)
-{
-    if (res->random) {
-        if (res->statement) {
-            return (int) mysql_stmt_num_rows(res->statement);
-        }
-        else {
-            return (int) mysql_num_rows(res->res);
-        }
-    }
-    else {
-        return -1;
-    }
-}
-
-static apr_status_t thread_end(void *data)
-{
-    mysql_thread_end();
-    return APR_SUCCESS;
-}
-
-static void dbd_mysql_init(apr_pool_t *pool)
-{
-    my_init();
-    /* FIXME: this is a guess; find out what it really does */ 
-    apr_pool_cleanup_register(pool, NULL, thread_end, apr_pool_cleanup_null);
-}
-APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
-    "mysql",
-    dbd_mysql_init,
-    dbd_mysql_native,
-    dbd_mysql_open,
-    dbd_mysql_check_conn,
-    dbd_mysql_close,
-    dbd_mysql_select_db,
-    dbd_mysql_transaction,
-    dbd_mysql_end_transaction,
-    dbd_mysql_query,
-    dbd_mysql_select,
-    dbd_mysql_num_cols,
-    dbd_mysql_num_tuples,
-    dbd_mysql_get_row,
-    dbd_mysql_get_entry,
-    dbd_mysql_error,
-    dbd_mysql_escape,
-    dbd_mysql_prepare,
-    dbd_mysql_pvquery,
-    dbd_mysql_pvselect,
-    dbd_mysql_pquery,
-    dbd_mysql_pselect
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    ,
-    dbd_mysql_get_name,
-    dbd_mysql_transaction_mode_get,
-    dbd_mysql_transaction_mode_set,
-    "?",
-    dbd_mysql_pvbquery,
-    dbd_mysql_pvbselect,
-    dbd_mysql_pbquery,
-    dbd_mysql_pbselect,
-    dbd_mysql_datum_get
-#endif
-};
-
-#endif

Deleted: csw/mgar/pkg/apache2/trunk/files/apu-iconv.diff
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/apu-iconv.diff	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/apu-iconv.diff	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,82 +0,0 @@
-diff --speed-large-files --minimal -Nru httpd-2.2.0.orig/srclib/apr-util/build/apu-iconv.m4 httpd-2.2.0/srclib/apr-util/build/apu-iconv.m4
---- httpd-2.2.0.orig/srclib/apr-util/build/apu-iconv.m4	2005-12-02 13:50:10.542042000 -0500
-+++ httpd-2.2.0/srclib/apr-util/build/apu-iconv.m4	2005-12-02 13:45:23.126758000 -0500
-@@ -23,8 +23,8 @@
- #include <iconv.h>
- ],
- [
--  iconv_t cd = iconv_open("", "");
--  iconv(cd, NULL, NULL, NULL, NULL);
-+  libiconv_t cd = libiconv_open("", "");
-+  libiconv(cd, NULL, NULL, NULL, NULL);
- ], [$1], [$2])
- ])
- 
-diff --speed-large-files --minimal -Nru httpd-2.2.0.orig/srclib/apr-util/xlate/xlate.c httpd-2.2.0/srclib/apr-util/xlate/xlate.c
---- httpd-2.2.0.orig/srclib/apr-util/xlate/xlate.c	2005-12-02 13:50:11.259912000 -0500
-+++ httpd-2.2.0/srclib/apr-util/xlate/xlate.c	2005-12-02 13:45:23.170047000 -0500
-@@ -59,7 +59,7 @@
-     char *topage;
-     char *sbcs_table;
- #if APU_HAVE_ICONV
--    iconv_t ich;
-+    libiconv_t ich;
- #elif APU_HAVE_APR_ICONV
-     apr_iconv_t ich;
- #endif
-@@ -90,7 +90,7 @@
- 
- #elif APU_HAVE_ICONV
-     if (old->ich != (iconv_t)-1) {
--        if (iconv_close(old->ich)) {
-+        if (libiconv_close(old->ich)) {
-             int rv = errno;
- 
-             /* Sometimes, iconv is not good about setting errno. */
-@@ -117,7 +117,7 @@
-     }
- 
-     inbytes_left = outbytes_left = sizeof(inbuf);
--    translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-+    translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-                        &inbytes_left, &outbufptr, &outbytes_left);
- 
-     if (translated != (apr_size_t)-1
-@@ -129,7 +129,7 @@
- 
-         convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf));
-         memcpy(convset->sbcs_table, outbuf, sizeof(outbuf));
--        iconv_close(convset->ich);
-+        libiconv_close(convset->ich);
-         convset->ich = (iconv_t)-1;
- 
-         /* TODO: add the table to the cache */
-@@ -137,8 +137,8 @@
-     else {
-         /* reset the iconv descriptor, since it's now in an undefined
-          * state. */
--        iconv_close(convset->ich);
--        convset->ich = iconv_open(convset->topage, convset->frompage);
-+        libiconv_close(convset->ich);
-+        convset->ich = libiconv_open(convset->topage, convset->frompage);
-     }
- }
- #elif APU_HAVE_APR_ICONV
-@@ -248,7 +248,7 @@
- 
- #elif APU_HAVE_ICONV
-     if (!found) {
--        new->ich = iconv_open(topage, frompage);
-+        new->ich = libiconv_open(topage, frompage);
-         if (new->ich == (iconv_t)-1) {
-             int rv = errno;
-             /* Sometimes, iconv is not good about setting errno. */
-@@ -340,7 +340,7 @@
-         const char *inbufptr = inbuf;
-         char *outbufptr = outbuf;
-         apr_size_t translated;
--        translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-+        translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-                            inbytes_left, &outbufptr, outbytes_left);
- 
-         /* If everything went fine but we ran out of buffer, don't

Deleted: csw/mgar/pkg/apache2/trunk/files/config.mk
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/config.mk	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/config.mk	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,123 +0,0 @@
-# Source location
-MASTER_SITES  = http://www.ibiblio.com/pub/mirrors/apache/httpd/
-
-# MySQL support requires apr_dbd_mysql.c, which is not distributed with
-# apr-util due to licensing issues.
-#MASTER_SITES += http://apache.webthing.com/svn/apache/apr/
-#DISTFILES += apr_dbd_mysql.c
-
-# Visitor information
-SPKG_SOURCEURL = http://httpd.apache.org/
-
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += config.layout
-
-DEPEND += lib/libiconv
-DEPEND += lib/openssl
-DEPEND += lib/openldap
-DEPEND += lib/berkeleydb44
-DEPEND += lib/sqlite3
-DEPEND += lib/expat
-#DEPEND += server/postgres
-#DEPEND += server/mysql5
-
-# Build Configuration
-CONFIGURE_ARGS += --enable-layout=csw
-CONFIGURE_ARGS += --enable-rule=SSL_EXPERIMENTAL
-CONFIGURE_ARGS += --enable-ssl
-CONFIGURE_ARGS += --enable-mods-shared=most
-CONFIGURE_ARGS += --enable-authn-alias
-CONFIGURE_ARGS += --enable-authnz-ldap
-CONFIGURE_ARGS += --enable-file-cache
-CONFIGURE_ARGS += --enable-cache
-CONFIGURE_ARGS += --enable-disk-cache
-CONFIGURE_ARGS += --enable-mem-cache
-CONFIGURE_ARGS += --enable-bucketeer
-CONFIGURE_ARGS += --enable-charset-lite
-CONFIGURE_ARGS += --enable-ldap
-CONFIGURE_ARGS += --enable-log-forensic
-CONFIGURE_ARGS += --enable-mime-magic
-CONFIGURE_ARGS += --enable-cern-meta
-CONFIGURE_ARGS += --enable-usertrack
-CONFIGURE_ARGS += --enable-unique-id
-CONFIGURE_ARGS += --enable-version
-CONFIGURE_ARGS += --enable-proxy
-CONFIGURE_ARGS += --enable-proxy-connect
-CONFIGURE_ARGS += --enable-proxy-ftp
-CONFIGURE_ARGS += --enable-proxy-http
-CONFIGURE_ARGS += --enable-proxy-ajp
-CONFIGURE_ARGS += --enable-proxy-balancer
-CONFIGURE_ARGS += --enable-ssl
-CONFIGURE_ARGS += --enable-cgid
-CONFIGURE_ARGS += --enable-dav-lock
-
-CONFIGURE_ARGS += --with-z=$(prefix)
-CONFIGURE_ARGS += --with-ssl=$(prefix)
-
-CONFIGURE_ARGS += --enable-suexec
-CONFIGURE_ARGS += --with-suexec-caller=nobody
-CONFIGURE_ARGS += --with-suexec-docroot=$(prefix)/apache2/share/htdocs
-CONFIGURE_ARGS += --with-suexec-userdir=public_html
-CONFIGURE_ARGS += --with-suexec-uidmin=100
-CONFIGURE_ARGS += --with-suexec-gidmin=100
-CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log
-CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec
-
-ifdef USE_EXTERNAL_APR
-CONFIGURE_ARGS += --with-apr=$(bindir)/apr-config
-CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-config
-else
-# APR
-#CONFIGURE_ARGS += --enable-lfs
-#CONFIGURE_ARGS += --enable-threads
-#CONFIGURE_ARGS += --enable-other-child
-
-# APR-Util
-CONFIGURE_ARGS += --with-expat=$(prefix)
-CONFIGURE_ARGS += --with-iconv=$(prefix)
-CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-dbm=db47
-#CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb44
-#CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql
-CONFIGURE_ARGS += --without-sqlite2
-CONFIGURE_ARGS += --with-sqlite3=$(prefix)
-#CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5
-CONFIGURE_ARGS += --enable-dbd-dso
-CONFIGURE_ARGS += --without-odbc
-CONFIGURE_ARGS += --without-freetds
-
-# Patch APU to absolutely use GNU iconv
-PATCHFILES += apu-iconv.diff
-
-# Patch APR to set _FILE_OFFSET_BITS=64
-#PATCHFILES += apr-lfs.diff
-
-# Patches for global sysvsem from steleman
-ifeq ($(GAROSREL),5.10)
-USE_NONPORTABLE_ATOMICS = 1
-endif
-ifeq ($(GAROSREL),5.11)
-USE_NONPORTABLE_ATOMICS = 1
-endif
-ifdef USE_NONPORTABLE_ATOMICS
-PATCHFILES += configure.apr.diff
-PATCHFILES += apr_atomic.c.diff
-CONFIGURE_ARGS += --enable-nonportable-atomics
-endif
-
-# Required for bdb44
-#LIBS = -lnsl
-#export LIBS
-
-endif
-
-# Extra libpath
-#EXTRA_LIB += $(prefix)/bdb44/lib
-#EXTRA_INC += $(prefix)/bdb44/include
-
-#EXTRA_LIB += $(prefix)/postgresql/lib
-#EXTRA_INC += $(prefix)/postgresql/include
-
-#EXTRA_LIB += $(prefix)/mysql5/lib
-#EXTRA_INC += $(prefix)/mysql5/include
-

Deleted: csw/mgar/pkg/apache2/trunk/files/configure.apr.diff
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/configure.apr.diff	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/configure.apr.diff	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,102 +0,0 @@
---- httpd-2.2.4/srclib/apr/configure.orig	2007-01-06 01:39:14.000000000 -0500
-+++ httpd-2.2.4/srclib/apr/configure	2007-01-31 22:07:19.000000000 -0500
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59.
- #
-@@ -85,7 +85,7 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -243,7 +243,7 @@
- 
- 
- # Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- case X$ECHO in
- X*--fallback-echo)
-@@ -328,7 +328,7 @@
-     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- 	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-       # If we have ksh, try running configure again with it.
--      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
-       export ORIGINAL_CONFIG_SHELL
-       CONFIG_SHELL=/bin/ksh
-       export CONFIG_SHELL
-@@ -370,7 +370,7 @@
- 	if test "$prev" != 'sed 50q "$0"'; then
- 	  echo_test_string=`eval $prev`
- 	  export echo_test_string
--	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
- 	else
- 	  # Oops.  We lost completely, so just stick with echo.
- 	  echo=echo
-@@ -411,7 +411,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Maximum number of lines to put in a shell here document.
- # This variable seems obsolete.  It should probably be removed, and
-@@ -2168,7 +2168,7 @@
- 
-   rm -f config.nice
-   cat >config.nice<<EOF
--#! /bin/sh
-+#! /bin/bash
- #
- # Created by configure
- 
-@@ -4931,8 +4931,8 @@
- 
- 
-   if test -z "$apr_lock_method"; then
--    test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_FCNTL_SERIALIZE\""
--    apr_lock_method="USE_FCNTL_SERIALIZE"
-+    test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_SYSVSEM_SERIALIZE\""
-+    apr_lock_method="USE_SYSVSEM_SERIALIZE"
-   fi
- 
- 	;;
-@@ -5726,8 +5726,8 @@
-   fi
- 
- 
--  test "x$silent" != "xyes" && echo "  forcing SHELL to \"/bin/sh5\""
--  SHELL="/bin/sh5"
-+  test "x$silent" != "xyes" && echo "  forcing SHELL to \"/bin/bash5\""
-+  SHELL="/bin/bash5"
- 
- 	;;
-     *powerpc-tenon-machten*)
-@@ -9828,7 +9828,7 @@
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
-     while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-@@ -43782,7 +43782,7 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

Deleted: csw/mgar/pkg/apache2/trunk/files/rules.mk
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/rules.mk	2010-09-19 21:47:05 UTC (rev 11019)
+++ csw/mgar/pkg/apache2/trunk/files/rules.mk	2010-09-20 00:29:20 UTC (rev 11020)
@@ -1,15 +0,0 @@
-pre-configure-modulated: install-layout install-dbd-drivers apu-make-configure
-
-install-layout:
-	@gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \
-		$(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout
-	@$(MAKECOOKIE)
-
-install-dbd-drivers:
-	@$(MAKECOOKIE)
-#	@gcp -v $(FILEDIR)/apr_dbd_mysql.c $(WORKSRC)/srclib/apr-util/dbd
-
-apu-make-configure:
-	@( cd $(WORKDIR)/$(GARNAME)-$(GARVERSION)/srclib/apr-util ; autoconf )
-	@$(MAKECOOKIE)
-


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

From bdwalton at users.sourceforge.net  Mon Sep 20 03:19:14 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 01:19:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[11021]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxV2I-0003d8-QY@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11021
          http://gar.svn.sourceforge.net/gar/?rev=11021&view=rev
Author:   bdwalton
Date:     2010-09-20 01:19:14 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: drop a few configure args that are bundled via enable all mods flag

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-20 00:29:20 UTC (rev 11020)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-20 01:19:14 UTC (rev 11021)
@@ -116,8 +116,6 @@
 CONFIGURE_ARGS += --enable-charset-lite
 CONFIGURE_ARGS += --enable-ldap
 CONFIGURE_ARGS += --enable-log-forensic
-CONFIGURE_ARGS += --enable-mime-magic
-CONFIGURE_ARGS += --enable-cern-meta
 CONFIGURE_ARGS += --enable-usertrack
 CONFIGURE_ARGS += --enable-unique-id
 CONFIGURE_ARGS += --enable-version


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 Sep 20 03:25:07 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 01:25:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[11022] csw/mgar/pkg/apache2/trunk/files
Message-ID: <E1OxV7z-0003m5-8b@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11022
          http://gar.svn.sourceforge.net/gar/?rev=11022&view=rev
Author:   bdwalton
Date:     2010-09-20 01:25:07 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: drop a few more files that are no longer required

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall
    csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postremove
    csw/mgar/pkg/apache2/trunk/files/ap2dep.dot
    csw/mgar/pkg/apache2/trunk/files/extensionbuild.mk

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall	2010-09-20 01:19:14 UTC (rev 11021)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall	2010-09-20 01:25:07 UTC (rev 11022)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_HTTPD=$AP2_BINDIR/httpd
-AP2_CTRL=$AP2_BINDIR/apachectl
-AP2_CONF=$AP2_PREFIX/httpd.conf
-SVCADM=/usr/sbin/svcadm
-
-# Fix MPM links
-[ -x "$AP2_HTTPD" ] && mv $AP2_HTTPD $AP2_HTTPD.prefork-save
-cd $AP2_BINDIR
-ln httpd.prefork httpd
-installf $PKGINST $AP2_HTTPD
-installf -f $PKGINST
-
-exit 0

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postremove
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postremove	2010-09-20 01:19:14 UTC (rev 11021)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postremove	2010-09-20 01:25:07 UTC (rev 11022)
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_HTTPD=$AP2_BINDIR/httpd
-AP2_CTRL=$AP2_BINDIR/apachectl
-AP2_CONF=$AP2_PREFIX/etc/httpd.conf
-SVCADM=/usr/sbin/svcadm
-
-# Fix MPM links
-if [ -f "$AP2_HTTPD.prefork-save" ]; then
-    mv $AP2_HTTPD.prefork-save $AP2_HTTPD
-fi
-
-[ ! -f "$AP2_CONF" ] && exit 0
-[ ! -x "$AP2_HTTPD" ] && exit 0
-
-if [ -x "$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf" ] ; then
-    . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
-fi
-if [ -x "$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf" ] ; then
-    . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-fi
-
-if [ "$autoenable_daemons" = "no"  -o \
-     "$autoenable_apache2" = "no" ]; then
-    exit 0
-fi
-
-# Restart apache
-if [ -z "$PKG_INSTALL_ROOT" ]; then
-    echo Starting apache...
-    if [ -x "$SVCADM" ]; then
-        $SVCADM enable cswapache2
-    elif [ -x "$AP2_CTRL" ]; then
-        $AP2_CTRL -k start
-    fi
-fi
-
-exit 0

Deleted: csw/mgar/pkg/apache2/trunk/files/ap2dep.dot
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/ap2dep.dot	2010-09-20 01:19:14 UTC (rev 11021)
+++ csw/mgar/pkg/apache2/trunk/files/ap2dep.dot	2010-09-20 01:25:07 UTC (rev 11022)
@@ -1,11 +0,0 @@
-digraph csw {
-    subgraph core {
-        style=filled;
-        color=lightgrey;
-        apache2 -> ap2_prefork -> apache2c -> aprutil -> apr;
-        label = "core packages";
-    }
-    apache2_manual -> apache2;
-    ap2_suexec -> apache2;
-    ap2_worker -> apache2c;
-}

Deleted: csw/mgar/pkg/apache2/trunk/files/extensionbuild.mk
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/extensionbuild.mk	2010-09-20 01:19:14 UTC (rev 11021)
+++ csw/mgar/pkg/apache2/trunk/files/extensionbuild.mk	2010-09-20 01:25:07 UTC (rev 11022)
@@ -1,11 +0,0 @@
-# Apache paths
-AP2_ROOT      = $(prefix)/apache2
-AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
-AP2_EXTRACONF = $(DESTDIR)$(AP2_ROOT)/etc/extra
-AP2_SBIN      = $(AP2_ROOT)/sbin
-APXS          = $(AP2_SBIN)/apxs
-
-# APXS commands
-APXS2_BUILD   = $(APXS) -c
-_APXS2_INST   = $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i
-APXS2_INSTALL = mkdir -p $(AP2_LIBEXEC) ; $(_APXS2_INST)


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 Sep 20 03:26:31 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 01:26:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[11023]
 csw/mgar/pkg/apache2/trunk/files/CSWapache2rt. checkinstall
Message-ID: <E1OxV9L-00044Q-NS@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11023
          http://gar.svn.sourceforge.net/gar/?rev=11023&view=rev
Author:   bdwalton
Date:     2010-09-20 01:26:31 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: drop apache2rt checkinstall script (was sol8 specific)

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.checkinstall

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.checkinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.checkinstall	2010-09-20 01:25:07 UTC (rev 11022)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.checkinstall	2010-09-20 01:26:31 UTC (rev 11023)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ "`uname -r`" = "5.8" ]; then
-    arch=`uname -p`
-    patchrev="115831"
-    [ "$arch" = "i386" ] && patchrev="115832"
-
-    if [ -z "`showrev -p | grep $patchrev`" ]; then
-        echo "$PKGINST on $arch requires patch $patchrev"
-        exit 1
-    fi
-fi
-
-exit 0


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 Sep 20 03:43:39 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 01:43:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[11024]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OxVPv-0004Gz-5t@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11024
          http://gar.svn.sourceforge.net/gar/?rev=11024&view=rev
Author:   bdwalton
Date:     2010-09-20 01:43:39 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: tweak postinstall config file permissions

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-20 01:26:31 UTC (rev 11023)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-20 01:43:39 UTC (rev 11024)
@@ -164,9 +164,9 @@
 copy-local-files:
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc
-	@ginstall $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra
-	@ginstall $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra
+	@ginstall -m0644 $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc
+	@ginstall -m0644 $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra
+	@ginstall -m0644 $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin
 
 # Create stock templates


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 Sep 20 03:57:21 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 20 Sep 2010 01:57:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[11025]
	csw/mgar/pkg/apache2/trunk/checksums
Message-ID: <E1OxVdB-0004eN-Eb@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11025
          http://gar.svn.sourceforge.net/gar/?rev=11025&view=rev
Author:   bdwalton
Date:     2010-09-20 01:57:21 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
apache2: update checksums file

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/checksums

Modified: csw/mgar/pkg/apache2/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache2/trunk/checksums	2010-09-20 01:43:39 UTC (rev 11024)
+++ csw/mgar/pkg/apache2/trunk/checksums	2010-09-20 01:57:21 UTC (rev 11025)
@@ -1,9 +1 @@
-61b6b11aa70677da9386e90c3b5ba21c  CSWapache2.killproc
-308836569bf0cc1be27ac45e3123e0c2  apu-iconv.diff
-a7467a756cbd980d4cfe3c2cfb6a9e35  config.layout
-b3c2086facecc3f898d29f3c8c74da11  cswapache2
 7f33f2c8b213ad758c009ae46d2795ed  httpd-2.2.16.tar.gz
-d9d1abded665674800f3e5c246a4163f  httpd-mpm.conf.CSW
-796a7d5095ce154c274a2ccfd60ec753  httpd-ssl.conf.CSW
-f0941e5782e4bee45c2c95bd9460796b  httpd.conf.CSW
-033a19975c59bffcc5b144628f8a8e06  update20to22


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 Sep 20 13:49:54 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 20 Sep 2010 11:49:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[11026] csw/mgar/pkg/gtk2/trunk/Makefile
Message-ID: <E1Oxesc-0002a6-50@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11026
          http://gar.svn.sourceforge.net/gar/?rev=11026&view=rev
Author:   dmichelsen
Date:     2010-09-20 11:49:53 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
gtk2: Updated dependencies and enabled CUPS

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

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 01:57:21 UTC (rev 11025)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 11:49:53 UTC (rev 11026)
@@ -23,6 +23,8 @@
 DISTFILES = $(DISTNAME).tar.bz2
 DISTFILES += CSWgtk2.postinstall
 
+PATCHFILES = gdkdnd-x11.c.diff
+
 PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc
 
 CATALOGNAME_CSWgtk2 = gtk2
@@ -35,11 +37,15 @@
 
 BUILD_DEP_PKGS = CSWbash
 RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxcomposite CSWlibxcursor CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxrandr
-RUNTIME_DEP_PKGS_CSWgtk2devel  = CSWgtk2 CSWglib2devel CSWatkdevel
-RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibx11devel CSWlibxrenderdevel CSWpangodevel
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibxrender CSWpango CSWpng CSWtiff
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcups
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWgnutls
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWkrb5lib
 
+RUNTIME_DEP_PKGS_CSWgtk2devel  = CSWgtk2 CSWglib2devel CSWlibatkdevel
+RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibxrenderdevel CSWpangodevel
+
 SPKG_SOURCEURL = http://www.gtk.org/
 
 NOISAEXEC = 1
@@ -47,8 +53,11 @@
 BUILD64 = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --disable-cups
 
+CONFIGURE_ARGS-32 += --enable-cups
+CONFIGURE_ARGS-64 += --disable-cups
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
 STRIP_LIBTOOL = 1
 
 #TEST_TARGET = check
@@ -64,6 +73,13 @@
 
 ARCHALL_CSWgtk2doc = 1
 
-PATCHFILES = gdkdnd-x11.c.diff
+CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
 
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel
+CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel
+
 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  Mon Sep 20 14:34:34 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 20 Sep 2010 12:34:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[11027] csw/mgar/pkg/x11vnc/trunk
Message-ID: <E1OxfZq-0006hB-9b@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11027
          http://gar.svn.sourceforge.net/gar/?rev=11027&view=rev
Author:   dmichelsen
Date:     2010-09-20 12:34:34 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
x11vnc: Drop OCSW X11 support

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

Modified: csw/mgar/pkg/x11vnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11vnc/trunk/Makefile	2010-09-20 11:49:53 UTC (rev 11026)
+++ csw/mgar/pkg/x11vnc/trunk/Makefile	2010-09-20 12:34:34 UTC (rev 11027)
@@ -1,5 +1,5 @@
 GARNAME = x11vnc
-GARVERSION = 0.9.9
+GARVERSION = 0.9.12
 CATEGORIES = apps
 
 DESCRIPTION = Allows one to view remotely and interact with real X displays
@@ -17,15 +17,8 @@
 
 BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg
 RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg
-RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxtst
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/x11vnc/trunk/checksums
===================================================================
--- csw/mgar/pkg/x11vnc/trunk/checksums	2010-09-20 11:49:53 UTC (rev 11026)
+++ csw/mgar/pkg/x11vnc/trunk/checksums	2010-09-20 12:34:34 UTC (rev 11027)
@@ -1 +1 @@
-874008821a0588a73ec7fbe09b747bb0  x11vnc-0.9.9.tar.gz
+1498a68d02aa7b6c97bf746c073c8d00  x11vnc-0.9.12.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 Sep 20 15:06:20 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 20 Sep 2010 13:06:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[11028] csw/mgar/pkg/gtk2/trunk/Makefile
Message-ID: <E1Oxg4a-0006OT-06@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11028
          http://gar.svn.sourceforge.net/gar/?rev=11028&view=rev
Author:   dmichelsen
Date:     2010-09-20 13:06:19 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
gtk2: Add checkpkg overrides

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

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 12:34:34 UTC (rev 11027)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2010-09-20 13:06:19 UTC (rev 11028)
@@ -82,4 +82,8 @@
 CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel
 CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel
 
+# There are a *ton* of different libs on amd64 available that are not installed on Solaris 9.
+# Skip this complete test for now.
+CHECKPKG_OVERRIDES_CSWgtk2 += soname-not-found
+
 include gar/category.mk


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

From gadavis at users.sourceforge.net  Tue Sep 21 01:56:07 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Mon, 20 Sep 2010 23:56:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[11029] csw/mgar/pkg/py_json/
Message-ID: <E1OxqDO-0006j3-WB@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11029
          http://gar.svn.sourceforge.net/gar/?rev=11029&view=rev
Author:   gadavis
Date:     2010-09-20 23:56:06 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Initial package creation

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


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

From gadavis at users.sourceforge.net  Tue Sep 21 02:20:13 2010
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Tue, 21 Sep 2010 00:20:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[11030] csw/mgar/pkg/py_json/
Message-ID: <E1Oxqaj-0007KO-Gp@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11030
          http://gar.svn.sourceforge.net/gar/?rev=11030&view=rev
Author:   gadavis
Date:     2010-09-21 00:20:13 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
No need for this package afterall

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


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

From bonivart at users.sourceforge.net  Tue Sep 21 14:16:55 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 21 Sep 2010 12:16:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[11031] csw/mgar/pkg/clamav/trunk
Message-ID: <E1Oy1mJ-0003HV-F5@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11031
          http://gar.svn.sourceforge.net/gar/?rev=11031&view=rev
Author:   bonivart
Date:     2010-09-21 12:16:55 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
clamav: update to 0.96.3

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

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2010-09-21 00:20:13 UTC (rev 11030)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2010-09-21 12:16:55 UTC (rev 11031)
@@ -1,5 +1,5 @@
 GARNAME = clamav
-GARVERSION = 0.96.2
+GARVERSION = 0.96.3
 #DISTNAME = $(GARNAME)-devel-latest
 CATEGORIES = apps
 

Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums	2010-09-21 00:20:13 UTC (rev 11030)
+++ csw/mgar/pkg/clamav/trunk/checksums	2010-09-21 12:16:55 UTC (rev 11031)
@@ -1,3 +1,3 @@
 a3238ed54a098b66a8e3e9f8bb0ca399  CSWclamav.clamd.conf.p
 6c37b881661bf28741bb69045a642790  CSWclamav.freshclam.conf.p
-a2c2555d86868f91a01d0e2c2403bbec  clamav-0.96.2.tar.gz
+663274565c4da17abb112ff88895e510  clamav-0.96.3.tar.gz


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

From wahwah at users.sourceforge.net  Tue Sep 21 23:48:50 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 21 Sep 2010 21:48:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[11032]
	csw/mgar/pkg/postgresql/branches/postgresql-9.0/
Message-ID: <E1OyAhm-00023T-LL@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11032
          http://gar.svn.sourceforge.net/gar/?rev=11032&view=rev
Author:   wahwah
Date:     2010-09-21 21:48:50 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
postgresql: Version 9.0 has just been released, branching out to experiment with building it.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/


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

From wahwah at users.sourceforge.net  Wed Sep 22 00:11:50 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 21 Sep 2010 22:11:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[11033]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/
Message-ID: <E1OyB42-0002iG-QV@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11033
          http://gar.svn.sourceforge.net/gar/?rev=11033&view=rev
Author:   wahwah
Date:     2010-09-21 22:11:50 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
mysql: Branching MySQL out to test 5.5 build.

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


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

From wahwah at users.sourceforge.net  Wed Sep 22 09:05:45 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 22 Sep 2010 07:05:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[11034]
	csw/mgar/pkg/postgresql/branches/optcsw
Message-ID: <E1OyJOj-0003bM-H0@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11034
          http://gar.svn.sourceforge.net/gar/?rev=11034&view=rev
Author:   wahwah
Date:     2010-09-22 07:05:45 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgres: Committing working changes; next step will be to use GAR inbuilt variable substitution.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/optcsw/Makefile
    csw/mgar/pkg/postgresql/branches/optcsw/files/CSWpostgresql-84.postinstall
    csw/mgar/pkg/postgresql/branches/optcsw/files/README-CSW.txt
    csw/mgar/pkg/postgresql/branches/optcsw/files/cswpostgres.tmpl

Modified: csw/mgar/pkg/postgresql/branches/optcsw/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/postgresql/branches/optcsw/Makefile	2010-09-22 07:05:45 UTC (rev 11034)
@@ -40,7 +40,7 @@
 # libdir = $(prefix)$(version_dependent)/lib
 # Otherwise initdb can't find the right libraries, see:
 # http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php
-libdir = $(abspath $(prefix)$(version_dependent)/$(MM_LIBDIR))
+libdir = $(abspath $(prefix)$(version_dependent)/lib/$(MM_LIBDIR))
 localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION)
 sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION)
 datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION)
@@ -62,8 +62,7 @@
 DISTFILES += cswusergroup.tmpl
 DISTFILES += postgresql.conf.tmpl
 DISTFILES += README-CSW.txt
-# DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
-include files/CSWpostgresql-$(BASE_VERSION_G).postinstall
+DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
 
 PACKAGES += CSWpostgresql
 PACKAGES += CSWlibpq-$(BASE_VERSION_G)
@@ -160,12 +159,13 @@
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(PKGFILES_RT)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*lib(pq|pgtypes|ecpg)\.so.*
+# PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*lib(pq|pgtypes|ecpg)\.so.*
+PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*libpq\.so.*
 
 # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
 initscript_base_name = cswpostgres_$(VERSION_NODOT)
 INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name)
-USERGROUP = /etc/opt/csw/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
+USERGROUP = /etc$(prefix)/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
 PRESERVECONF = $(sysconfdir)/postgresql\.conf
 
 BIN_NAMES  = clusterdb
@@ -215,12 +215,24 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
+post-extract:
+	gsed -ie 's+ at sysconfdir@+$(sysconfdir)+g' \
+		$(WORKDIR)/CSWpostgresql-$(BASE_VERSION_G).postinstall
+	gsed -ie 's+ at PGDATA@+$(PGDATA)+g' \
+		$(WORKDIR)/CSWpostgresql-$(BASE_VERSION_G).postinstall
+	gsed -ie 's+ at bindir@+$(bindir)+g' \
+		$(WORKDIR)/CSWpostgresql-$(BASE_VERSION_G).postinstall
+	gsed -ie 's+ at VERSION_NODOT@+$(VERSION_NODOT)+g' \
+		$(WORKDIR)/CSWpostgresql-$(BASE_VERSION_G).postinstall
+	@$(MAKECOOKIE)
+
 post-merge:
 	ginstall -d $(PKGROOT)/etc$(prefix)/init.d
 	gsed \
 		-e 's+ at PGDATA@+$(PGDATA)+g' \
 		-e 's+ at sysconfdir@+$(sysconfdir)+g' \
 		-e 's+ at bindir@+$(bindir)+g' \
+		-e 's+ at VERSION_NODOT@+$(VERSION_NODOT)+g' \
 		< $(FILEDIR)/cswpostgres.tmpl \
 		> $(WORKDIR)/$(initscript_base_name)
 	ginstall \

Modified: csw/mgar/pkg/postgresql/branches/optcsw/files/CSWpostgresql-84.postinstall
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/files/CSWpostgresql-84.postinstall	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/postgresql/branches/optcsw/files/CSWpostgresql-84.postinstall	2010-09-22 07:05:45 UTC (rev 11034)
@@ -1,41 +1,39 @@
-define CSWpostgresql-84_postinstall
 #!/bin/sh
 # vim:set ft=sh:
 #
-# $$Id$$
+# $Id$
 #
 # Initialize the database cluster if it hasn't been initialized before.
 
 # Read in the user configuration file
 [ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf
-[ -s $(sysconfdir)/postgresql.conf ] && . $(sysconfdir)/postgresql.conf
+[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf
 
-PGDATA=$(PGDATA)
-PGINIT=$(bindir)/initdb
+PGDATA=@PGDATA@
+PGINIT=@bindir@/initdb
 
 initialize_cluster() {
-	chown postgres "$${PGDATA}"
-	chmod 0700 "$${PGDATA}"
+	chown postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
 	echo "Initializing PostgreSQL database..."
-	su postgres -c "\"$${PGINIT}\" -D \"$${PGDATA}\" -E utf-8"
+	su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8"
 }
 
-if [ `ls -l $${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
+if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
 	initialize_cluster
 else
 	echo "The database cluster seems to be initialized already."
 fi
 
 if [ -x /usr/sbin/svcadm ]; then
-	fmri="cswpostgres_$(VERSION_NODOT)"
-	echo "Enabling the $${fmri} service in SMF"
-	svcadm clear "$${fmri}"
-	svcadm enable "$${fmri}"
+	fmri="cswpostgres_ at VERSION_NODOT@"
+	echo "Enabling the ${fmri} service in SMF"
+	svcadm clear "${fmri}"
+	svcadm enable "${fmri}"
 else
-	initscript="/etc/opt/csw/init.d/cswpostgres_$(VERSION_NODOT)"
-	echo "Issuing $${initscript} start"
-	$${initscript} start
+	initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@"
+	echo "Issuing ${initscript} start"
+	"${initscript}" start
 fi
 
 exit 0
-endef

Modified: csw/mgar/pkg/postgresql/branches/optcsw/files/README-CSW.txt
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/files/README-CSW.txt	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/postgresql/branches/optcsw/files/README-CSW.txt	2010-09-22 07:05:45 UTC (rev 11034)
@@ -1,5 +1,7 @@
 *** Important information - please make sure you read this ! ***
 
+$Id$
+
 *** Migrating from older versions ***
 
 If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, 

Modified: csw/mgar/pkg/postgresql/branches/optcsw/files/cswpostgres.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/optcsw/files/cswpostgres.tmpl	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/postgresql/branches/optcsw/files/cswpostgres.tmpl	2010-09-22 07:05:45 UTC (rev 11034)
@@ -23,42 +23,10 @@
 
 # Defaults
 [ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${PGCTL}" ] && PGCTL=@bindir@/sparcv8/pg_ctl
-[ -z "${PGINIT}" ] && PGINIT=@bindir@/sparcv8/initdb
+[ -z "${PGCTL}" ] && PGCTL=@bindir@/pg_ctl
+[ -z "${PGINIT}" ] && PGINIT=@bindir@/initdb
 
 
-# The following attempts to catch any mistakes in the server
-# version - it checks if the 64-bit server was last run. If so,
-# it forces the 64-bit server, otherwise it won't start up!
-# And vice-versa for the 32-bit server...
-#
-# This version doesn't check the i386/amd64 architectures.
-if [ -f "${PGDATA}/postmaster.opts" ]; then
-  if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then
-    echo ${PGCTL} | grep "sparcv8" > /dev/null
-    if [ $? -eq 0 ]; then
-      echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 64-bit version was last run. Using 64-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv9/pg_ctl
-    PGINIT=@bindir@/sparcv9/initdb
-  elif grep 'sparcv8' ${PGDATA}/postmaster.opts > /dev/null; then
-    # Detected 32-bit server last used
-    echo "${PGCTL}" | grep "sparcv8" > /dev/null
-    if [ $? -ne 0 ]; then
-      echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 32-bit version was last run. Using 32-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv8/pg_ctl
-    PGINIT=@bindir@/sparcv8/initdb
-  else
-  	echo "Couldn't detect whether the previously run version was 32 or 64-bit."
-  	echo "Running the default."
-  	PGCTL=@bindir@/pg_ctl
-  	PGINIT=@bindir@/initdb
-  fi
-fi
-
 # Exit if postgres user hasn't been created.
 # FIXME: This bit of code is old. It might be obsolete.
 if grep '^postgres:' /etc/passwd >/dev/null; then
@@ -107,11 +75,11 @@
      # create and initialise data directory
      echo "Creating PostgreSQL data directory at ${PGDATA}..."
      # Create it, unless it's already there and empty
-     [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
      chown postgres "${PGDATA}"
      chmod 0700 "${PGDATA}"
      echo "Initialising PostgreSQL database..."
-     su postgres -c "${PGINIT} -D ${PGDATA} -E utf-8"
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8"
      ;;
 
 *)


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 Sep 22 09:40:06 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 07:40:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[11035]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OyJvy-0004fF-Qa@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11035
          http://gar.svn.sourceforge.net/gar/?rev=11035&view=rev
Author:   dmichelsen
Date:     2010-09-22 07:40:06 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
subversion: Fixes for 1.6.12

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-09-22 07:05:45 UTC (rev 11034)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-09-22 07:40:06 UTC (rev 11035)
@@ -53,6 +53,8 @@
 RUNTIME_DEP_PKGS_CSWsvn      += CSWlibserf
 RUNTIME_DEP_PKGS_CSWsvn      += CSWsqlite3rt
 RUNTIME_DEP_PKGS_CSWsvn      += CSWzlib
+RUNTIME_DEP_PKGS_CSWsvn      += CSWapr
+RUNTIME_DEP_PKGS_CSWsvn      += CSWapr-util
 
 SPKG_DESC_CSWsvn-devel     = Subversion Development Support
 CATALOGNAME_CSWsvn-devel   = subversion_devel
@@ -87,6 +89,7 @@
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWiconv
 PKGFILES_CSWap2svn            = $(prefix)/apache2.*
 PKGFILES_CSWap2svn           += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWapache2
 
 SPKG_DESC_CSWjavasvn           = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn         = javasvn
@@ -102,9 +105,7 @@
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn       = pm_subversion
@@ -187,6 +188,8 @@
 # EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl)
 EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.*
 
+STRIP_LIBTOOL = 1
+
 NODIRPATHS      = --libdir --libexecdir
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
 CONFIGURE_ARGS += --disable-mod-activation


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 Sep 22 10:41:37 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 08:41:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[11036] csw/mgar/pkg/postgresql/trunk/
Message-ID: <E1OyKtV-0002PE-M8@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11036
          http://gar.svn.sourceforge.net/gar/?rev=11036&view=rev
Author:   dmichelsen
Date:     2010-09-22 08:41:37 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: Sync up trunk with branch from Maciej

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/trunk/


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

From dmichelsen at users.sourceforge.net  Wed Sep 22 10:50:15 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 08:50:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[11037] csw/mgar/pkg/postgresql/trunk/
Message-ID: <E1OyL1r-0000Yy-BQ@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11037
          http://gar.svn.sourceforge.net/gar/?rev=11037&view=rev
Author:   dmichelsen
Date:     2010-09-22 08:50:15 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: Sync up trunk with branch from Maciej

Added Paths:
-----------
    csw/mgar/pkg/postgresql/trunk/


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

From dmichelsen at users.sourceforge.net  Wed Sep 22 11:45:07 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 09:45:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[11038] csw/mgar/pkg/grep/trunk
Message-ID: <E1OyLsx-00045D-JT@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11038
          http://gar.svn.sourceforge.net/gar/?rev=11038&view=rev
Author:   dmichelsen
Date:     2010-09-22 09:45:07 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
grep: Update to 2.7

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

Modified: csw/mgar/pkg/grep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/grep/trunk/Makefile	2010-09-22 08:50:15 UTC (rev 11037)
+++ csw/mgar/pkg/grep/trunk/Makefile	2010-09-22 09:45:07 UTC (rev 11038)
@@ -1,5 +1,5 @@
 GARNAME = grep
-GARVERSION = 2.6.3
+GARVERSION = 2.7
 CATEGORIES = utils
 
 DESCRIPTION = GNU grep
@@ -23,8 +23,10 @@
 PACKAGES = CSWggrep
 CATALOGNAME = ggrep
 
-DEP_PKGS = CSWggettextrt CSWpcrert
+DEP_PKGS = CSWggettextrt CSWiconv CSWpcrert
 
+EXTRA_LINKER_FLAGS = -liconv
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 

Modified: csw/mgar/pkg/grep/trunk/checksums
===================================================================
--- csw/mgar/pkg/grep/trunk/checksums	2010-09-22 08:50:15 UTC (rev 11037)
+++ csw/mgar/pkg/grep/trunk/checksums	2010-09-22 09:45:07 UTC (rev 11038)
@@ -1 +1 @@
-69a3bf508a3f14d12369e0e1c7a92763  grep-2.6.3.tar.xz
+6dd9931a52501519d7779a27cf953326  grep-2.7.tar.xz


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

From dmichelsen at users.sourceforge.net  Wed Sep 22 13:43:25 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 11:43:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[11039]
	csw/mgar/pkg/postgresql/trunk/Makefile
Message-ID: <E1OyNjR-0007a5-0s@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11039
          http://gar.svn.sourceforge.net/gar/?rev=11039&view=rev
Author:   dmichelsen
Date:     2010-09-22 11:43:24 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: First step towards relayout, alternatives still missing

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 09:45:07 UTC (rev 11038)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 11:43:24 UTC (rev 11039)
@@ -31,27 +31,25 @@
 define BLURB
 endef
 
-version_dependent = /lib/$(GARNAME)/$(BASE_VERSION)
-bindir_install = $(prefix)$(version_dependent)/bin
-bindir = $(prefix)$(version_dependent)/bin
-sbindir_install = $(prefix)$(version_dependent)/sbin
-sbindir = $(prefix)$(version_dependent)/sbin
-libdir_install = $(prefix)$(version_dependent)/lib
+pgsubdir = $(GARNAME)$(BASE_VERSION_G)
+bindir_install = $(exec_prefix)/bin/$(pgsubdir)
+sbindir_install = $(exec_prefix)/sbin/$(pgsubdir)
+libdir_install = $(exec_prefix)/lib/$(pgsubdir)
 # libdir = $(prefix)$(version_dependent)/lib
 # Otherwise initdb can't find the right libraries, see:
 # http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php
-libdir = $(abspath $(prefix)$(version_dependent)/$(MM_LIBDIR))
-localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION)
-sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION)
-datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION)
+localstatedir = /var$(prefix)/$(pgsubdir)
+sysconfdir = /etc$(prefix)/$(pgsubdir)
+datadir = $(prefix)/share/$(pgsubdir)
+# TODO: docdir is not honoured, installation still goes to /opt/csw/share/doc/postgresql
 docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION)
-includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION)
+includedir = $(prefix)/include/$(pgsubdir)
 infodir = $(datadir)/info
-libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION)
+libexecdir_install = $(exec_prefix)/libexec/$(pgsubdir)
 lispdir = $(datadir)/emacs/site-lisp
 mandir = $(datadir)/man
-sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION)
-sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION)
+sharedstatedir = $(prefix)/share/$(pgsubdir)
+sourcedir = $(prefix)/src/$(pgsubdir)
 
 MIGRATE_FILES_CSWpostgresql-$(BASE_VERSION_G)    = postgresql.conf
 MIGRATE_DEST_DIR_CSWpostgresql-$(BASE_VERSION_G) = $(sysconfdir)
@@ -93,10 +91,7 @@
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWreadline
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWzlib
 RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxslt
 RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWzlib
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev  = CSWpostgresql-$(BASE_VERSION_G)
 
 CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-84
@@ -131,7 +126,6 @@
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-includes=/opt/csw/include
-CONFIGURE_ARGS += --with-library=$(abspath /opt/csw/lib/$(MM_LIBDIR))
 
 # # Perl support only in the 32-bit version
 # CONFIGURE_ARGS_isa-sparcv8 += --with-perl
@@ -154,13 +148,15 @@
 SKIPTEST ?= 1
 TEST_TARGET = check
 
-PKGFILES_CSWpostgresql                        = $(prefix)/bin/.*
+# CSWpostgresql is a generic wrapper always pointing to the latest release
+PKGFILES_CSWpostgresql                        = NOFILES
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc  = $(PKGFILES_DOC)
+# Use this workaound until $(docdir) is honoured
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc += $(prefix)/share/doc.*
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(PKGFILES_RT)
+
+PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*lib(pq|pgtypes|ecpg)\.so.*
 
 # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
 initscript_base_name = cswpostgres_$(VERSION_NODOT)
@@ -241,9 +237,17 @@
 	ginstall -d $(PKGROOT)$(docdir)
 	# ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)
 	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	for b in $(BIN_NAMES); do \
-	  gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
-	done
+	# TBD: Do alternatives here
+	#for b in $(BIN_NAMES); do \
+	#  gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
+	#done
 	ginstall -d $(PKGROOT)$(PGDATA)
 	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \
+		gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \
+	done
+	mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)
+	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \
+		gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \
+	done
 	@$(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 Sep 22 15:13:35 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 13:13:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[11040]
	csw/mgar/pkg/postgresql/trunk/Makefile
Message-ID: <E1OyP8h-000639-AJ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11040
          http://gar.svn.sourceforge.net/gar/?rev=11040&view=rev
Author:   dmichelsen
Date:     2010-09-22 13:13:35 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: Add alternatives

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 11:43:24 UTC (rev 11039)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 13:13:35 UTC (rev 11040)
@@ -156,6 +156,7 @@
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
 
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
+PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)*)
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
 
 # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
@@ -199,6 +200,23 @@
 PROTOTYPE_PERMS_pgdata = 0700
 PROTOTYPE_CLASS_pgdata = ugfiles
 
+# This is one of the rare cases where a protoype filter is needed.
+# Do not copy this for other Makefiles unless you understand exactly what it does!!
+# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed)
+PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,'
+
+# ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B))
+ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(GARNAME)$(BASE_VERSION_G)-32 $(GARNAME)$(BASE_VERSION_G)-64 $(GARNAME)$(BASE_VERSION_G)-auto
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B)
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B)
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec)
+
+# checkpkg does not detect this dependency automatically
+CHECKPKG_OVERRIDES_CSWpostgresql-84 += surplus-dependency|CSWalternatives
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))


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

From dmichelsen at users.sourceforge.net  Wed Sep 22 15:16:37 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 13:16:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[11041] csw/mgar/gar/v2/gar.lib.mk
Message-ID: <E1OyPBd-0006B0-Mj@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11041
          http://gar.svn.sourceforge.net/gar/?rev=11041&view=rev
Author:   dmichelsen
Date:     2010-09-22 13:16:37 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
mGAR v2: Looks like docdir has never been used :-(

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2010-09-22 13:13:35 UTC (rev 11040)
+++ csw/mgar/gar/v2/gar.lib.mk	2010-09-22 13:16:37 UTC (rev 11041)
@@ -539,7 +539,7 @@
 
 #################### CONFIGURE RULES ####################
 
-TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir)
+TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconfdir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstatedir) --libdir=$(libdir) --infodir=$(infodir) --lispdir=$(lispdir) --includedir=$(includedir) --mandir=$(mandir) --docdir=$(docdir)
 
 NODIRPATHS += --lispdir
 


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 Sep 22 15:42:57 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 13:42:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[11042]
	csw/mgar/pkg/postgresql/trunk/Makefile
Message-ID: <E1OyPb7-0003Of-Vb@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11042
          http://gar.svn.sourceforge.net/gar/?rev=11042&view=rev
Author:   dmichelsen
Date:     2010-09-22 13:42:57 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: As of r11041 docdir now works for the first time!

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 13:16:37 UTC (rev 11041)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 13:42:57 UTC (rev 11042)
@@ -41,7 +41,6 @@
 localstatedir = /var$(prefix)/$(pgsubdir)
 sysconfdir = /etc$(prefix)/$(pgsubdir)
 datadir = $(prefix)/share/$(pgsubdir)
-# TODO: docdir is not honoured, installation still goes to /opt/csw/share/doc/postgresql
 docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION)
 includedir = $(prefix)/include/$(pgsubdir)
 infodir = $(datadir)/info
@@ -151,8 +150,6 @@
 # CSWpostgresql is a generic wrapper always pointing to the latest release
 PKGFILES_CSWpostgresql                        = NOFILES
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc  = $(PKGFILES_DOC)
-# Use this workaound until $(docdir) is honoured
-PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc += $(prefix)/share/doc.*
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
 
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
@@ -255,10 +252,6 @@
 	ginstall -d $(PKGROOT)$(docdir)
 	# ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)
 	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	# TBD: Do alternatives here
-	#for b in $(BIN_NAMES); do \
-	#  gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
-	#done
 	ginstall -d $(PKGROOT)$(PGDATA)
 	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
 	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \


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 Sep 22 22:28:17 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Sep 2010 20:28:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[11043] csw/mgar/pkg/libevent/branches
Message-ID: <E1OyVvN-0002kk-SP@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11043
          http://gar.svn.sourceforge.net/gar/?rev=11043&view=rev
Author:   dmichelsen
Date:     2010-09-22 20:28:17 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
libevent-2.0.x: Update to 2.0.7

Modified Paths:
--------------
    csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile
    csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums

Added Paths:
-----------
    csw/mgar/pkg/libevent/branches/libevent-2.0.x/

Removed Paths:
-------------
    csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/

Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile
===================================================================
--- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/Makefile	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile	2010-09-22 20:28:17 UTC (rev 11043)
@@ -1,16 +1,16 @@
 GARNAME = libevent
-GARVERSION = 2.0.4
+GARVERSION = 2.0.7
 CATEGORIES = lib
 
 EXTRA_MODULATORS = GARVERSION
-#MODULATIONS_GARVERSION = 1.1a 2.0.4
-MODULATIONS_GARVERSION = 2.0.4
+#MODULATIONS_GARVERSION = 1.1a 1.4.14b 2.0.7
+MODULATIONS_GARVERSION = 2.0.7
 
 SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a
 SKIP_MODULATIONS += isa-amd64-garversion-1.1a
 
 DISTVERSION-1.1a = 1.1a
-DISTVERSION-2.0.4 = 2.0.4-alpha
+DISTVERSION-2.0.7 = 2.0.7-rc
 
 DESCRIPTION = Event notification library
 define BLURB
@@ -24,11 +24,13 @@
 SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz)
 DISTFILES += $(SOURCEFILES)
 
+DISTNAME = $(GARNAME)-$(DISTVERSION-$(GARVERSION))
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-alpha.tar.gz
 
-PATCHFILES += 0001-Detect-broken-unsetenv-at-unit-test-runtime.patch
-PATCHFILES += 0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch
+# PATCHFILES += 0001-Detect-broken-unsetenv-at-unit-test-runtime.patch
+# PATCHFILES += 0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch
 
 NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES))
 
@@ -47,8 +49,6 @@
 
 SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/
 
-WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION))
-
 BUILD64 = 1
 NOISAEXEC = 1
 CONFIGURE_ARGS  = $(DIRPATHS) 
@@ -60,9 +60,9 @@
 MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only
 MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir)
 
-MERGE_SCRIPTS_isa-default-garversion-2.0.4 = copy-all
-MERGE_SCRIPTS_isa-extra-garversion-2.0.4 = copy-relocated-only
-MERGE_DIRS_isa-extra-garversion-2.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-default-garversion-2.0.7 = copy-all
+MERGE_SCRIPTS_isa-extra-garversion-2.0.7 = copy-relocated-only
+MERGE_DIRS_isa-extra-garversion-2.0.7 = $(libdir)
 
 PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibevent-devel += $(bindir)/.*

Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums
===================================================================
--- csw/mgar/pkg/libevent/branches/libevent-2.0.3-alpha/checksums	2010-09-21 22:11:50 UTC (rev 11033)
+++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums	2010-09-22 20:28:17 UTC (rev 11043)
@@ -1,4 +1 @@
-50c285b06a7843509d5a1d6ae7310153  0001-Detect-broken-unsetenv-at-unit-test-runtime.patch
-8f00dfd6a27eb8ab308014ef15bb1883  0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch
-cfb3d03f400a75503595795b60a05244  0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch
-dbc50f32af9f2ade151a0737e5edf205  libevent-2.0.4-alpha.tar.gz
+c14d4cf6e7b0d94fe69b88a977214432  libevent-2.0.7-rc.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 Sep 23 15:06:24 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 23 Sep 2010 13:06:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[11044] csw/mgar/pkg
Message-ID: <E1OylVI-0000Fh-AS@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11044
          http://gar.svn.sourceforge.net/gar/?rev=11044&view=rev
Author:   dmichelsen
Date:     2010-09-23 13:06:24 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
lighttpd: Initial commit, just the hull

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


Property changes on: csw/mgar/pkg/lighttpd/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2010-09-23 13:06:24 UTC (rev 11044)
@@ -0,0 +1,23 @@
+# $Id$
+GARNAME = lighttpd
+GARVERSION = 1.0
+CATEGORIES = category
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = 
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of MASTER_SITES, then 
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# UPSTREAM_MASTER_SITES = 
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/lighttpd/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lighttpd/trunk/checksums
===================================================================

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

From wahwah at users.sourceforge.net  Fri Sep 24 02:57:22 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 24 Sep 2010 00:57:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[11045]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: <E1OywbK-0002aM-E3@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11045
          http://gar.svn.sourceforge.net/gar/?rev=11045&view=rev
Author:   wahwah
Date:     2010-09-24 00:57:22 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
python: Removed the mention of the unmentionable details of bad content.

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2010-09-23 13:06:24 UTC (rev 11044)
+++ csw/mgar/pkg/python/trunk/Makefile	2010-09-24 00:57:22 UTC (rev 11045)
@@ -136,8 +136,7 @@
 LICENSE = LICENSE
 
 # These won't be fixed.
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content
 
 # This is an exception, since these are original Python packages.
 CHECKPKG_OVERRIDES_CSWpython-test  += pkgname-does-not-start-with-CSWpy-


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

From bdwalton at users.sourceforge.net  Fri Sep 24 03:19:39 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 24 Sep 2010 01:19:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[11046]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Oywwt-0003An-GT@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11046
          http://gar.svn.sourceforge.net/gar/?rev=11046&view=rev
Author:   bdwalton
Date:     2010-09-24 01:19:39 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
apache2: drop the experimental event mpm

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-24 00:57:22 UTC (rev 11045)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-24 01:19:39 UTC (rev 11046)
@@ -18,11 +18,10 @@
 
 # Build multiple mpm's and merge them all into one install
 EXTRA_MODULATORS = MPM
-MODULATIONS_MPM = prefork worker event
+MODULATIONS_MPM = prefork worker
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
 MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
-MERGE_SCRIPTS_isa-default-mpm-event = copy-all
 
 # Visitor information
 SPKG_SOURCEURL = http://httpd.apache.org/
@@ -79,10 +78,9 @@
 # the Makefile.
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
-ALTERNATIVES_CSWapache2 = prefork worker event
+ALTERNATIVES_CSWapache2 = prefork worker
 ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.prefork 100
 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.worker 50
-ALTERNATIVE_event = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.event 40
 
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config


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

From gmarler at users.sourceforge.net  Fri Sep 24 05:59:57 2010
From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net)
Date: Fri, 24 Sep 2010 03:59:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[11047] csw/mgar/pkg/findutils/trunk
Message-ID: <E1OyzS1-00030X-1o@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11047
          http://gar.svn.sourceforge.net/gar/?rev=11047&view=rev
Author:   gmarler
Date:     2010-09-24 03:59:56 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
Remove extra ISAs
Skip tests for the time being
add pre-configure-modulated to import gnulib
add post-install-modulated target to create /opt/csw/gnu links

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

Modified: csw/mgar/pkg/findutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 01:19:39 UTC (rev 11046)
+++ csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 03:59:56 UTC (rev 11047)
@@ -1,5 +1,3 @@
-# Todo
-# * Non-maintainer upload, needs to be checked by Chris
 GARNAME = findutils
 GARVERSION = 4.4.2
 CATEGORIES = utils
@@ -37,9 +35,6 @@
 # because that's what -fast does if it's last in the list.
 OPT_FLAGS_SOS = -fast -xnolibmopt
 
-EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis
-EXTRA_BUILD_ISAS_i386  = pentium_pro
-
 CHECKPKG_OVERRIDES_CSWfindutils += surplus-dependency|CSWiconv
 
 # Test target requires GNU diff
@@ -61,8 +56,9 @@
 # FAIL: parent.old-O2, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied
 # FAIL: parent.old-O3, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied
 
-# Skipping until the above are rectified - if they ever are
-SKIPTEST = 1
+# Skip tests until the following is resolved, or we can backport the fixes as patches
+#   https://savannah.gnu.org/bugs/?30883
+SKIPTEST ?= 1
 
 include gar/category.mk
 
@@ -75,7 +71,20 @@
 # configure:37777: result: /opt/csw/lib/libintl.so -R/opt/csw/lib
 #
 
+
+pre-configure-modulated:
+	cd $(WORKSRC) && bash ./import-gnulib.sh
+	@$(MAKECOOKIE)
+
 post-configure-modulated:
 	@perl -pi -e 's|-R/opt/csw/lib||' $(WORKSRC)/*/Makefile
 	@$(MAKECOOKIE)
 
+#
+# Provide /opt/csw/gnu links via this target
+#
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/findutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/findutils/trunk/checksums	2010-09-24 01:19:39 UTC (rev 11046)
+++ csw/mgar/pkg/findutils/trunk/checksums	2010-09-24 03:59:56 UTC (rev 11047)
@@ -1,2 +1,2 @@
-06573955b3b3ad2ab85031083bd5eb02  download/CSWfindutils.postinstall
-351cc4adb07d54877fa15f75fb77d39f  download/findutils-4.4.2.tar.gz
+06573955b3b3ad2ab85031083bd5eb02  CSWfindutils.postinstall
+351cc4adb07d54877fa15f75fb77d39f  findutils-4.4.2.tar.gz


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

From gmarler at users.sourceforge.net  Fri Sep 24 06:07:08 2010
From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net)
Date: Fri, 24 Sep 2010 04:07:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[11048]
	csw/mgar/pkg/findutils/trunk/Makefile
Message-ID: <E1OyzYy-0003I5-Uf@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11048
          http://gar.svn.sourceforge.net/gar/?rev=11048&view=rev
Author:   gmarler
Date:     2010-09-24 04:07:08 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
removed pre-config-modulated target, as the gnulib
import script improperly excludes too many git commits, such that the targeted commit is
actually unavailable

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

Modified: csw/mgar/pkg/findutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 03:59:56 UTC (rev 11047)
+++ csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 04:07:08 UTC (rev 11048)
@@ -71,11 +71,6 @@
 # configure:37777: result: /opt/csw/lib/libintl.so -R/opt/csw/lib
 #
 
-
-pre-configure-modulated:
-	cd $(WORKSRC) && bash ./import-gnulib.sh
-	@$(MAKECOOKIE)
-
 post-configure-modulated:
 	@perl -pi -e 's|-R/opt/csw/lib||' $(WORKSRC)/*/Makefile
 	@$(MAKECOOKIE)


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

From wahwah at users.sourceforge.net  Fri Sep 24 06:16:42 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 24 Sep 2010 04:16:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[11049]
	csw/mgar/pkg/postgresql/branches/postgresql-9.0
Message-ID: <E1OyziE-0001bO-9f@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11049
          http://gar.svn.sourceforge.net/gar/?rev=11049&view=rev
Author:   wahwah
Date:     2010-09-24 04:16:42 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
postgresql: Work in progress. Porting the Ubuntu package. Merged some of the changes made by Dago.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-84.postinstall
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-90.postinstall

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2010-09-24 04:07:08 UTC (rev 11048)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2010-09-24 04:16:42 UTC (rev 11049)
@@ -1,6 +1,8 @@
 # Copyright 2009 OpenCSW
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+#
+# Based on the Ubuntu PostgreSQL package.
 
 # This BUILD is NOT READY!  It needs work before it's usable.
 
@@ -14,18 +16,17 @@
 # example of it.   (gmake repackage may produce the right output)
 
 GARNAME = postgresql
-BASE_VERSION = 8.4
+BASE_VERSION = 9.0
 # How to make one automatically?
-VERSION_NODOT = 8_4
-BASE_VERSION_G = 84
-PATCHLEVEL = 4
+VERSION_NODOT = 9_0
+BASE_VERSION_G = 90
+PATCHLEVEL = 0
 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 
 # Useful when making a series of builds on the same day
 # GARFLAVOR ?= DBG
 
-DESCRIPTION = An advanced open source database
 SPKG_SOURCEURL = http://www.postgresql.org/
 
 define BLURB
@@ -40,12 +41,12 @@
 # libdir = $(prefix)$(version_dependent)/lib
 # Otherwise initdb can't find the right libraries, see:
 # http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php
-libdir = $(abspath $(prefix)$(version_dependent)/$(MM_LIBDIR))
+libdir = $(abspath $(prefix)$(version_dependent)/lib/$(MM_LIBDIR))
 localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION)
-sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION)
+sysconfdir = /etc$(prefix)/postgresql-common
 datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION)
-docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION)
-includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION)
+docdir = $(prefix)/share/doc/$(GARNAME)-doc-$(BASE_VERSION)
+includedir = $(prefix)/include/postgresql/
 infodir = $(datadir)/info
 libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION)
 lispdir = $(datadir)/emacs/site-lisp
@@ -62,11 +63,11 @@
 DISTFILES += cswusergroup.tmpl
 DISTFILES += postgresql.conf.tmpl
 DISTFILES += README-CSW.txt
-# DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
-include files/CSWpostgresql-$(BASE_VERSION_G).postinstall
+DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
 
 PACKAGES += CSWpostgresql
-PACKAGES += CSWlibpq-$(BASE_VERSION_G)
+PACKAGES += CSWlibpq
+PACKAGES += CSWlibpq-devel
 PACKAGES += CSWpostgresql-$(BASE_VERSION_G)
 PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-dev
 PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc
@@ -74,37 +75,37 @@
 CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)      = postgresql_$(BASE_VERSION_G)
 CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc  = postgresql_$(BASE_VERSION_G)_doc
 CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-dev  = postgresql_$(BASE_VERSION_G)_devel
-CATALOGNAME_CSWlibpq-$(BASE_VERSION_G)           = libpq$(BASE_VERSION_G)
+CATALOGNAME_CSWlibpq                             = libpq
 CATALOGNAME_CSWpostgresql                        = postgresql
 
 SPKG_DEST_CSWpostgresql                       = An advanced open source database, a metapackage
 SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)     = An advanced open source database, version $(BASE_VERSION).x
 SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation
 SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-dev = PostgreSQL $(BASE_VERSION).x Developer Files
-SPKG_DESC_CSWlibpq-$(BASE_VERSION_G)          = PostgreSQL $(BASE_VERSION).x Libraries
+SPKG_DESC_CSWlibpq                            = PostgreSQL C client library (built from $(BASE_VERSION).x sources)
+SPKG_DESC_CSWlibpq-devel                      = PostgreSQL C client headers (built from $(BASE_VERSION).x sources)
 
 RUNTIME_DEP_PKGS_CSWpostgresql                        = CSWpostgresql-$(BASE_VERSION_G)
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibgnugetopt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibpq-$(BASE_VERSION_G)
+RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibpq
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxslt
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWosslrt
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWreadline
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWlibxslt
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibpq                            += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibpq                            += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibpq                            += CSWlibxslt
+RUNTIME_DEP_PKGS_CSWlibpq                            += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibpq                            += CSWzlib
 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev  = CSWpostgresql-$(BASE_VERSION_G)
 
-CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-84
-CHECKPKG_OVERRIDES_CSWpostgresql-84-dev += surplus-dependency|CSWpostgresql-84
+CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-90
+CHECKPKG_OVERRIDES_CSWpostgresql-90-dev += surplus-dependency|CSWpostgresql-90
 
 ARCHALL_CSWpostgresql                       = 1
 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
-ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
 
 LICENSE = COPYRIGHT
 
@@ -154,18 +155,45 @@
 SKIPTEST ?= 1
 TEST_TARGET = check
 
-PKGFILES_CSWpostgresql                        = $(prefix)/bin/.*
+PKGFILES_CSWpostgresql                        = NOFILES
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc  = $(PKGFILES_DOC)
-PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc += $(prefix)/share/doc.*
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(PKGFILES_RT)
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir).*lib(pq|pgtypes|ecpg)\.so.*
 
+PKGFILES_CSWlibpq  = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
+PKGFILES_CSWlibpq += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)*)
+PKGFILES_CSWlibpq += $(libdir)/64
+
+#
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/internal/.*
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq-fe.h
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq-events.h
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq/libpq-fs.h
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/pg_config.*.h
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/postgres_ext.h
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/catalog/pg_type.h /usr/include/postgresql/catalog
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/catalog/genbki.h /usr/include/postgresql/catalog
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/nodes/nodes.h /usr/include/postgresql/nodes
+# PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/utils/(elog|errcodes|palloc).h /usr/include/postgresql/utils
+# Need to move these.
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/utils/(elog|errcodes|palloc).h
+# PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/{c,pg_config,pg_config_manual,pg_config_os,port,pg_trace}.h /usr/include/postgresql/
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/(c|pg_config|pg_config_manual|pg_config_os|port|pg_trace}.h
+# PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/postgres{,_fe,_ext}.h /usr/include/postgresql/
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/postgres(|_fe|_ext}.h
+# PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/8.4/server/mb/pg_wchar.h /usr/include/postgresql/mb
+PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/mb/pg_wchar.h
+PKGFILES_CSWlibpq-devel += $(prefix)/lib/libpq.so
+# PKGFILES_CSWlibpq-devel += $(prefix)/lib/postgresql/8.4/bin/pg_config usr/bin
+# Needs to be moved
+PKGFILES_CSWlibpq-devel += $(prefix)/bin/pg_config
+PKGFILES_CSWlibpq-devel += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1
+PKGFILES_CSWlibpq-devel += $(prefix)/share/locale/*/LC_MESSAGES/pg_config-8.4.mo
+
+
 # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
 initscript_base_name = cswpostgres_$(VERSION_NODOT)
 INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name)
-USERGROUP = /etc/opt/csw/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
+USERGROUP = /etc$(prefix)/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
 PRESERVECONF = $(sysconfdir)/postgresql\.conf
 
 BIN_NAMES  = clusterdb
@@ -203,6 +231,25 @@
 PROTOTYPE_PERMS_pgdata = 0700
 PROTOTYPE_CLASS_pgdata = ugfiles
 
+EXPANDVARS  = CSWpostgresql-$(BASE_VERSION_G).postinstall
+EXPANDVARS += cswpostgres.tmpl
+# This is one of the rare cases where a protoype filter is needed.
+# Do not copy this for other Makefiles unless you understand exactly what it does!!
+# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed)
+PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,'
+
+# ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B))
+ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(GARNAME)$(BASE_VERSION_G)-32 $(GARNAME)$(BASE_VERSION_G)-64 $(GARNAME)$(BASE_VERSION_G)-auto
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B)
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B)
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300
+ALTERNATIVE_$(GARNAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec)
+
+# checkpkg does not detect this dependency automatically
+CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += surplus-dependency|CSWalternatives
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
@@ -213,18 +260,26 @@
 
 post-install-modulated:
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
+	ginstall -d -m 755 $(DESTDIR)$(prefix)/bin
+	[ -r $(DESTDIR)$(bindir)/pg_config ] && \
+	gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true
+	ginstall -d -m 755 $(DESTDIR)/include/postgresql/utils
+	for f in elog.h errcodes.h palloc.h; do \
+		[ -r $(DESTDIR)$(includedir)/utils/$${f} ] && \
+			gmv -v $(DESTDIR)$(includedir)/utils/$${f} \
+			$(DESTDIR)$(prefix)/include/postgresql/utils/ || true; \
+	done
+	for f in c.h pg_config.h pg_config_manual.h pg_config_os,port.h pg_trace.h ; do \
+		[ -f $(DESTDIR)$(prefix)/include/postgresql/8.4/server/$${f} ] && \
+		gmv -v $(DESTDIR)$(prefix)/include/postgresql/8.4/server/$${f} \
+			$(DESTDIR)/$(prefix)/include/postgresql/ || true; \
+	done
 	@$(MAKECOOKIE)
 
 post-merge:
 	ginstall -d $(PKGROOT)/etc$(prefix)/init.d
-	gsed \
-		-e 's+ at PGDATA@+$(PGDATA)+g' \
-		-e 's+ at sysconfdir@+$(sysconfdir)+g' \
-		-e 's+ at bindir@+$(bindir)+g' \
-		< $(FILEDIR)/cswpostgres.tmpl \
-		> $(WORKDIR)/$(initscript_base_name)
 	ginstall \
-		$(WORKDIR)/$(initscript_base_name) \
+		$(WORKDIR)/cswpostgres.tmpl \
 		$(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name)
 	ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)
 	gsed -e 's+ at PGDATA@+$(PGDATA)+g' \
@@ -241,9 +296,16 @@
 	ginstall -d $(PKGROOT)$(docdir)
 	# ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)
 	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	for b in $(BIN_NAMES); do \
-	  gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
-	done
+	# for b in $(BIN_NAMES); do \
+	#   gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
+	# done
 	ginstall -d $(PKGROOT)$(PGDATA)
 	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \
+		gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \
+	done
+	mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)
+	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \
+		gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \
+	done
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums	2010-09-24 04:07:08 UTC (rev 11048)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums	2010-09-24 04:16:42 UTC (rev 11049)
@@ -1 +1 @@
-4bf2448ad965bca3940df648c02194df  postgresql-8.4.4.tar.bz2
+14c2122cc322e69ab2ab702ed7714bbe  postgresql-9.0.0.tar.bz2

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-84.postinstall
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-84.postinstall	2010-09-24 04:07:08 UTC (rev 11048)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-84.postinstall	2010-09-24 04:16:42 UTC (rev 11049)
@@ -1,41 +1,39 @@
-define CSWpostgresql-84_postinstall
 #!/bin/sh
 # vim:set ft=sh:
 #
-# $$Id$$
+# $Id$
 #
 # Initialize the database cluster if it hasn't been initialized before.
 
 # Read in the user configuration file
 [ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf
-[ -s $(sysconfdir)/postgresql.conf ] && . $(sysconfdir)/postgresql.conf
+[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf
 
-PGDATA=$(PGDATA)
-PGINIT=$(bindir)/initdb
+PGDATA=@PGDATA@
+PGINIT=@bindir@/initdb
 
 initialize_cluster() {
-	chown postgres "$${PGDATA}"
-	chmod 0700 "$${PGDATA}"
+	chown postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
 	echo "Initializing PostgreSQL database..."
-	su postgres -c "\"$${PGINIT}\" -D \"$${PGDATA}\" -E utf-8"
+	su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8"
 }
 
-if [ `ls -l $${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
+if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
 	initialize_cluster
 else
 	echo "The database cluster seems to be initialized already."
 fi
 
 if [ -x /usr/sbin/svcadm ]; then
-	fmri="cswpostgres_$(VERSION_NODOT)"
-	echo "Enabling the $${fmri} service in SMF"
-	svcadm clear "$${fmri}"
-	svcadm enable "$${fmri}"
+	fmri="cswpostgres_ at VERSION_NODOT@"
+	echo "Enabling the ${fmri} service in SMF"
+	svcadm clear "${fmri}"
+	svcadm enable "${fmri}"
 else
-	initscript="/etc/opt/csw/init.d/cswpostgres_$(VERSION_NODOT)"
-	echo "Issuing $${initscript} start"
-	$${initscript} start
+	initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@"
+	echo "Issuing ${initscript} start"
+	"${initscript}" start
 fi
 
 exit 0
-endef

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-90.postinstall (from rev 11032, csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-84.postinstall)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-90.postinstall	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/CSWpostgresql-90.postinstall	2010-09-24 04:16:42 UTC (rev 11049)
@@ -0,0 +1,39 @@
+#!/bin/sh
+# vim:set ft=sh:
+#
+# $Id$
+#
+# Initialize the database cluster if it hasn't been initialized before.
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf
+[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf
+
+PGDATA=@PGDATA@
+PGINIT=@bindir@/initdb
+
+initialize_cluster() {
+	chown postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+	echo "Initializing PostgreSQL database..."
+	su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8"
+}
+
+if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
+	initialize_cluster
+else
+	echo "The database cluster seems to be initialized already."
+fi
+
+if [ -x /usr/sbin/svcadm ]; then
+	fmri="cswpostgres_ at VERSION_NODOT@"
+	echo "Enabling the ${fmri} service in SMF"
+	svcadm clear "${fmri}"
+	svcadm enable "${fmri}"
+else
+	initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@"
+	echo "Issuing ${initscript} start"
+	"${initscript}" start
+fi
+
+exit 0

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt	2010-09-24 04:07:08 UTC (rev 11048)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt	2010-09-24 04:16:42 UTC (rev 11049)
@@ -1,5 +1,7 @@
 *** Important information - please make sure you read this ! ***
 
+$Id$
+
 *** Migrating from older versions ***
 
 If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, 

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl	2010-09-24 04:07:08 UTC (rev 11048)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl	2010-09-24 04:16:42 UTC (rev 11049)
@@ -23,42 +23,10 @@
 
 # Defaults
 [ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${PGCTL}" ] && PGCTL=@bindir@/sparcv8/pg_ctl
-[ -z "${PGINIT}" ] && PGINIT=@bindir@/sparcv8/initdb
+[ -z "${PGCTL}" ] && PGCTL=@bindir@/pg_ctl
+[ -z "${PGINIT}" ] && PGINIT=@bindir@/initdb
 
 
-# The following attempts to catch any mistakes in the server
-# version - it checks if the 64-bit server was last run. If so,
-# it forces the 64-bit server, otherwise it won't start up!
-# And vice-versa for the 32-bit server...
-#
-# This version doesn't check the i386/amd64 architectures.
-if [ -f "${PGDATA}/postmaster.opts" ]; then
-  if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then
-    echo ${PGCTL} | grep "sparcv8" > /dev/null
-    if [ $? -eq 0 ]; then
-      echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 64-bit version was last run. Using 64-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv9/pg_ctl
-    PGINIT=@bindir@/sparcv9/initdb
-  elif grep 'sparcv8' ${PGDATA}/postmaster.opts > /dev/null; then
-    # Detected 32-bit server last used
-    echo "${PGCTL}" | grep "sparcv8" > /dev/null
-    if [ $? -ne 0 ]; then
-      echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 32-bit version was last run. Using 32-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv8/pg_ctl
-    PGINIT=@bindir@/sparcv8/initdb
-  else
-  	echo "Couldn't detect whether the previously run version was 32 or 64-bit."
-  	echo "Running the default."
-  	PGCTL=@bindir@/pg_ctl
-  	PGINIT=@bindir@/initdb
-  fi
-fi
-
 # Exit if postgres user hasn't been created.
 # FIXME: This bit of code is old. It might be obsolete.
 if grep '^postgres:' /etc/passwd >/dev/null; then
@@ -107,11 +75,11 @@
      # create and initialise data directory
      echo "Creating PostgreSQL data directory at ${PGDATA}..."
      # Create it, unless it's already there and empty
-     [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
      chown postgres "${PGDATA}"
      chmod 0700 "${PGDATA}"
      echo "Initialising PostgreSQL database..."
-     su postgres -c "${PGINIT} -D ${PGDATA} -E utf-8"
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8"
      ;;
 
 *)


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

From hson at users.sourceforge.net  Fri Sep 24 18:59:52 2010
From: hson at users.sourceforge.net (hson at users.sourceforge.net)
Date: Fri, 24 Sep 2010 16:59:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[11050] csw/mgar/pkg/wireshark/trunk
Message-ID: <E1OzBcm-0003dI-Bf@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11050
          http://gar.svn.sourceforge.net/gar/?rev=11050&view=rev
Author:   hson
Date:     2010-09-24 16:59:52 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
wireshark: Update to 1.4.0

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

Added Paths:
-----------
    csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2010-09-24 04:16:42 UTC (rev 11049)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2010-09-24 16:59:52 UTC (rev 11050)
@@ -1,5 +1,5 @@
 GARNAME = wireshark
-GARVERSION = 1.2.7
+GARVERSION = 1.4.0
 CATEGORIES = apps
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -14,25 +14,30 @@
 
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap 
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWpcrert CSWzlib
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWzlib
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgnutls CSWlibcares
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi
 RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt
 
-# krb5-config has -R/opt/csw/lib/
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/
+PATCHFILES = 0001-Solaris-9-doesn-t-have-stdint.h.patch
 
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/dftest
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/rawshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/tshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 SPKG_SOURCEURL = http://www.wireshark.org/
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_INC = $(prefix)/X11/include
+#EXTRA_LIB = $(prefix)/X11/lib
+#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
 # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib
 # since the latter is linked to /usr/openwin/lib/libX11.so.4
-EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+#EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2010-09-24 04:16:42 UTC (rev 11049)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2010-09-24 16:59:52 UTC (rev 11050)
@@ -1,2 +1 @@
-0fd62ea77189c27f583a3bc83d60c794  configure.diff
-cff6b18aa47a7e3eb973efe62c676b50  wireshark-1.2.7.tar.bz2
+13b188baea23cdad40b7a55921384a77  wireshark-1.4.0.tar.bz2

Added: csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch
===================================================================
--- csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch	                        (rev 0)
+++ csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch	2010-09-24 16:59:52 UTC (rev 11050)
@@ -0,0 +1,26 @@
+From dd7dcff4a05a4dfdd2e2db961c633e15fff4f8eb Mon Sep 17 00:00:00 2001
+From: Roger Hakansson <hson at current9x.(none)>
+Date: Thu, 23 Sep 2010 21:19:05 +0200
+Subject: [PATCH] Solaris 9 doesn't have stdint.h
+
+---
+ epan/wslua/lua_bitop.c |    4 ++
+ 1 files changed, 4 insertions(+)
+
+diff --git a/epan/wslua/lua_bitop.c b/epan/wslua/lua_bitop.c
+index e358e7a..6603eb6 100644
+--- a/epan/wslua/lua_bitop.c
++++ b/epan/wslua/lua_bitop.c
+@@ -40,8 +40,12 @@ typedef __int32 int32_t;
+ typedef unsigned __int32 uint32_t;
+ typedef unsigned __int64 uint64_t;
+ #else
++#if defined(__SUNPRO_C) || defined (__SUNPRO_CC)
++#include <sys/inttypes.h>
++#else
+ #include <stdint.h>
+ #endif
++#endif
+ 
+ typedef int32_t SBits;
+ typedef uint32_t UBits;


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

From hson at users.sourceforge.net  Sat Sep 25 00:16:38 2010
From: hson at users.sourceforge.net (hson at users.sourceforge.net)
Date: Fri, 24 Sep 2010 22:16:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[11051]
	csw/mgar/pkg/exiftool/trunk/Makefile
Message-ID: <E1OzGZK-0007hf-JR@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11051
          http://gar.svn.sourceforge.net/gar/?rev=11051&view=rev
Author:   hson
Date:     2010-09-24 22:16:38 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
exiftool: Update to 8.31

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

Modified: csw/mgar/pkg/exiftool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiftool/trunk/Makefile	2010-09-24 16:59:52 UTC (rev 11050)
+++ csw/mgar/pkg/exiftool/trunk/Makefile	2010-09-24 22:16:38 UTC (rev 11051)
@@ -1,5 +1,5 @@
 GARNAME = exiftool
-GARVERSION = 8.14
+GARVERSION = 8.31
 CATEGORIES = cpan
 
 DESCRIPTION = Read, Write and Edit Image File Meta Information


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

From wahwah at users.sourceforge.net  Sat Sep 25 00:41:37 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 24 Sep 2010 22:41:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[11052]
	csw/mgar/pkg/python/branches/soname-granularity/
Message-ID: <E1OzGxV-00046N-K4@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11052
          http://gar.svn.sourceforge.net/gar/?rev=11052&view=rev
Author:   wahwah
Date:     2010-09-24 22:41:37 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
python: Branching out to show an example of soname granularity.

Added Paths:
-----------
    csw/mgar/pkg/python/branches/soname-granularity/


Property changes on: csw/mgar/pkg/python/branches/soname-granularity
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385


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

From wahwah at users.sourceforge.net  Sat Sep 25 00:42:22 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 24 Sep 2010 22:42:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[11053]
 csw/mgar/pkg/python/branches/soname-granularity/ Makefile
Message-ID: <E1OzGyE-0008S4-MZ@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11053
          http://gar.svn.sourceforge.net/gar/?rev=11053&view=rev
Author:   wahwah
Date:     2010-09-24 22:42:22 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
python/soname-granilarity: An example implementation.

Modified Paths:
--------------
    csw/mgar/pkg/python/branches/soname-granularity/Makefile

Modified: csw/mgar/pkg/python/branches/soname-granularity/Makefile
===================================================================
--- csw/mgar/pkg/python/branches/soname-granularity/Makefile	2010-09-24 22:41:37 UTC (rev 11052)
+++ csw/mgar/pkg/python/branches/soname-granularity/Makefile	2010-09-24 22:42:22 UTC (rev 11053)
@@ -78,6 +78,8 @@
 PACKAGES += CSWpython-devel
 PACKAGES += CSWpython-test
 PACKAGES += CSWpython-tk
+PACKAGES += CSWlibpython25
+PACKAGES += CSWlibpython26
 
 INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils
 
@@ -99,25 +101,36 @@
 PKGFILES_CSWpython-test += $(libdir)/python/json/tests.*
 PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.*
 PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.*
+PKGFILES_CSWlibpython25 += $(libdir)/libpython2\.5.*
+PKGFILES_CSWlibpython26 += $(libdir)/libpython2\.6.*
 
 ARCHALL_CSWpython-test = 1
 ARCHALL_CSWidle        = 1
 
-RUNTIME_DEP_PKGS_CSWidle          = CSWpython CSWpython-tk
+RUNTIME_DEP_PKGS_CSWidle         += CSWpython
+RUNTIME_DEP_PKGS_CSWidle         += CSWpython-tk
 RUNTIME_DEP_PKGS_CSWpython       += CSWbdb47
 RUNTIME_DEP_PKGS_CSWpython       += CSWbzip2
 RUNTIME_DEP_PKGS_CSWpython       += CSWgdbm
 RUNTIME_DEP_PKGS_CSWpython       += CSWggettextrt 
+RUNTIME_DEP_PKGS_CSWpython       += CSWlibpython26
 RUNTIME_DEP_PKGS_CSWpython       += CSWncurses
 RUNTIME_DEP_PKGS_CSWpython       += CSWosslrt
 RUNTIME_DEP_PKGS_CSWpython       += CSWreadline 
-RUNTIME_DEP_PKGS_CSWpython       += CSWsqlite3rt CSWzlib
+RUNTIME_DEP_PKGS_CSWpython       += CSWsqlite3rt
+RUNTIME_DEP_PKGS_CSWpython       += CSWzlib
+RUNTIME_DEP_PKGS_CSWpython-tk    += CSWlibpython26
 RUNTIME_DEP_PKGS_CSWpython-tk    += CSWpython
 RUNTIME_DEP_PKGS_CSWpython-tk    += CSWtcl
 RUNTIME_DEP_PKGS_CSWpython-tk    += CSWtk 
-RUNTIME_DEP_PKGS_CSWpython-devel  = CSWpython
+RUNTIME_DEP_PKGS_CSWpython-devel += CSWpython
 RUNTIME_DEP_PKGS_CSWpython-test  += CSWpython
 
+# There are packages depending on libpython2.5, and listing CSWpython as the
+# dependency.
+DEP_PKGS_CSWpython               += CSWlibpython25
+DEP_PKGS_CSWpython               += CSWlibpython26
+
 # This could be handled by automatic dependency detection
 CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk
 
@@ -126,17 +139,21 @@
 CATALOGNAME_CSWpython-devel = python_devel
 CATALOGNAME_CSWpython-tk    = python_tk
 CATALOGNAME_CSWpython-test  = python_test
+CATALOGNAME_CSWlibpython25  = libpython25
+CATALOGNAME_CSWlibpython26  = libpython26
 
 SPKG_DESC_CSWidle         = Python IDE
 SPKG_DESC_CSWpython       = A high-level scripting language.
 SPKG_DESC_CSWpython-devel = Development Files for Python
 SPKG_DESC_CSWpython-tk    = Python Tk Interface (TkInter)
 SPKG_DESC_CSWpython-test  = Python Test modules
+SPKG_DESC_CSWlibpython25  = Python shared library (2.5)
+SPKG_DESC_CSWlibpython26  = Python shared library (2.6)
 
 LICENSE = LICENSE
 
 # These won't be fixed.
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWlibpython25 += file-with-bad-content
 
 # This is an exception, since these are original Python packages.
 CHECKPKG_OVERRIDES_CSWpython-test  += pkgname-does-not-start-with-CSWpy-


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

From bdwalton at users.sourceforge.net  Sat Sep 25 02:33:59 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 25 Sep 2010 00:33:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[11054] csw/mgar/pkg/git/trunk/Makefile
Message-ID: <E1OzIiF-000571-5n@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11054
          http://gar.svn.sourceforge.net/gar/?rev=11054&view=rev
Author:   bdwalton
Date:     2010-09-25 00:33:58 +0000 (Sat, 25 Sep 2010)

Log Message:
-----------
git: disable tests until next release

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2010-09-24 22:42:22 UTC (rev 11053)
+++ csw/mgar/pkg/git/trunk/Makefile	2010-09-25 00:33:58 UTC (rev 11054)
@@ -1,15 +1,17 @@
 GARNAME = git
-GARVERSION = 1.7.2.2
+GARVERSION = 1.7.3
 #PATCHLEVEL = rc1
 CATEGORIES = devel
 
 VENDOR_URL = http://git-scm.org/
 
 # disable tests until next version bump (at the top so it stands out)
-# 1.7.2.1 has a failure on current9s when fr.UFT-8 is detected as the
-# first available utf8 locale.  the failure is harmless though.
-TEST_SCRIPTS = 
+# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
+# detected as the first available utf8 locale.  the failure is
+# harmless though.
 
+TEST_SCRIPTS =
+
 PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc
 PACKAGES += CSWgitcompletion CSWgitdevel
 


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

From j_arndt at users.sourceforge.net  Sun Sep 26 19:38:06 2010
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Sun, 26 Sep 2010 17:38:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[11055] csw/mgar/pkg/munin/trunk
Message-ID: <E1OzvAs-0006O6-Pn@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11055
          http://gar.svn.sourceforge.net/gar/?rev=11055&view=rev
Author:   j_arndt
Date:     2010-09-26 17:38:06 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
munin: added support for Solaris 10 to network interface plugins

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

Added Paths:
-----------
    csw/mgar/pkg/munin/trunk/files/if.in.patch
    csw/mgar/pkg/munin/trunk/files/if_err.in.patch

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-09-25 00:33:58 UTC (rev 11054)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-09-26 17:38:06 UTC (rev 11055)
@@ -29,6 +29,8 @@
 PATCHFILES += munin-htaccess.in.patch
 PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin 
 PATCHFILES += perl.patch # shebang correctly set
+PATCHFILES += if.in.patch # added support for Solaris 10
+PATCHFILES += if_err.in.patch # added support for Solaris 10
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-09-25 00:33:58 UTC (rev 11054)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-09-26 17:38:06 UTC (rev 11055)
@@ -1,18 +1 @@
-58ab277c1a958459e5270da07f017fb3  CSWmunincommon.prototype
-390277cc59e2c37d5b0bd4f2c3441996  CSWmuninmaster.postinstall
-35853c8c9bd199828b58b668e2056025  CSWmuninmaster.prototype
-c4064b92df7835bf37b18e799aa6177e  CSWmuninnode.prototype
-e777f0ddea3e09d0faf72780ad782995  Makefile.config.patch
-1e3c461f2beafce43d6b94f3af478e5e  Makefile.patch
-e6bafa4aa3cba7fc16e444ad168b4cd1  README.CSW
-59409f4b412953283c3df4546fd4886c  apache-munin-cgi.conf.CSW
-e701d132ba0b6f3dcc90190860f5aa6b  apache-munin.conf.CSW
-2e0173bf615787eaf37e551b956dc9b8  cswmuninnode
-50fa4a545f878d79e219891c6ac8d2d2  cswusergroup
 4ae84b9a27b686c3819d8d7b51d8cb4c  munin-1.4.5.tar.gz
-1a13b606a5c82958ed8e9bf139044988  munin-graph.in.patch
-e96eab2e321a33517d88dfbe1d510211  munin-htaccess.in.patch
-05a23869a8c0e637a423c2559c150b4f  munin-node.conf.in.patch
-e9d94e230c8719c5d7d3fe624e87bea2  munin.conf.in.patch
-c0e9f043fe5ea79a1fc7dfc91f09a961  perl.patch
-5673776262a0d1b2c386f45f0fd6a783  sunos_memory.in.patch

Added: csw/mgar/pkg/munin/trunk/files/if.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/if.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/if.in.patch	2010-09-26 17:38:06 UTC (rev 11055)
@@ -0,0 +1,98 @@
+From 4394dc4c0af55d1ed7a57413572f79ec40bdf2cd Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 26 Sep 2010 18:30:48 +0200
+Subject: [PATCH] added support for Solaris 10 and earlier
+
+---
+ plugins/node.d.sunos/if_.in |   57 +++++++++++++++++++++++++++----------------
+ 1 files changed, 36 insertions(+), 21 deletions(-)
+
+diff --git a/plugins/node.d.sunos/if_.in b/plugins/node.d.sunos/if_.in
+index d72a539..273b597 100755
+--- a/plugins/node.d.sunos/if_.in
++++ b/plugins/node.d.sunos/if_.in
+@@ -42,6 +42,7 @@ Unknown license
+ 
+ . $MUNIN_LIBDIR/plugins/plugin.sh
+ 
++SOLVERSION=`uname -r | awk -F. '{print $2}`
+ INTERFACE=${0##*/if_}
+ 
+ if [ "$1" = "autoconf" ]; then
+@@ -56,7 +57,11 @@ fi
+ 
+ if [ "$1" = "suggest" ]; then
+ 	if [ -x /usr/bin/kstat ]; then
+-		kstat -m link -p -s '/^rbytes$/' | awk -F: '{ print $3 }'
++		if [ $SOLVERSION -le 10 ]; then
++			kstat -p -s '/^rbytes64$/' | awk -F: '{ print $3 }'
++		elif [ $SOLVERSION -gt 10 ]; then
++			kstat -m link -p -s '/^rbytes64$/' | awk -F: '{ print $3 }'
++		fi
+ 		exit 0
+ 	else
+ 		exit 1
+@@ -65,30 +70,40 @@ fi
+ 
+ if [ "$1" = "config" ]; then
+ 
+-	echo "graph_order rbytes obytes" 
++	echo "graph_order rbytes64 obytes64" 
+ 	echo "graph_title $INTERFACE traffic"
+ 	echo 'graph_args --base 1000'
+ 	echo 'graph_vlabel bits per ${graph_period} in (-) / out (+)'
+ 	echo 'graph_category network'
+-	echo 'rbytes.label received'
+-        echo 'rbytes.type COUNTER'
+-        echo 'rbytes.max 2000000000'
+-        echo 'rbytes.graph no'
+-        echo 'rbytes.cdef rbytes,8,*'
+-	print_warning rbytes
+-	print_critical rbytes
+-        echo 'obytes.label bps'
+-	echo 'obytes.type COUNTER'
+-	echo 'obytes.negative rbytes'
+-	echo 'obytes.cdef obytes,8,*'
+-        echo 'obytes.max 2000000000'
+-	print_warning obytes
+-	print_critical obytes
++	echo 'rbytes64.label received'
++        echo 'rbytes64.type COUNTER'
++        echo 'rbytes64.max 2000000000'
++        echo 'rbytes64.graph no'
++        echo 'rbytes64.cdef rbytes64,8,*'
++	print_warning rbytes64
++	print_critical rbytes64
++        echo 'obytes64.label bps'
++	echo 'obytes64.type COUNTER'
++	echo 'obytes64.negative rbytes64'
++	echo 'obytes64.cdef obytes64,8,*'
++        echo 'obytes64.max 2000000000'
++	print_warning obytes64
++	print_critical obytes64
+ 	exit 0
+ fi;
+ 
+-kstat -p -n $INTERFACE -m link -s '/^[ro]bytes$/' | awk -F: '
+-{
+-	split($4, four, "\t")
+-	print four[1] ".value", four[2]
+-}'
++if [ $SOLVERSION -le 10 ]       # Solaris 10 and earlier
++then
++        kstat -p -n $INTERFACE -s '/^[ro]bytes64$/' | awk -F: '
++        {
++                split($4, four, "\t")
++                print four[1] ".value", four[2]
++        }'
++elif [ $SOLVERSION -gt 10 ]     # Solaris 11 or OpenSolaris / OpenIndiana or later
++then
++        kstat -p -n $INTERFACE -m link -s '/^[ro]bytes64$/' | awk -F: '
++        {
++                split($4, four, "\t")
++                print four[1] ".value", four[2]
++        }'
++fi
+-- 
+1.7.2.2
+

Added: csw/mgar/pkg/munin/trunk/files/if_err.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/if_err.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/if_err.in.patch	2010-09-26 17:38:06 UTC (rev 11055)
@@ -0,0 +1,61 @@
+From 74d1fa95cd376e87824fd1bca3cad196adeabf1f Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 26 Sep 2010 17:15:57 +0200
+Subject: [PATCH] added support for Solaris 10
+
+---
+ plugins/node.d.sunos/if_err_.in |   27 +++++++++++++++++++++------
+ 1 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/node.d.sunos/if_err_.in b/plugins/node.d.sunos/if_err_.in
+index 097ec1c..269e9d3 100755
+--- a/plugins/node.d.sunos/if_err_.in
++++ b/plugins/node.d.sunos/if_err_.in
+@@ -42,6 +42,7 @@ Unknown license
+ 
+ . $MUNIN_LIBDIR/plugins/plugin.sh
+ 
++SOLVERSION=`uname -r | awk -F. '{print $2}`
+ INTERFACE=${0##*/if_err_}
+ 
+ if [ "$1" = "autoconf" ]; then
+@@ -56,7 +57,11 @@ fi
+ 
+ if [ "$1" = "suggest" ]; then
+ 	if [ -x /usr/bin/kstat ]; then
+-		kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3 }'
++		if [ $SOLVERSION -le 10 ]; then
++			kstat -p -s '/^ierrors$/' | awk -F: '{ print $3 }'
++		elif [ $SOLVERSION -gt 10 ]; then
++			kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3 }'
++		fi
+ 		exit 0
+ 	else
+ 		exit 1
+@@ -88,8 +93,18 @@ if [ "$1" = "config" ]; then
+ 	exit 0
+ fi;
+ 
+-kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk -F: '
+-{
+-	split($4, four, "\t")
+-	print four[1] ".value", four[2]
+-}'
++if [ $SOLVERSION -le 10 ]       # Solaris 10 and earlier
++then
++	kstat -p -n $INTERFACE -s '/^([io]errors|collisions)$/' | awk -F: '
++	{
++		split($4, four, "\t")
++		print four[1] ".value", four[2]
++	}'
++elif [ $SOLVERSION -eq 11 ]     # later than Solaris 10
++then
++	kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk -F: '
++	{
++		split($4, four, "\t")
++		print four[1] ".value", four[2]
++	}'
++fi
+-- 
+1.7.2.2
+


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

From dmichelsen at users.sourceforge.net  Mon Sep 27 11:01:05 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 09:01:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[11056] csw/mgar/pkg/autoconf/trunk
Message-ID: <E1P09a5-0006ho-IW@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11056
          http://gar.svn.sourceforge.net/gar/?rev=11056&view=rev
Author:   dmichelsen
Date:     2010-09-27 09:01:05 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
autoconf: Update to 2.68, several Fortran tests are failing

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

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2010-09-26 17:38:06 UTC (rev 11055)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2010-09-27 09:01:05 UTC (rev 11056)
@@ -1,5 +1,5 @@
 GARNAME = autoconf
-GARVERSION = 2.67
+GARVERSION = 2.68
 CATEGORIES = devel
 
 DESCRIPTION = GNU auto-configuration tool
@@ -27,7 +27,7 @@
 TEST_TARGET = check
 
 # Tests take a loooooonnng time.
-TEST_SCRIPTS =
+# TEST_SCRIPTS =
 
 EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info
 

Modified: csw/mgar/pkg/autoconf/trunk/checksums
===================================================================
--- csw/mgar/pkg/autoconf/trunk/checksums	2010-09-26 17:38:06 UTC (rev 11055)
+++ csw/mgar/pkg/autoconf/trunk/checksums	2010-09-27 09:01:05 UTC (rev 11056)
@@ -1,2 +1 @@
-ac233d38923d5bebe91a64d68983c3c0  0001-Prefer-CSW-tools.patch
-6078f53dfda911bdfb523e39f4d7fb2d  autoconf-2.67.tar.gz
+c3b5247592ce694f7097873aa07d66fe  autoconf-2.68.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 Sep 27 15:19:58 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 13:19:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[11057] csw/mgar/pkg/openssh/branches
Message-ID: <E1P0Dcc-0005l3-EP@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11057
          http://gar.svn.sourceforge.net/gar/?rev=11057&view=rev
Author:   dmichelsen
Date:     2010-09-27 13:19:58 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
openssh-5.6p1+lpk: Forward-port patch, add modulations for LPK and use alternatives

Modified Paths:
--------------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch

Removed Paths:
-------------
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/contrib-openssh-lpk-5.4p1-0.3.13.patch

Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile	2010-09-27 09:01:05 UTC (rev 11056)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/Makefile	2010-09-27 13:19:58 UTC (rev 11057)
@@ -18,6 +18,9 @@
 GSSKEX_PATCH_DATE = 20100902
 CATEGORIES = server
 
+EXTRA_MODULATORS = LPK
+MODULATIONS_LPK = no yes
+
 DESCRIPTION = OpenSSH Secure Shell
 
 define BLURB
@@ -31,19 +34,24 @@
 endef
 
 
-PACKAGES = CSWossh CSWosshclient
+PACKAGES = CSWossh CSWosshlpk CSWosshclient
 
 CATALOGNAME_CSWossh = openssh
 SPKG_DESC_CSWossh = OpenSSH Secure Shell server 
 RUNTIME_DEP_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
 
+CATALOGNAME_CSWosshlpk = openssh_lpk
+SPKG_DESC_CSWosshlpk = OpenSSH Secure Shell server with ldap public key support
+RUNTIME_DEP_PKGS_CSWosshlpk = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWoldaprt CSWossh
+
 CATALOGNAME_CSWosshclient = openssh_client
 SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client 
 RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib 
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
-PKGFILES_CSWossh = $(sbindir)/.*
+PKGFILES_CSWossh = $(sbindir)/sshd-nolpk
+PKGFILES_CSWossh += $(sbindir)/sshd.smf_wrapper
 PKGFILES_CSWossh += $(docdir)/openssh/.*
 PKGFILES_CSWossh += $(mandir)/man5/sshd_config.5
 PKGFILES_CSWossh += $(mandir)/man8/sftp-server.8
@@ -56,6 +64,9 @@
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
 PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup
 
+PKGFILES_CSWosshlpk = $(sbindir)/sshd-lpk
+PKGFILES_CSWosshlpk += $(docdir)/openssh_lpk/.*
+
 PKGFILES_CSWosshclient = $(bindir)/.*
 PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
 PKGFILES_CSWosshclient += $(mandir)/man1/.*
@@ -107,8 +118,12 @@
 
 LICENSE = LICENCE
 
+# LDAP Public Key Patch, forward port from
+#   http://code.google.com/p/openssh-lpk/source/browse/#svn/trunk/patch/contrib
+PATCHFILES = 0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch
+
 # The GSSAPI key exchange patch
-PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-all-$(GSSKEX_PATCH_DATE).patch
+PATCHFILES += openssh-$(GSSKEX_PATCH_VERSION)-gsskex-all-$(GSSKEX_PATCH_DATE).patch
 
 # Prevent TIOCSCTTY from being used to avoid error:
 # ioctl(TIOCSCTTY): Invalid argument
@@ -121,12 +136,8 @@
 # documentation files to install (not a gar variable)
 DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns 
 DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG    
+DOCFILES_LPK = openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk
 
-# we're using conf handling class from the cswclassutils package
-RUNTIME_DEP_PKGS += CSWcswclassutils
-
-
-
 ##### Build and installation information #####
 
 
@@ -135,6 +146,9 @@
 localstatedir 	= /var$(prefix)
 sysconfdir 	= /etc$(prefix)
 
+# libldap is not self-contained and needs explicit linking against liblber.so
+EXTRA_LD_FLAGS-lpk-yes = -L/opt/csw/lib -llber
+EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS-lpk-$(LPK))
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-kerberos5=$(prefix)
@@ -144,37 +158,27 @@
 CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix)
 CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty
 
+CONFIGURE_ARGS-lpk-yes = --with-ldap
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-lpk-$(LPK))
+
 TEST_SCRIPTS	=
 
+MERGE_SCRIPTS_isa-default-lpk-no = copy-all
+MERGE_SCRIPTS_isa-default-lpk-yes = copy-only
+MERGE_DIRS_isa-default-lpk-yes = $(sbindir)
 
-## Optional addition to add Ldap Public Key support 
-## see http://code.google.com/p/openssh-lpk/
+EXTRA_PAX_ARGS_lpk-no = -s ",\.$(sbindir)/sshd$$,.$(sbindir)/sshd-nolpk,p"
+EXTRA_PAX_ARGS_lpk-yes = -s ",\.$(sbindir)/sshd$$,.$(sbindir)/sshd-lpk,p" -s ",.*,,"
+EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_lpk-$(LPK))
 
-# we always register the lpk related files so checksum 
-# is the same with LPK enabled or not
-# Patch taken from http://code.google.com/p/openssh-lpk/issues/detail?id=7
-# and modified with
-#   perl -e 's/--- g/--- /; s/\+{3} g/+++ /' -pi 
-# as all filenames seem to be prefixed with 'g' and redone patch for
-# patchdirlevel 1 instead of 0
-DISTFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
-ifdef LPK
-	PACKAGES = CSWosshlpk
-	CATALOGNAME_CSWosshlpk = openssh_lpk
-	SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support
-	RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt
-	PATCHFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
-	CONFIGURE_ARGS += --with-ldap
-	DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk
-	
-	# we must reset the CSWosshclient description to avoid a bug in the automatic dependancy generation
-	SPKG_DESC_CSWosshclient = 
-endif
+ALTERNATIVES_CSWossh    = nolpk
+ALTERNATIVES_CSWosshlpk = lpk
+ALTERNATIVE_nolpk = $(sbindir)/sshd sshd $(sbindir)/sshd-nolpk 100
+ALTERNATIVE_lpk   = $(sbindir)/sshd sshd $(sbindir)/sshd-lpk 200
 
-CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/
-CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/
-CHECKPKG_OVERRIDES_CSWosshlpk += init-file-wrong-location|/etc/opt/csw/init.d/cswopenssh
-CHECKPKG_OVERRIDES_CSWosshlpk += surplus-dependency|CSWosshclient
+CHECKPKG_OVERRIDES_CSWossh += surplus-dependency|CSWalternatives
+CHECKPKG_OVERRIDES_CSWosshlpk += surplus-dependency|CSWossh
+CHECKPKG_OVERRIDES_CSWosshlpk += surplus-dependency|CSWalternatives
 
 include gar/category.mk
 
@@ -190,35 +194,35 @@
 	cd $(WORKSRC) && perl -pi -e 's,-R/opt/csw/lib/ ,-R/opt/csw/lib ,' Makefile
 	@$(MAKECOOKIE)
 
-# adding documentation files
-pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories
-	@$(MAKECOOKIE)
+post-install-modulated: install-config-files install-doc-files-lpk-$(LPK) install-init-files install-contrib-files install-special-directories
 
-merge-contrib-files:
-	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
-	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
+install-contrib-files:
+	ginstall -D "$(WORKSRC)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
+	ginstall -D "$(WORKSRC)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
 	chmod -x "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
 
-merge-init-files:
-	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh"
-	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml"
-	ginstall -D "$(WORKDIR_FIRSTMOD)/sshd.smf_wrapper" "$(PKGROOT)/opt/csw/sbin/sshd.smf_wrapper"
+install-init-files:
+	ginstall -D "$(WORKDIR)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh"
+	ginstall -D "$(WORKDIR)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml"
+	ginstall -D "$(WORKDIR)/sshd.smf_wrapper" "$(PKGROOT)/opt/csw/sbin/sshd.smf_wrapper"
 
-merge-doc-files:
-	for DOCDIR in $(foreach _PKG,$(PACKAGES),$(call catalogname,$(_PKG))); do \
-		ginstall -d $(PKGROOT)/$(docdir)/$$DOCDIR; \
-		(cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$DOCDIR/); \
-		(cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \
-		ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \
-	done
+install-doc-files-lpk-no:
+	ginstall -d $(PKGROOT)/$(docdir)/openssh
+	(cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh/)
+	(cd $(PKGROOT)/$(docdir)/openssh && chmod -x $(DOCFILES))
+	ginstall $(WORKDIR)/changelog.CSW $(PKGROOT)/$(docdir)/openssh/
 
-merge-config-files:
+install-doc-files-lpk-yes:
+	ginstall -d $(PKGROOT)/$(docdir)/openssh_lpk
+	cd $(WORKSRC) && ginstall $(DOCFILES_LPK) $(PKGROOT)/$(docdir)/openssh_lpk/
+
+install-config-files:
 	# we change some default value in the server config file
 	perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
-	ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
-	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
+	ginstall -D "$(WORKDIR)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
+	ginstall -D "$(WORKDIR)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
 
-merge-special-directories:
+install-special-directories:
 	ginstall -d $(PKGROOT)$(localstatedir)/empty
 	ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh

Modified: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums	2010-09-27 09:01:05 UTC (rev 11056)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/checksums	2010-09-27 13:19:58 UTC (rev 11057)
@@ -1,18 +1 @@
-d0bdd7ebcbd41acd67dcf55e98c53dcb  0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
-1d3d6d477c09e59c514e637fa3a2f7a4  CSWossh.checkinstall
-0993813fa5c752215f892cb67c86816f  CSWossh.preinstall
-e00106f28a2aef529e097aa182906273  CSWossh.prototype
-39259b734dc10d2b7eb82d2331254d4c  CSWosshclient.prototype
-1d3d6d477c09e59c514e637fa3a2f7a4  CSWosshlpk.checkinstall
-0993813fa5c752215f892cb67c86816f  CSWosshlpk.preinstall
-36aff9d761d77369ba97ce6508782ccd  CSWosshlpk.prototype
-3344f6f17e6d75e8e135b8366e64a7ee  changelog.CSW
-a5ebb2e3fdaa06c3c9edba55aac5f83b  cswopenssh
-8e765642349b6321d01b33e95304e113  cswopenssh.xml
-704ad1d3216df8de4d44465006c64c39  derelativise_path_bugfix.patch
-4b3e79120b60e8f25be5141eba53cac5  don_t_use_TIOCSCTTY.patch
-72c46751eba8f77b53b1ee7cb801bfd7  dont_derelativise_authorizedkeysfile_option.patch
-ca5403c8e1539d5ced0573f289ed7aef  no_x_forwarding_bug.patch
-10e0b84c84ad0dc9c490480aab36be01  openssh-5.4p1-gsskex-all-20100313.patch
-da10af8a789fa2e83e3635f3a1b76f5e  openssh-5.4p1.tar.gz
-db57ce80e8944213443caa4c52c884e5  sshd.smf_wrapper
+e6ee52e47c768bf0ec42a232b5d18fb0  openssh-5.6p1.tar.gz

Added: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-Forward-port-of-contrib-openssh-lpk-5.4p1-0.3.13.pat.patch	2010-09-27 13:19:58 UTC (rev 11057)
@@ -0,0 +1,1992 @@
+From d0af21b088353701c2bcf102c10bd3ec23059c89 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 27 Sep 2010 11:12:38 +0200
+Subject: [PATCH] Forward-port of contrib-openssh-lpk-5.4p1-0.3.13.patch
+
+---
+ Makefile.in                 |    2 +-
+ README.lpk                  |  267 ++++++++++++++++++++
+ auth-rsa.c                  |   86 +++++++
+ auth2-pubkey.c              |   73 ++++++
+ config.h.in                 |    3 +
+ configure                   |   81 ++++++
+ configure.ac                |   32 +++
+ ldapauth.c                  |  574 +++++++++++++++++++++++++++++++++++++++++++
+ ldapauth.h                  |  127 ++++++++++
+ lpk-user-example.txt        |  117 +++++++++
+ openssh-lpk_openldap.schema |   19 ++
+ openssh-lpk_sun.schema      |   21 ++
+ servconf.c                  |  194 +++++++++++++++
+ servconf.h                  |    7 +
+ sshd.c                      |   14 +
+ sshd_config                 |   16 ++
+ sshd_config.5               |   56 +++++
+ version.h                   |    3 +-
+ 18 files changed, 1690 insertions(+), 2 deletions(-)
+ create mode 100644 README.lpk
+ create mode 100644 ldapauth.c
+ create mode 100644 ldapauth.h
+ create mode 100644 lpk-user-example.txt
+ create mode 100644 openssh-lpk_openldap.schema
+ create mode 100644 openssh-lpk_sun.schema
+
+diff --git a/Makefile.in b/Makefile.in
+index 5654d43..174c0cd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -91,7 +91,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+ 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
+ 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+ 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+-	roaming_common.o roaming_serv.o
++	roaming_common.o roaming_serv.o ldapauth.o
+ 
+ MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
+ MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
+diff --git a/README.lpk b/README.lpk
+new file mode 100644
+index 0000000..d0b6de0
+--- /dev/null
++++ b/README.lpk
+@@ -0,0 +1,267 @@
++OpenSSH LDAP PUBLIC KEY PATCH 
++Copyright (c) 2003 Eric AUGE (eau at phear.org)
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products
++   derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++purposes of this patch:
++
++This patch would help to have authentication centralization policy
++using ssh public key authentication.
++This patch could be an alternative to other "secure" authentication system
++working in a similar way (Kerberos, SecurID, etc...), except the fact 
++that it's based on OpenSSH and its public key abilities.
++
++>> FYI: <<
++'uid': means unix accounts existing on the current server
++'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config)
++
++example schema:
++
++
++                                  server1 (uid: eau,rival,toto) (lpkServerGroup: unix)
++                ___________      /
++               /           \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix)
++              | LDAP Server |    \
++	      | eau  ,rival |     server2 (uid: rival, eau) (lpkServerGroup: unix)
++	      | titi ,toto  |
++	      | userx,....  |         server5 (uid: eau)  (lpkServerGroup: mail)
++               \___________/ \       /
++	                       ----- - server4 (uid: eau, rival)  (no group configured)
++			             \
++				        etc...
++
++- WHAT WE NEED :
++
++  * configured LDAP server somewhere on the network (i.e. OpenLDAP)
++  * patched sshd (with this patch ;)
++  * LDAP user(/group) entry (look at users.ldif (& groups.ldif)):
++        User entry:
++	- attached to the 'ldapPublicKey' objectclass
++	- attached to the 'posixAccount' objectclass
++	- with a filled 'sshPublicKey' attribute 
++	Example:
++		dn: uid=eau,ou=users,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: person
++		objectclass: organizationalPerson
++		objectclass: posixAccount
++		objectclass: ldapPublicKey
++		description: Eric AUGE Account
++		userPassword: blah
++		cn: Eric AUGE
++		sn: Eric AUGE
++		uid: eau
++		uidNumber: 1034
++		gidNumber: 1
++		homeDirectory: /export/home/eau
++		sshPublicKey: ssh-dss AAAAB3...
++		sshPublicKey: ssh-dss AAAAM5...
++
++	Group entry:
++	- attached to the 'posixGroup' objectclass
++	- with a 'cn' groupname attribute
++	- with multiple 'memberUid' attributes filled with usernames allowed in this group
++	Example:
++		# few members
++		dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++		objectclass: top
++		objectclass: posixGroup
++		description: Unix based servers group
++		cn: unix
++		gidNumber: 1002
++		memberUid: eau
++		memberUid: user1
++		memberUid: user2
++
++
++- HOW IT WORKS :
++
++  * without patch
++  If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..)
++  and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled).
++
++  * with the patch
++  If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled.
++  It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. 
++  (usually in $HOME/.ssh/authorized_keys)
++
++  If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into.
++  If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled).
++
++  7 tokens are added to sshd_config :
++  # here is the new patched ldap related tokens
++  # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup
++  UseLPK yes								# look the pub key into LDAP
++  LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3	# which LDAP server for users ? (URL format)
++  LpkUserDN  ou=users,dc=foobar,dc=net					# which base DN for users ?
++  LpkGroupDN ou=groups,dc=foobar,dc=net					# which base DN for groups ? 
++  LpkBindDN cn=manager,dc=foobar,dc=net					# which bind DN ?
++  LpkBindPw asecret							# bind DN credidentials
++  LpkServerGroup agroupname						# the group the server is part of
++
++  Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some
++  flaws you have to take care of.
++
++- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY
++
++  * my way (there is plenty :)
++  - create ldif file (i.e. users.ldif)
++  - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub
++  - my way in 4 steps :
++  Example:
++
++  # you add this to the user entry in the LDIF file :
++  [...]
++  objectclass: posixAccount
++  objectclass: ldapPublicKey
++  [...]
++  sshPubliKey: ssh-dss AAAABDh12DDUR2...
++  [...]
++
++  # insert your entry and you're done :)
++  ldapadd -D balblabla -w bleh < file.ldif 
++  
++  all standard options can be present in the 'sshPublicKey' attribute.
++
++- WHY :
++
++  Simply because, i was looking for a way to centralize all sysadmins authentication, easily,  without completely using LDAP 
++  as authentication method (like pam_ldap etc..).  
++  
++  After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get 
++  public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser'
++  objectclass within LDAP and part of the group the SSH server is in). 
++
++  Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase 
++  so each user can change it as much as he wants). 
++
++  Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only).
++
++- RULES :  
++  Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. 
++  and the additionnal lpk.schema.
++
++  This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication 
++  (pamldap, nss_ldap, etc..).
++
++  This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..).
++  
++  Referring to schema at the beginning of this file if user 'eau' is only in group 'unix'
++  'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'.
++  If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able
++  to log in 'server5' (i hope you got the idea, my english is bad :).
++
++  Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP
++  server.
++  When you want to allow a new user to have access to the server parc, you just add him an account on 
++  your servers, you add his public key into his entry on the LDAP server, it's done. 
++
++  Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys).
++
++  When the user needs to change his passphrase he can do it directly from his workstation by changing 
++  his own key set lock passphrase, and all servers are automatically aware.
++ 
++  With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself
++  so he can add/modify/delete himself his public key when needed.
++
++\xAD FLAWS :
++  LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP 
++  allow write to users dn, somebody could replace someuser's public key by its own and impersonate some 
++  of your users in all your server farm be VERY CAREFUL.
++  
++  MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login 
++  as the impersonnated user.
++
++  If LDAP server is down then, fallback on passwd auth.
++  
++  the ldap code part has not been well audited yet.
++
++- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif)
++    --- CUT HERE ---
++    dn: uid=jdoe,ou=users,dc=foobar,dc=net
++    objectclass: top
++    objectclass: person
++    objectclass: organizationalPerson
++    objectclass: posixAccount
++    objectclass: ldapPublicKey
++    description: My account
++    cn: John Doe
++    sn: John Doe
++    uid: jdoe
++    uidNumber: 100
++    gidNumber: 100
++    homeDirectory: /home/jdoe
++    sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB....
++    [...]
++    --- CUT HERE ---
++
++- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif)
++    --- CUT HERE ---
++    dn: cn=unix,ou=groups,dc=cuckoos,dc=net
++    objectclass: top
++    objectclass: posixGroup
++    description: Unix based servers group
++    cn: unix
++    gidNumber: 1002
++    memberUid: jdoe
++    memberUid: user1
++    memberUid: user2
++    [...]
++    --- CUT HERE ---
++
++>> FYI: << 
++Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry
++
++- COMPILING:
++  1. Apply the patch
++  2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes
++  3. make
++  4. it's done.
++
++- BLA :
++  I hope this could help, and i hope to be clear enough,, or give ideas.  questions/comments/improvements are welcome.
++  
++- TODO :
++  Redesign differently.
++
++- DOCS/LINK :
++  http://pacsec.jp/core05/psj05-barisani-en.pdf
++  http://fritz.potsdam.edu/projects/openssh-lpk/
++  http://fritz.potsdam.edu/projects/sshgate/
++  http://dev.inversepath.com/trac/openssh-lpk
++  http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm )
++
++- CONTRIBUTORS/IDEAS/GREETS :
++  - Falk Siemonsmeier.
++  - Jacob Rief.
++  - Michael Durchgraf.
++  - frederic peters.
++  - Finlay dobbie.
++  - Stefan Fisher.
++  - Robin H. Johnson.
++  - Adrian Bridgett.
++
++- CONTACT :
++  - Eric AUGE <eau at phear.org>
++  - Andrea Barisani <andrea at inversepath.com>
+diff --git a/auth-rsa.c b/auth-rsa.c
+index 56702d1..49909aa 100644
+--- a/auth-rsa.c
++++ b/auth-rsa.c
+@@ -177,10 +177,96 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
+ 	FILE *f;
+ 	u_long linenum = 0;
+ 	Key *key;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++	/* here is the job */
++	key = key_new(KEY_RSA1);
++
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s", pw->pw_name);
++	    if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    for (i = 0 ; i < k->num ; i++) {
++			char *cp, *options = NULL;
++
++			for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			/*
++			* Check if there are options for this key, and if so,
++			* save their starting address and skip the option part
++			* for now.  If there are no options, set the starting
++			* address to NULL.
++			 */
++			if (*cp < '0' || *cp > '9') {
++			    int quoted = 0;
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			} else
++			    options = NULL;
++
++			/* Parse the key from the line. */
++			if (hostfile_read_key(&cp, &bits, key) == 0) {
++			    debug("[LDAP] line %d: non ssh1 key syntax", i);
++			    continue;
++			}
++			/* cp now points to the comment part. */
++
++			/* Check if the we have found the desired key (identified by its modulus). */
++			if (BN_cmp(key->rsa->n, client_n) != 0)
++			    continue;
++
++			/* check the real bits  */
++			if (bits != (unsigned int)BN_num_bits(key->rsa->n))
++			    logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: "
++				    "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits);
++
++			/* We have found the desired key. */
++			/*
++			* If our options do not allow this key to be used,
++			* do not send challenge.
++			 */
++			if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i))
++			    continue;
++
++			/* break out, this key is allowed */
++			allowed = 1;
++
++			/* add the return stuff etc... */
++			/* Restore the privileged uid. */
++			restore_uid();
++
++			/* return key if allowed */
++			if (allowed && rkey != NULL)
++			    *rkey = key;
++			else
++			    key_free(key);
++
++			ldap_keys_free(k);
++			return (allowed);
++		    }
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	/* The authorized keys. */
+ 	file = authorized_keys_file(pw);
+ 	debug("trying public RSA key file %s", file);
+diff --git a/auth2-pubkey.c b/auth2-pubkey.c
+index 35cf79c..4bd6e05 100644
+--- a/auth2-pubkey.c
++++ b/auth2-pubkey.c
+@@ -59,6 +59,10 @@
+ #include "authfile.h"
+ #include "match.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ /* import */
+ extern ServerOptions options;
+ extern u_char *session_id2;
+@@ -265,10 +269,79 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
+ 	u_long linenum = 0;
+ 	Key *found;
+ 	char *fp;
++#ifdef WITH_LDAP_PUBKEY
++	ldap_key_t * k;
++	unsigned int i = 0;
++#endif
+ 
+ 	/* Temporarily use the user's uid. */
+ 	temporarily_use_uid(pw);
+ 
++#ifdef WITH_LDAP_PUBKEY
++	found_key = 0;
++	/* allocate a new key type */
++	found = key_new(key->type);
++ 
++	/* first check if the options is enabled, then try.. */
++	if (options.lpk.on) {
++	    debug("[LDAP] trying LDAP first uid=%s",pw->pw_name);
++	    if (ldap_ismember(&options.lpk, pw->pw_name) > 0) {
++		if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
++		    /* Skip leading whitespace, empty and comment lines. */
++		    for (i = 0 ; i < k->num ; i++) {
++			/* dont forget if multiple keys to reset options */
++			char *cp, *options = NULL;
++
++			for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
++			    ;
++			if (!*cp || *cp == '\n' || *cp == '#')
++			    continue;
++
++			if (key_read(found, &cp) != 1) {
++			    /* no key?  check if there are options for this key */
++			    int quoted = 0;
++			    debug2("[LDAP] user_key_allowed: check options: '%s'", cp);
++			    options = cp;
++			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
++				if (*cp == '\\' && cp[1] == '"')
++				    cp++;	/* Skip both */
++				else if (*cp == '"')
++				    quoted = !quoted;
++			    }
++			    /* Skip remaining whitespace. */
++			    for (; *cp == ' ' || *cp == '\t'; cp++)
++				;
++			    if (key_read(found, &cp) != 1) {
++				debug2("[LDAP] user_key_allowed: advance: '%s'", cp);
++				/* still no key?  advance to next line*/
++				continue;
++			    }
++			}
++
++			if (key_equal(found, key) &&
++				auth_parse_options(pw, options, file, linenum) == 1) {
++			    found_key = 1;
++			    debug("[LDAP] matching key found");
++			    fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
++			    verbose("[LDAP] Found matching %s key: %s", key_type(found), fp);
++
++			    /* restoring memory */
++			    ldap_keys_free(k);
++			    xfree(fp);
++			    restore_uid();
++			    key_free(found);
++			    return found_key;
++			    break;
++			}
++		    }/* end of LDAP for() */
++		} else {
++		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
++		}
++	    } else {
++		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
++	    }
++	}
++#endif
+ 	debug("trying public key file %s", file);
+ 	f = auth_openkeyfile(file, pw, options.strict_modes);
+ 
+diff --git a/config.h.in b/config.h.in
+index 4ff407f..18b1162 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -578,6 +578,9 @@
+ /* Define to 1 if you have the <linux/if_tun.h> header file. */
+ #undef HAVE_LINUX_IF_TUN_H
+ 
++/* Define if you want LDAP support */
++#undef WITH_LDAP_PUBKEY
++
+ /* Define if your libraries define login() */
+ #undef HAVE_LOGIN
+ 
+diff --git a/configure b/configure
+index ef3bb0f..55ce9b8 100755
+--- a/configure
++++ b/configure
+@@ -1341,6 +1341,7 @@ Optional Packages:
+   --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
+   --with-libedit[=PATH]   Enable libedit support for sftp
+   --with-audit=module     Enable EXPERIMENTAL audit support (modules=debug,bsm)
++  --with-ldap[=PATH]      Enable LDAP pubkey support (optionally in PATH)
+   --with-ssl-dir=PATH     Specify path to OpenSSL installation
+   --without-openssl-header-check Disable OpenSSL version consistency check
+   --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
+@@ -12985,6 +12986,85 @@ echo "$as_me: error: Unknown audit module $withval" >&2;}
+ fi
+ 
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++
++# Check whether --with-ldap was given.
++if test "${with_ldap+set}" = set; then
++  withval=$with_ldap;
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++
++cat >>confdefs.h <<\_ACEOF
++#define WITH_LDAP_PUBKEY 1
++_ACEOF
++
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++
++			{ echo "$as_me:$LINENO: checking for LDAP support" >&5
++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++				 #include <ldap.h>
++int
++main ()
++{
++(void)ldap_init(0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++				    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++					{ { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5
++echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;}
++   { (exit 1); exit 1; }; }
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		fi
++
++
++fi
++
++
+ 
+ 
+ 
+@@ -30921,6 +31001,7 @@ echo "                   SELinux support: $SELINUX_MSG"
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff --git a/configure.ac b/configure.ac
+index 637e7b5..e4201e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1346,6 +1346,37 @@ AC_ARG_WITH(audit,
+ 	esac ]
+ )
+ 
++# Check whether user wants LDAP support
++LDAP_MSG="no"
++AC_ARG_WITH(ldap,
++	[  --with-ldap[[=PATH]]      Enable LDAP pubkey support (optionally in PATH)],
++	[
++		if test "x$withval" != "xno" ; then
++
++			if test "x$withval" != "xyes" ; then
++				CPPFLAGS="$CPPFLAGS -I${withval}/include"
++				LDFLAGS="$LDFLAGS -L${withval}/lib"
++			fi
++
++			AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support])
++			LIBS="-lldap $LIBS"
++			LDAP_MSG="yes"
++	
++			AC_MSG_CHECKING([for LDAP support])
++			AC_TRY_COMPILE(
++				[#include <sys/types.h>
++				 #include <ldap.h>],
++				[(void)ldap_init(0, 0);],
++				[AC_MSG_RESULT(yes)],
++				[
++				    AC_MSG_RESULT(no) 
++					AC_MSG_ERROR([** Incomplete or missing ldap libraries **])
++				]
++        	)
++		fi
++	]
++)
++
+ dnl    Checks for library functions. Please keep in alphabetical order
+ AC_CHECK_FUNCS( \
+ 	arc4random \
+@@ -4188,6 +4219,7 @@ echo "                   SELinux support: $SELINUX_MSG"
+ echo "                 Smartcard support: $SCARD_MSG"
+ echo "                     S/KEY support: $SKEY_MSG"
+ echo "              TCP Wrappers support: $TCPW_MSG"
++echo "                      LDAP support: $LDAP_MSG"
+ echo "              MD5 password support: $MD5_MSG"
+ echo "                   libedit support: $LIBEDIT_MSG"
+ echo "  Solaris process contract support: $SPC_MSG"
+diff --git a/ldapauth.c b/ldapauth.c
+new file mode 100644
+index 0000000..cf1e7f0
+--- /dev/null
++++ b/ldapauth.c
+@@ -0,0 +1,574 @@
++/* 
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#include "includes.h"
++
++#ifdef WITH_LDAP_PUBKEY
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
++#include "ldapauth.h"
++#include "log.h"
++
++/* filter building infos */
++#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)"
++#define FILTER_OR_PREFIX "(|"
++#define FILTER_OR_SUFFIX ")"
++#define FILTER_CN_PREFIX "(cn="
++#define FILTER_CN_SUFFIX ")"
++#define FILTER_UID_FORMAT "(memberUid=%s)"
++#define FILTER_GROUP_SUFFIX ")"
++#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52)
++
++/* just filter building stuff */
++#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1)
++#define REQUEST_GROUP(buffer, prefilter, pwname) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname)
++/*
++XXX OLD group building macros
++#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46)
++#define REQUEST_GROUP(buffer,pwname,grp) \
++    buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return FAILURE; \
++    } \
++    snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname)
++    */
++
++/*
++XXX stock upstream version without extra filter support
++#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64)
++#define REQUEST_USER(buffer, pwname) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname)
++   */
++
++#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0))
++#define REQUEST_USER(buffer, pwname, customfilter) \
++    buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \
++    if (!buffer) { \
++        perror("calloc()"); \
++        return NULL; \
++    } \
++    snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \
++    	"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \
++	pwname, (customfilter != NULL ? customfilter : ""))
++
++/* some portable and working tokenizer, lame though */
++static int tokenize(char ** o, size_t size, char * input) {
++    unsigned int i = 0, num;
++    const char * charset = " \t";
++    char * ptr = input;
++
++    /* leading white spaces are ignored */
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++        if (i < size-1) {
++            o[i++] = ptr;
++            ptr += num;
++            if (*ptr)
++                *ptr++ = '\0';
++        }
++    }
++    o[i] = NULL;
++    return SUCCESS;
++}
++
++void ldap_close(ldap_opt_t * ldap) {
++
++    if (!ldap)
++        return;
++
++    if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0)
++	ldap_perror(ldap->ld, "ldap_unbind()");
++
++    ldap->ld = NULL;
++    FLAG_SET_DISCONNECTED(ldap->flags);
++
++    return;
++}
++
++/* init && bind */
++int ldap_connect(ldap_opt_t * ldap) {
++    int version = LDAP_VERSION3;
++
++    if (!ldap->servers)
++        return FAILURE;
++
++    /* Connection Init and setup */
++    ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++    if (!ldap->ld) {
++        ldap_perror(ldap->ld, "ldap_init()");
++        return FAILURE;
++    }
++
++    if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)");
++        return FAILURE;
++    }
++
++    /* Timeouts setup */
++    if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)");
++    }
++    if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)");
++    }
++
++    /* TLS support */
++    if ( (ldap->tls == -1) || (ldap->tls == 1) ) {
++        if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) {
++            /* failed then reinit the initial connect */
++            ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()");
++            if (ldap->tls == 1)
++                return FAILURE;
++
++            ldap->ld = ldap_init(ldap->servers, LDAP_PORT);
++            if (!ldap->ld) { 
++                ldap_perror(ldap->ld, "ldap_init()");
++                return FAILURE;
++            }
++
++            if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) {
++                 ldap_perror(ldap->ld, "ldap_set_option()");
++                 return FAILURE;
++            }
++        }
++    }
++
++
++    if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) {
++        ldap_perror(ldap->ld, "ldap_simple_bind_s()");
++        return FAILURE;
++    }
++
++    /* says it is connected */
++    FLAG_SET_CONNECTED(ldap->flags);
++
++    return SUCCESS;
++}
++
++/* must free allocated ressource */
++static char * ldap_build_host(char *host, int port) {
++    unsigned int size = strlen(host)+11;
++    char * h = (char *) calloc (size, sizeof(char));
++    int rc;
++    if (!h)
++         return NULL;
++
++    rc = snprintf(h, size, "%s:%d ", host, port);
++    if (rc == -1)
++        return NULL;
++    return h;
++}
++
++static int ldap_count_group(const char * input) {
++    const char * charset = " \t";
++    const char * ptr = input;
++    unsigned int count = 0;
++    unsigned int num;
++
++    num = strspn(ptr, charset);
++    ptr += num;
++
++    while ((num = strcspn(ptr, charset))) {
++    count++;
++    ptr += num;
++    ptr++;
++    }
++
++    return count;
++}
++
++/* format filter */
++char * ldap_parse_groups(const char * groups) {
++    unsigned int buffer_size = FILTER_GROUP_SIZE(groups);
++    char * buffer = (char *) calloc(buffer_size, sizeof(char));
++    char * g = NULL;
++    char * garray[32];
++    unsigned int i = 0;
++
++    if ((!groups)||(!buffer))
++        return NULL;
++
++    g = strdup(groups);
++    if (!g) {
++        free(buffer);
++        return NULL;
++    }
++
++    /* first separate into n tokens */
++    if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) {
++        free(g);
++        free(buffer);
++        return NULL;
++    }
++
++    /* build the final filter format */
++    strlcat(buffer, FILTER_GROUP_PREFIX, buffer_size);
++    strlcat(buffer, FILTER_OR_PREFIX, buffer_size);
++    i = 0;
++    while (garray[i]) {
++        strlcat(buffer, FILTER_CN_PREFIX, buffer_size);
++        strlcat(buffer, garray[i], buffer_size);
++        strlcat(buffer, FILTER_CN_SUFFIX, buffer_size);
++        i++;
++    }
++    strlcat(buffer, FILTER_OR_SUFFIX, buffer_size);
++    strlcat(buffer, FILTER_UID_FORMAT, buffer_size);
++    strlcat(buffer, FILTER_GROUP_SUFFIX, buffer_size);
++
++    free(g);
++    return buffer;
++}
++
++/* a bit dirty but leak free  */
++char * ldap_parse_servers(const char * servers) {
++    char * s = NULL;
++    char * tmp = NULL, *urls[32];
++    unsigned int num = 0 , i = 0 , asize = 0;
++    LDAPURLDesc *urld[32];
++
++    if (!servers)
++        return NULL;
++
++    /* local copy of the arg */
++    s = strdup(servers);
++    if (!s)
++        return NULL;
++
++    /* first separate into URL tokens */
++    if ( tokenize(urls, sizeof(urls)/sizeof(*urls), s) < 0)
++        return NULL;
++
++    i = 0;
++    while (urls[i]) {
++        if (! ldap_is_ldap_url(urls[i]) ||
++           (ldap_url_parse(urls[i], &urld[i]) != 0)) {
++                return NULL;
++        }
++        i++;
++    }
++
++    /* now free(s) */
++    free (s);
++
++    /* how much memory do we need */
++    num = i;
++    for (i = 0 ; i < num ; i++)
++        asize += strlen(urld[i]->lud_host)+11;
++
++    /* alloc */
++    s = (char *) calloc( asize+1 , sizeof(char));
++    if (!s) {
++        for (i = 0 ; i < num ; i++)
++            ldap_free_urldesc(urld[i]);
++        return NULL;
++    }
++
++    /* then build the final host string */
++    for (i = 0 ; i < num ; i++) {
++        /* built host part */
++        tmp = ldap_build_host(urld[i]->lud_host, urld[i]->lud_port);
++        strncat(s, tmp, strlen(tmp));
++        ldap_free_urldesc(urld[i]);
++        free(tmp);
++    }
++
++    return s;
++}
++
++void ldap_options_print(ldap_opt_t * ldap) {
++    debug("ldap options:");
++    debug("servers: %s", ldap->servers);
++    if (ldap->u_basedn)
++        debug("user basedn: %s", ldap->u_basedn);
++    if (ldap->g_basedn)
++        debug("group basedn: %s", ldap->g_basedn);
++    if (ldap->binddn)
++        debug("binddn: %s", ldap->binddn);
++    if (ldap->bindpw)
++        debug("bindpw: %s", ldap->bindpw);
++    if (ldap->sgroup)
++        debug("group: %s", ldap->sgroup);
++    if (ldap->filter)
++        debug("filter: %s", ldap->filter);
++}
++
++void ldap_options_free(ldap_opt_t * l) {
++    if (!l)
++        return;
++    if (l->servers)
++        free(l->servers);
++    if (l->u_basedn)
++        free(l->u_basedn);
++    if (l->g_basedn)
++        free(l->g_basedn);
++    if (l->binddn)
++        free(l->binddn);
++    if (l->bindpw)
++        free(l->bindpw);
++    if (l->sgroup)
++        free(l->sgroup);
++    if (l->fgroup)
++        free(l->fgroup);
++    if (l->filter)
++        free(l->filter);
++    if (l->l_conf)
++        free(l->l_conf);
++    free(l);
++}
++
++/* free keys */
++void ldap_keys_free(ldap_key_t * k) {
++    ldap_value_free_len(k->keys);
++    free(k);
++    return;
++}
++
++ldap_key_t * ldap_getuserkey(ldap_opt_t *l, const char * user) {
++    ldap_key_t * k = (ldap_key_t *) calloc (1, sizeof(ldap_key_t));
++    LDAPMessage *res, *e;
++    char * filter;
++    int i;
++    char *attrs[] = {
++      l->pub_key_attr,
++      NULL
++    };
++
++    if ((!k) || (!l))
++         return NULL;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED))
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return NULL;
++
++    /* build  filter for LDAP request */
++    REQUEST_USER(filter, user, l->filter);
++
++    if ( ldap_search_st( l->ld,
++        l->u_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        attrs, 0, &l->s_timeout, &res ) != LDAP_SUCCESS) {
++        
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++        free(k);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return NULL;
++    } 
++
++    /* free */
++    free(filter);
++
++    /* check if any results */
++    i = ldap_count_entries(l->ld,res);
++    if (i <= 0) {
++        ldap_msgfree(res);
++        free(k);
++        return NULL;
++    }
++
++    if (i > 1)
++        debug("[LDAP] duplicate entries, using the FIRST entry returned");
++
++    e = ldap_first_entry(l->ld, res);
++    k->keys = ldap_get_values_len(l->ld, e, l->pub_key_attr);
++    k->num = ldap_count_values_len(k->keys);
++
++    ldap_msgfree(res);
++    return k;
++}
++
++
++/* -1 if trouble
++   0 if user is NOT member of current server group
++   1 if user IS MEMBER of current server group 
++ */
++int ldap_ismember(ldap_opt_t * l, const char * user) {
++    LDAPMessage *res;
++    char * filter;
++    int i;
++
++    if ((!l->sgroup) || !(l->g_basedn))
++        return 1;
++
++    /* Am i still connected ? RETRY n times */
++    /* XXX TODO: setup some conf value for retrying */
++    if (!(l->flags & FLAG_CONNECTED)) 
++        for (i = 0 ; i < 2 ; i++)
++            if (ldap_connect(l) == 0)
++                 break;
++
++    /* quick check for attempts to be evil */
++    if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) ||
++        (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL))
++        return FAILURE;
++
++    /* build filter for LDAP request */
++    REQUEST_GROUP(filter, l->fgroup, user);
++
++    if (ldap_search_st( l->ld, 
++        l->g_basedn,
++        LDAP_SCOPE_SUBTREE,
++        filter,
++        NULL, 0, &l->s_timeout, &res) != LDAP_SUCCESS) {
++    
++        ldap_perror(l->ld, "ldap_search_st()");
++
++        free(filter);
++
++        /* XXX error on search, timeout etc.. close ask for reconnect */
++        ldap_close(l);
++
++        return FAILURE;
++    }
++
++    free(filter);
++
++    /* check if any results */
++    if (ldap_count_entries(l->ld, res) > 0) {
++        ldap_msgfree(res);
++        return 1;
++    }
++
++    ldap_msgfree(res);
++    return 0;
++}
++
++/*
++ * ldap.conf simple parser
++ * XXX TODO:  sanity checks
++ * must either
++ * - free the previous ldap_opt_before replacing entries
++ * - free each necessary previously parsed elements
++ * ret:
++ * -1 on FAILURE, 0 on SUCCESS
++ */
++int ldap_parse_lconf(ldap_opt_t * l) {
++    FILE * lcd; /* ldap.conf descriptor */
++    char buf[BUFSIZ];
++    char * s = NULL, * k = NULL, * v = NULL;
++    int li, len;
++
++    lcd = fopen (l->l_conf, "r");
++    if (lcd == NULL) {
++        /* debug("Cannot open %s", l->l_conf); */
++        perror("ldap_parse_lconf()");
++        return FAILURE;
++    }
++    
++    while (fgets (buf, sizeof (buf), lcd) != NULL) {
++
++        if (*buf == '\n' || *buf == '#')
++            continue;
++
++        k = buf;
++        v = k;
++        while (*v != '\0' && *v != ' ' && *v != '\t')
++            v++;
++
++        if (*v == '\0')
++            continue;
++
++        *(v++) = '\0';
++
++        while (*v == ' ' || *v == '\t')
++            v++;
++
++        li = strlen (v) - 1;
++        while (v[li] == ' ' || v[li] == '\t' || v[li] == '\n')
++            --li;
++        v[li + 1] = '\0';
++
++        if (!strcasecmp (k, "uri")) {
++            if ((l->servers = ldap_parse_servers(v)) == NULL) {
++                fatal("error in ldap servers");
++            return FAILURE;
++            }
++
++        }
++        else if (!strcasecmp (k, "base")) { 
++            s = strchr (v, '?');
++            if (s != NULL) {
++                len = s - v;
++                l->u_basedn = malloc (len + 1);
++                strncpy (l->u_basedn, v, len);
++                l->u_basedn[len] = '\0';
++            } else {
++                l->u_basedn = strdup (v);
++            }
++        }
++        else if (!strcasecmp (k, "binddn")) {
++            l->binddn = strdup (v);
++        }
++        else if (!strcasecmp (k, "bindpw")) {
++            l->bindpw = strdup (v);
++        }
++        else if (!strcasecmp (k, "timelimit")) {
++            l->s_timeout.tv_sec = atoi (v);
++                }
++        else if (!strcasecmp (k, "bind_timelimit")) {
++            l->b_timeout.tv_sec = atoi (v);
++        }
++        else if (!strcasecmp (k, "ssl")) {
++            if (!strcasecmp (v, "start_tls"))
++                l->tls = 1;
++        }
++    }
++
++    fclose (lcd);
++    return SUCCESS;
++}
++
++#endif /* WITH_LDAP_PUBKEY */
+diff --git a/ldapauth.h b/ldapauth.h
+new file mode 100644
+index 0000000..337714d
+--- /dev/null
++++ b/ldapauth.h
+@@ -0,0 +1,127 @@
++/*
++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ 
++ */
++
++/*
++ *
++ * Copyright (c) 2005, Eric AUGE <eau at phear.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ *
++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ */
++
++#ifndef LDAPAUTH_H
++#define LDAPAUTH_H
++
++#define LDAP_DEPRECATED 1
++
++#include <string.h>
++#include <time.h>
++#include <ldap.h>
++#include <lber.h>
++
++/* tokens in use for config */
++#define _DEFAULT_LPK_TOKEN "UseLPK"
++#define _DEFAULT_SRV_TOKEN "LpkServers"
++#define _DEFAULT_USR_TOKEN "LpkUserDN"
++#define _DEFAULT_GRP_TOKEN "LpkGroupDN"
++#define _DEFAULT_BDN_TOKEN "LpkBindDN"
++#define _DEFAULT_BPW_TOKEN "LpkBindPw"
++#define _DEFAULT_MYG_TOKEN "LpkServerGroup"
++#define _DEFAULT_FIL_TOKEN "LpkFilter"
++#define _DEFAULT_TLS_TOKEN "LpkForceTLS"
++#define _DEFAULT_BTI_TOKEN "LpkBindTimelimit"
++#define _DEFAULT_STI_TOKEN "LpkSearchTimelimit"
++#define _DEFAULT_LDP_TOKEN "LpkLdapConf"
++
++#define _DEFAULT_PUB_TOKEN "LpkPubKeyAttr"
++
++/* default options */
++#define _DEFAULT_LPK_ON 0
++#define _DEFAULT_LPK_SERVERS NULL
++#define _DEFAULT_LPK_UDN NULL
++#define _DEFAULT_LPK_GDN NULL
++#define _DEFAULT_LPK_BINDDN NULL
++#define _DEFAULT_LPK_BINDPW NULL
++#define _DEFAULT_LPK_SGROUP NULL
++#define _DEFAULT_LPK_FILTER NULL
++#define _DEFAULT_LPK_TLS -1
++#define _DEFAULT_LPK_BTIMEOUT 10
++#define _DEFAULT_LPK_STIMEOUT 10
++#define _DEFAULT_LPK_LDP NULL
++#define _DEFAULT_LPK_PUB "sshPublicKey"
++
++/* flags */
++#define FLAG_EMPTY	    0x00000000
++#define FLAG_CONNECTED	    0x00000001
++
++/* flag macros */
++#define FLAG_SET_EMPTY(x)		x&=(FLAG_EMPTY)
++#define FLAG_SET_CONNECTED(x)		x|=(FLAG_CONNECTED)
++#define FLAG_SET_DISCONNECTED(x)	x&=~(FLAG_CONNECTED)
++
++/* defines */
++#define FAILURE -1
++#define SUCCESS 0
++
++/* 
++ *
++ * defined files path 
++ * (should be relocated to pathnames.h,
++ * if one day it's included within the tree) 
++ *
++ */
++#define _PATH_LDAP_CONFIG_FILE "/etc/ldap.conf"
++
++/* structures */
++typedef struct ldap_options {
++    int on;			/* Use it or NOT */
++    LDAP * ld;			/* LDAP file desc */
++    char * servers;		/* parsed servers for ldaplib failover handling */
++    char * u_basedn;		/* user basedn */
++    char * g_basedn;		/* group basedn */
++    char * binddn;		/* binddn */
++    char * bindpw;		/* bind password */
++    char * sgroup;		/* server group */
++    char * fgroup;		/* group filter */
++    char * filter;		/* additional filter */
++    char * l_conf;		/* use ldap.conf */
++    int tls;			/* TLS only */
++    struct timeval b_timeout;   /* bind timeout */
++    struct timeval s_timeout;   /* search timeout */
++    unsigned int flags;		/* misc flags (reconnection, future use?) */
++    char * pub_key_attr;	/* Pubkey-Attribute */
++} ldap_opt_t;
++
++typedef struct ldap_keys {
++    struct berval ** keys;	/* the public keys retrieved */
++    unsigned int num;		/* number of keys */
++} ldap_key_t;
++
++
++/* function headers */
++void ldap_close(ldap_opt_t *);
++int ldap_connect(ldap_opt_t *);
++char * ldap_parse_groups(const char *);
++char * ldap_parse_servers(const char *);
++void ldap_options_print(ldap_opt_t *);
++void ldap_options_free(ldap_opt_t *);
++void ldap_keys_free(ldap_key_t *);
++int ldap_parse_lconf(ldap_opt_t *);
++ldap_key_t * ldap_getuserkey(ldap_opt_t *, const char *);
++int ldap_ismember(ldap_opt_t *, const char *);
++
++#endif
+diff --git a/lpk-user-example.txt b/lpk-user-example.txt
+new file mode 100644
+index 0000000..1528fc0
+--- /dev/null
++++ b/lpk-user-example.txt
+@@ -0,0 +1,117 @@
++
++Post to ML -> User Made Quick Install Doc.
++Contribution from John Lane <john at lane.uk.net>
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++
++OpenSSH LDAP keystore Patch
++===========================
++
++NOTE: these notes are a transcript of a specific installation
++      they work for me, your specifics may be different!
++      from John Lane March 17th 2005         john at lane.uk.net
++
++This is a patch to OpenSSH 4.0p1 to allow it to obtain users' public keys
++from their LDAP record as an alternative to ~/.ssh/authorized_keys.
++
++(Assuming here that necessary build stuff is in $BUILD)
++
++cd $BUILD/openssh-4.0p1
++patch -Np1 -i $BUILD/openssh-lpk-4.0p1-0.3.patch
++mkdir -p /var/empty &&
++./configure --prefix=/usr --sysconfdir=/etc/ssh \
++    --libexecdir=/usr/sbin --with-md5-passwords --with-pam \
++    --with-libs="-lldap" --with-cppflags="-DWITH_LDAP_PUBKEY"
++Now do.
++make &&
++make install
++
++Add the following config to /etc/ssh/ssh_config
++UseLPK yes
++LpkServers ldap://myhost.mydomain.com
++LpkUserDN  ou=People,dc=mydomain,dc=com
++
++We need to tell sshd about the SSL keys during boot, as root's
++environment does not exist at that time. Edit /etc/rc.d/init.d/sshd.
++Change the startup code from this:
++                echo "Starting SSH Server..."
++                loadproc /usr/sbin/sshd
++                ;;
++to this:
++                echo "Starting SSH Server..."
++                LDAPRC="/root/.ldaprc" loadproc /usr/sbin/sshd
++                ;;
++
++Re-start the sshd daemon:
++/etc/rc.d/init.d/sshd restart
++
++Install the additional LDAP schema
++cp $BUILD/openssh-lpk-0.2.schema  /etc/openldap/schema/openssh.schema
++
++Now add the openSSH LDAP schema to /etc/openldap/slapd.conf:
++Add the following to the end of the existing block of schema includes
++include         /etc/openldap/schema/openssh.schema
++
++Re-start the LDAP server:
++/etc/rc.d/init.d/slapd restart
++
++To add one or more public keys to a user, eg "testuser" :
++ldapsearch -x -W -Z -LLL -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com" > /tmp/testuser
++
++append the following to this /tmp/testuser file
++objectclass: ldapPublicKey
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KS
++qIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z8XwSsuAoR1t86t+5dlI
++7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++Then do a modify:
++ldapmodify -x -D "uid=testuser,ou=People,dc=mydomain,dc=com" -W -f
++/tmp/testuser -Z
++Enter LDAP Password:
++modifying entry "uid=testuser,ou=People,dc=mydomain,dc=com"
++And check the modify is ok:
++ldapsearch -x -W -Z -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D
++"uid=testuser,ou=People,dc=mydomain,dc=com"
++Enter LDAP Password:
++# extended LDIF
++#
++# LDAPv3
++# base <uid=testuser,ou=People,dc=mydomain,dc=com> with scope sub
++# filter: (objectclass=*)
++# requesting: ALL
++#
++
++# testuser, People, mydomain.com
++dn: uid=testuser,ou=People,dc=mydomain,dc=com
++uid: testuser
++cn: testuser
++objectClass: account
++objectClass: posixAccount
++objectClass: top
++objectClass: shadowAccount
++objectClass: ldapPublicKey
++shadowLastChange: 12757
++shadowMax: 99999
++shadowWarning: 7
++loginShell: /bin/bash
++uidNumber: 9999
++gidNumber: 501
++homeDirectory: /home/testuser
++userPassword:: e1NTSEF9UDgwV1hnM1VjUDRJK0k1YnFiL1d4ZUJObXlZZ3Z3UTU=
++sshPublicKey: ssh-rsa
++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KSqIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z
++8XwSsuAoR1t86t+5dlI7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key
++
++# search result
++search: 3
++result: 0 Success
++
++# numResponses: 2
++# numEntries: 1
++
++Now start a ssh session to user "testuser" from usual ssh client (e.g.
++puTTY). Login should succeed.
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+diff --git a/openssh-lpk_openldap.schema b/openssh-lpk_openldap.schema
+new file mode 100644
+index 0000000..5f5512a
+--- /dev/null
++++ b/openssh-lpk_openldap.schema
+@@ -0,0 +1,19 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Based on the proposal of : Mark Ruijter
++#
++
++
++# octetString SYNTAX
++attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff --git a/openssh-lpk_sun.schema b/openssh-lpk_sun.schema
+new file mode 100644
+index 0000000..c5e0214
+--- /dev/null
++++ b/openssh-lpk_sun.schema
+@@ -0,0 +1,21 @@
++#
++# LDAP Public Key Patch schema for use with openssh-ldappubkey
++# Author: Eric AUGE <eau at phear.org>
++# 
++# Schema for Sun Directory Server.
++# Based on the original schema, modified by Stefan Fischer.
++#
++
++dn: cn=schema
++
++# octetString SYNTAX
++attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' 
++	DESC 'MANDATORY: OpenSSH Public key' 
++	EQUALITY octetStringMatch
++	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
++
++# printableString SYNTAX yes|no
++objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY
++	DESC 'MANDATORY: OpenSSH LPK objectclass'
++	MUST ( sshPublicKey $ uid ) 
++	)
+diff --git a/servconf.c b/servconf.c
+index 986a5b9..627c269 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -42,6 +42,10 @@
+ #include "channels.h"
+ #include "groupaccess.h"
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ static void add_listen_addr(ServerOptions *, char *, int);
+ static void add_one_listen_addr(ServerOptions *, char *, int);
+ 
+@@ -108,6 +112,25 @@ initialize_server_options(ServerOptions *options)
+ 	options->num_allow_groups = 0;
+ 	options->num_deny_groups = 0;
+ 	options->ciphers = NULL;
++#ifdef WITH_LDAP_PUBKEY
++	/* XXX dirty */
++	options->lpk.ld = NULL;
++	options->lpk.on = -1;
++	options->lpk.servers = NULL;
++	options->lpk.u_basedn = NULL;
++	options->lpk.g_basedn = NULL;
++	options->lpk.binddn = NULL;
++	options->lpk.bindpw = NULL;
++	options->lpk.sgroup = NULL;
++	options->lpk.filter = NULL;
++	options->lpk.fgroup = NULL;
++	options->lpk.l_conf = NULL;
++	options->lpk.tls = -1;
++	options->lpk.b_timeout.tv_sec = -1;
++	options->lpk.s_timeout.tv_sec = -1;
++	options->lpk.flags = FLAG_EMPTY;
++	options->lpk.pub_key_attr = NULL;
++#endif
+ 	options->macs = NULL;
+ 	options->protocol = SSH_PROTO_UNKNOWN;
+ 	options->gateway_ports = -1;
+@@ -267,6 +290,35 @@ fill_default_server_options(ServerOptions *options)
+ 	if (options->zero_knowledge_password_authentication == -1)
+ 		options->zero_knowledge_password_authentication = 0;
+ 
++#ifdef WITH_LDAP_PUBKEY
++	if (options->lpk.on == -1)
++	    options->lpk.on = _DEFAULT_LPK_ON;
++	if (options->lpk.servers == NULL)
++	    options->lpk.servers = _DEFAULT_LPK_SERVERS;
++	if (options->lpk.u_basedn == NULL)
++	    options->lpk.u_basedn = _DEFAULT_LPK_UDN;
++	if (options->lpk.g_basedn == NULL)
++	    options->lpk.g_basedn = _DEFAULT_LPK_GDN;
++	if (options->lpk.binddn == NULL)
++	    options->lpk.binddn = _DEFAULT_LPK_BINDDN;
++	if (options->lpk.bindpw == NULL)
++	    options->lpk.bindpw = _DEFAULT_LPK_BINDPW;
++	if (options->lpk.sgroup == NULL)
++	    options->lpk.sgroup = _DEFAULT_LPK_SGROUP;
++	if (options->lpk.filter == NULL)
++	    options->lpk.filter = _DEFAULT_LPK_FILTER;
++	if (options->lpk.tls == -1)
++	    options->lpk.tls = _DEFAULT_LPK_TLS;
++	if (options->lpk.b_timeout.tv_sec == -1)
++	    options->lpk.b_timeout.tv_sec = _DEFAULT_LPK_BTIMEOUT;
++	if (options->lpk.s_timeout.tv_sec == -1)
++	    options->lpk.s_timeout.tv_sec = _DEFAULT_LPK_STIMEOUT;
++	if (options->lpk.l_conf == NULL)
++	    options->lpk.l_conf = _DEFAULT_LPK_LDP;
++	if (options->lpk.pub_key_attr == NULL)
++	    options->lpk.pub_key_attr = _DEFAULT_LPK_PUB;
++#endif
++
+ 	/* Turn privilege separation on by default */
+ 	if (use_privsep == -1)
+ 		use_privsep = 1;
+@@ -313,6 +365,12 @@ typedef enum {
+ 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
+ 	sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
+ 	sDeprecated, sUnsupported
++#ifdef WITH_LDAP_PUBKEY
++	,sLdapPublickey, sLdapServers, sLdapUserDN
++	,sLdapGroupDN, sBindDN, sBindPw, sMyGroup
++	,sLdapFilter, sForceTLS, sBindTimeout
++	,sSearchTimeout, sLdapConf ,sLpkPubKeyAttr 
++#endif
+ } ServerOpCodes;
+ 
+ #define SSHCFG_GLOBAL	0x01	/* allowed in main section of sshd_config */
+@@ -423,6 +481,21 @@ static struct {
+ 	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
+ 	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
+ 	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
++#ifdef WITH_LDAP_PUBKEY
++        { _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
++        { _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
++        { _DEFAULT_USR_TOKEN, sLdapUserDN, SSHCFG_GLOBAL },
++        { _DEFAULT_GRP_TOKEN, sLdapGroupDN, SSHCFG_GLOBAL },
++        { _DEFAULT_BDN_TOKEN, sBindDN, SSHCFG_GLOBAL },
++        { _DEFAULT_BPW_TOKEN, sBindPw, SSHCFG_GLOBAL },
++        { _DEFAULT_MYG_TOKEN, sMyGroup, SSHCFG_GLOBAL },
++        { _DEFAULT_FIL_TOKEN, sLdapFilter, SSHCFG_GLOBAL },
++        { _DEFAULT_TLS_TOKEN, sForceTLS, SSHCFG_GLOBAL },
++        { _DEFAULT_BTI_TOKEN, sBindTimeout, SSHCFG_GLOBAL },
++        { _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL },
++        { _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL },
++        { "LpkPubKeyAttr", sLpkPubKeyAttr, SSHCFG_GLOBAL },
++#endif
+ 	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
+ 	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
+ 	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
+@@ -666,6 +739,7 @@ process_server_config_line(ServerOptions *options, char *line,
+ 	int cmdline = 0, *intptr, value, n;
+ 	SyslogFacility *log_facility_ptr;
+ 	LogLevel *log_level_ptr;
++ 	unsigned long lvalue, *longptr;
+ 	ServerOpCodes opcode;
+ 	int port;
+ 	u_int i, flags = 0;
+@@ -680,6 +754,7 @@ process_server_config_line(ServerOptions *options, char *line,
+ 	if (!arg || !*arg || *arg == '#')
+ 		return 0;
+ 	intptr = NULL;
++	longptr = NULL;
+ 	charptr = NULL;
+ 	opcode = parse_token(arg, filename, linenum, &flags);
+ 
+@@ -1364,6 +1439,125 @@ process_server_config_line(ServerOptions *options, char *line,
+ 		while (arg)
+ 		    arg = strdelim(&cp);
+ 		break;
++#ifdef WITH_LDAP_PUBKEY
++	case sLdapPublickey:
++		intptr = &options->lpk.on;
++		goto parse_flag;
++	case sLdapServers:
++		/* arg = strdelim(&cp); */
++		p = line;
++		while(*p++);
++		arg = p;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		if ((options->lpk.servers = ldap_parse_servers(arg)) == NULL)
++		    fatal("%s line %d: error in ldap servers", filename, linenum);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapUserDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.u_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapGroupDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing ldap server",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.g_basedn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindDN:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing binddn",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.binddn = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sBindPw:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing bindpw",filename,linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.bindpw = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sMyGroup:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing groupname",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.sgroup = xstrdup(arg);
++		if (options->lpk.sgroup)
++		    options->lpk.fgroup = ldap_parse_groups(options->lpk.sgroup);
++		memset(arg,0,strlen(arg));
++		break;
++	case sLdapFilter:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing filter",filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.filter = xstrdup(arg);
++		memset(arg,0,strlen(arg));
++		break;
++	case sForceTLS:
++		intptr = &options->lpk.tls;
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing yes/no argument.",
++			    filename, linenum);
++		value = 0;	/* silence compiler */
++		if (strcmp(arg, "yes") == 0)
++			value = 1;
++		else if (strcmp(arg, "no") == 0)
++			value = 0;
++		else if (strcmp(arg, "try") == 0)
++			value = -1;
++		else
++			fatal("%s line %d: Bad yes/no argument: %s",
++				filename, linenum, arg);
++		if (*intptr == -1)
++			*intptr = value;
++		break;
++	case sBindTimeout:
++		longptr = (unsigned long *) &options->lpk.b_timeout.tv_sec;
++parse_ulong:
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing integer value.",
++			    filename, linenum);
++		lvalue = atol(arg);
++		if (*activep && *longptr == -1)
++			*longptr = lvalue;
++		break;
++
++	case sSearchTimeout:
++		longptr = (unsigned long *) &options->lpk.s_timeout.tv_sec;
++		goto parse_ulong;
++		break;
++	case sLdapConf:
++		arg = cp;
++		if (!arg || *arg == '\0')
++		    fatal("%s line %d: missing LpkLdapConf", filename, linenum);
++		arg[strlen(arg)] = '\0';
++		options->lpk.l_conf = xstrdup(arg);
++		memset(arg, 0, strlen(arg));
++		break;
++	case sLpkPubKeyAttr:
++		arg = cp;
++                if (!arg || *arg == '\0')
++                    fatal("%s line %d: missing pubkeyattr",filename,linenum);
++                arg[strlen(arg)] = '\0';
++                options->lpk.pub_key_attr = xstrdup(arg);
++                memset(arg,0,strlen(arg));
++                break;
++
++#endif
+ 
+ 	default:
+ 		fatal("%s line %d: Missing handler for opcode %s (%d)",
+diff --git a/servconf.h b/servconf.h
+index 45d2a2a..a2ffbbe 100644
+--- a/servconf.h
++++ b/servconf.h
+@@ -16,6 +16,10 @@
+ #ifndef SERVCONF_H
+ #define SERVCONF_H
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #define MAX_PORTS		256	/* Max # ports. */
+ 
+ #define MAX_ALLOW_USERS		256	/* Max # users on allow list. */
+@@ -150,6 +154,9 @@ typedef struct {
+ 	int	use_pam;		/* Enable auth via PAM */
+ 
+ 	int	permit_tun;
++#ifdef WITH_LDAP_PUBKEY
++        ldap_opt_t lpk;
++#endif
+ 
+ 	int	num_permitted_opens;
+ 
+diff --git a/sshd.c b/sshd.c
+index a7d3ee5..bc84ca1 100644
+--- a/sshd.c
++++ b/sshd.c
+@@ -127,6 +127,10 @@ int allow_severity;
+ int deny_severity;
+ #endif /* LIBWRAP */
+ 
++#ifdef WITH_LDAP_PUBKEY
++#include "ldapauth.h"
++#endif
++
+ #ifndef O_NOCTTY
+ #define O_NOCTTY	0
+ #endif
+@@ -1539,6 +1543,16 @@ main(int ac, char **av)
+ 		exit(1);
+ 	}
+ 
++#ifdef WITH_LDAP_PUBKEY
++    /* ldap_options_print(&options.lpk); */
++    /* XXX initialize/check ldap connection and set *LD */
++    if (options.lpk.on) {
++        if (options.lpk.l_conf && (ldap_parse_lconf(&options.lpk) < 0) )
++            error("[LDAP] could not parse %s", options.lpk.l_conf);
++        if (ldap_connect(&options.lpk) < 0)
++            error("[LDAP] could not initialize ldap connection");
++    }
++#endif
+ 	debug("sshd version %.100s", SSH_RELEASE);
+ 
+ 	/* Store privilege separation user for later use if required. */
+diff --git a/sshd_config b/sshd_config
+index 72fbae3..fdafc31 100644
+--- a/sshd_config
++++ b/sshd_config
+@@ -107,6 +107,22 @@
+ # no default banner path
+ #Banner none
+ 
++# here are the new patched ldap related tokens
++# entries in your LDAP must have posixAccount & ldapPublicKey objectclass
++#UseLPK yes
++#LpkLdapConf /etc/ldap.conf
++#LpkServers  ldap://10.1.7.1/ ldap://10.1.7.2/
++#LpkUserDN   ou=users,dc=phear,dc=org
++#LpkGroupDN  ou=groups,dc=phear,dc=org
++#LpkBindDN cn=Manager,dc=phear,dc=org
++#LpkBindPw secret
++#LpkServerGroup mail
++#LpkFilter (hostAccess=master.phear.org)
++#LpkForceTLS no
++#LpkSearchTimelimit 3
++#LpkBindTimelimit 3
++#LpkPubKeyAttr sshPublicKey
++
+ # override default of no subsystems
+ Subsystem	sftp	/usr/libexec/sftp-server
+ 
+diff --git a/sshd_config.5 b/sshd_config.5
+index 596a728..38f784b 100644
+--- a/sshd_config.5
++++ b/sshd_config.5
+@@ -1092,6 +1092,62 @@ Specifies the full pathname of the
+ program.
+ The default is
+ .Pa /usr/X11R6/bin/xauth .
++.It Cm UseLPK
++Specifies whether LDAP public key retrieval must be used or not. It allow
++an easy centralisation of public keys within an LDAP directory. The argument must be
++.Dq yes
++or
++.Dq no .
++.It Cm LpkLdapConf
++Specifies whether LDAP Public keys should parse the specified ldap.conf file
++instead of sshd_config Tokens. The argument must be a valid path to an ldap.conf
++file like
++.Pa /etc/ldap.conf
++.It Cm LpkServers
++Specifies LDAP one or more [:space:] separated server's url the following form may be used:
++.Pp
++LpkServers ldaps://127.0.0.1 ldap://127.0.0.2 ldap://127.0.0.3
++.It Cm LpkUserDN
++Specifies the LDAP user DN.
++.Pp
++LpkUserDN ou=users,dc=phear,dc=org
++.It Cm LpkGroupDN
++Specifies the LDAP groups DN.
++.Pp
++LpkGroupDN ou=groups,dc=phear,dc=org
++.It Cm LpkBindDN
++Specifies the LDAP bind DN to use if necessary.
++.Pp
++LpkBindDN cn=Manager,dc=phear,dc=org
++.It Cm LpkBindPw
++Specifies the LDAP bind credential. 
++.Pp
++LpkBindPw secret
++.It Cm LpkServerGroup
++Specifies one or more [:space:] separated group the server is part of. 
++.Pp
++LpkServerGroup unix mail prod
++.It Cm LpkFilter
++Specifies an additional LDAP filter to use for finding SSH keys
++.Pp
++LpkFilter (hostAccess=master.phear.org)
++.It Cm LpkForceTLS
++Specifies if the LDAP server connection must be tried, forced or not used. The argument must be 
++.Dq yes
++or
++.Dq no
++or
++.Dq try .
++.It Cm LpkSearchTimelimit
++Sepcifies the search time limit before the search is considered over. value is
++in seconds.
++.Pp
++LpkSearchTimelimit 3
++.It Cm LpkBindTimelimit
++Sepcifies the bind time limit before the connection is considered dead. value is
++in seconds.
++.Pp
++LpkBindTimelimit 3
+ .El
+ .Sh TIME FORMATS
+ .Xr sshd 8
+diff --git a/version.h b/version.h
+index 67d78dc..643b03b 100644
+--- a/version.h
++++ b/version.h
+@@ -2,5 +2,6 @@
+ 
+ #define SSH_VERSION	"OpenSSH_5.6"
+ 
++#define SSH_LPK		"lpk"
+ #define SSH_PORTABLE	"p1"
+-#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_LPK
+-- 
+1.7.2.2
+

Deleted: csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch	2010-09-27 09:01:05 UTC (rev 11056)
+++ csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch	2010-09-27 13:19:58 UTC (rev 11057)
@@ -1,1948 +0,0 @@
-From bf2274fb19b2da6b8b3b6c51111d912e19b3128c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 21 Apr 2010 11:14:45 +0200
-Subject: [PATCH] This is a forward-port of the OpenSSH LPK support patch.
-
-It adds support for storing OpenSSH public keys in LDAP. It also supports
-grouping of machines in the LDAP data to limit users to specific machines.
-
-The latest homepage for the LPK project is:
-http://code.google.com/p/openssh-lpk/
-
-The 0.3.10 version of the patch includes a fix for 64-bit platforms, as
-discovered by Gentoo, where the bind timeout and search timeout values were not
-being parsed correctly: http://bugs.gentoo.org/210110
-
-Forward-ported-from: openssh-lpk-5.1p1-0.3.10.patch
----
- Makefile.in                 |    2 +-
- README.lpk                  |  267 ++++++++++++++++++++
- auth-rsa.c                  |   86 +++++++
- auth2-pubkey.c              |   73 ++++++
- config.h.in                 |    3 +
- configure                   |   81 ++++++
- configure.ac                |   32 +++
- ldapauth.c                  |  575 +++++++++++++++++++++++++++++++++++++++++++
- ldapauth.h                  |  124 ++++++++++
- lpk-user-example.txt        |  117 +++++++++
- openssh-lpk_openldap.schema |   19 ++
- openssh-lpk_sun.schema      |   21 ++
- servconf.c                  |  169 +++++++++++++
- servconf.h                  |    7 +
- sshd.c                      |   14 +
- sshd_config                 |   15 ++
- sshd_config.5               |   56 +++++
- 17 files changed, 1660 insertions(+), 1 deletions(-)
- create mode 100644 README.lpk
- create mode 100644 ldapauth.c
- create mode 100644 ldapauth.h
- create mode 100644 lpk-user-example.txt
- create mode 100644 openssh-lpk_openldap.schema
- create mode 100644 openssh-lpk_sun.schema
-
-diff --git a/Makefile.in b/Makefile.in
-index 69e3567..b15d85d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -91,7 +91,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
- 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
- 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
- 	audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
--	roaming_common.o roaming_serv.o
-+	roaming_common.o roaming_serv.o ldapauth.o
- 
- MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
- MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
-diff --git a/README.lpk b/README.lpk
-new file mode 100644
-index 0000000..d0b6de0
---- /dev/null
-+++ b/README.lpk
-@@ -0,0 +1,267 @@
-+OpenSSH LDAP PUBLIC KEY PATCH 
-+Copyright (c) 2003 Eric AUGE (eau at phear.org)
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products
-+   derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+purposes of this patch:
-+
-+This patch would help to have authentication centralization policy
-+using ssh public key authentication.
-+This patch could be an alternative to other "secure" authentication system
-+working in a similar way (Kerberos, SecurID, etc...), except the fact 
-+that it's based on OpenSSH and its public key abilities.
-+
-+>> FYI: <<
-+'uid': means unix accounts existing on the current server
-+'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config)
-+
-+example schema:
-+
-+
-+                                  server1 (uid: eau,rival,toto) (lpkServerGroup: unix)
-+                ___________      /
-+               /           \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix)
-+              | LDAP Server |    \
-+	      | eau  ,rival |     server2 (uid: rival, eau) (lpkServerGroup: unix)
-+	      | titi ,toto  |
-+	      | userx,....  |         server5 (uid: eau)  (lpkServerGroup: mail)
-+               \___________/ \       /
-+	                       ----- - server4 (uid: eau, rival)  (no group configured)
-+			             \
-+				        etc...
-+
-+- WHAT WE NEED :
-+
-+  * configured LDAP server somewhere on the network (i.e. OpenLDAP)
-+  * patched sshd (with this patch ;)
-+  * LDAP user(/group) entry (look at users.ldif (& groups.ldif)):
-+        User entry:
-+	- attached to the 'ldapPublicKey' objectclass
-+	- attached to the 'posixAccount' objectclass
-+	- with a filled 'sshPublicKey' attribute 
-+	Example:
-+		dn: uid=eau,ou=users,dc=cuckoos,dc=net
-+		objectclass: top
-+		objectclass: person
-+		objectclass: organizationalPerson
-+		objectclass: posixAccount
-+		objectclass: ldapPublicKey
-+		description: Eric AUGE Account
-+		userPassword: blah
-+		cn: Eric AUGE
-+		sn: Eric AUGE
-+		uid: eau
-+		uidNumber: 1034
-+		gidNumber: 1
-+		homeDirectory: /export/home/eau
-+		sshPublicKey: ssh-dss AAAAB3...
-+		sshPublicKey: ssh-dss AAAAM5...
-+
-+	Group entry:
-+	- attached to the 'posixGroup' objectclass
-+	- with a 'cn' groupname attribute
-+	- with multiple 'memberUid' attributes filled with usernames allowed in this group
-+	Example:
-+		# few members
-+		dn: cn=unix,ou=groups,dc=cuckoos,dc=net
-+		objectclass: top
-+		objectclass: posixGroup
-+		description: Unix based servers group
-+		cn: unix
-+		gidNumber: 1002
-+		memberUid: eau
-+		memberUid: user1
-+		memberUid: user2
-+
-+
-+- HOW IT WORKS :
-+
-+  * without patch
-+  If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..)
-+  and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled).
-+
-+  * with the patch
-+  If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled.
-+  It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. 
-+  (usually in $HOME/.ssh/authorized_keys)
-+
-+  If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into.
-+  If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled).
-+
-+  7 tokens are added to sshd_config :
-+  # here is the new patched ldap related tokens
-+  # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup
-+  UseLPK yes								# look the pub key into LDAP
-+  LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3	# which LDAP server for users ? (URL format)
-+  LpkUserDN  ou=users,dc=foobar,dc=net					# which base DN for users ?
-+  LpkGroupDN ou=groups,dc=foobar,dc=net					# which base DN for groups ? 
-+  LpkBindDN cn=manager,dc=foobar,dc=net					# which bind DN ?
-+  LpkBindPw asecret							# bind DN credidentials
-+  LpkServerGroup agroupname						# the group the server is part of
-+
-+  Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some
-+  flaws you have to take care of.
-+
-+- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY
-+
-+  * my way (there is plenty :)
-+  - create ldif file (i.e. users.ldif)
-+  - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub
-+  - my way in 4 steps :
-+  Example:
-+
-+  # you add this to the user entry in the LDIF file :
-+  [...]
-+  objectclass: posixAccount
-+  objectclass: ldapPublicKey
-+  [...]
-+  sshPubliKey: ssh-dss AAAABDh12DDUR2...
-+  [...]
-+
-+  # insert your entry and you're done :)
-+  ldapadd -D balblabla -w bleh < file.ldif 
-+  
-+  all standard options can be present in the 'sshPublicKey' attribute.
-+
-+- WHY :
-+
-+  Simply because, i was looking for a way to centralize all sysadmins authentication, easily,  without completely using LDAP 
-+  as authentication method (like pam_ldap etc..).  
-+  
-+  After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get 
-+  public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser'
-+  objectclass within LDAP and part of the group the SSH server is in). 
-+
-+  Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase 
-+  so each user can change it as much as he wants). 
-+
-+  Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only).
-+
-+- RULES :  
-+  Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. 
-+  and the additionnal lpk.schema.
-+
-+  This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication 
-+  (pamldap, nss_ldap, etc..).
-+
-+  This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..).
-+  
-+  Referring to schema at the beginning of this file if user 'eau' is only in group 'unix'
-+  'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'.
-+  If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able
-+  to log in 'server5' (i hope you got the idea, my english is bad :).
-+
-+  Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP
-+  server.
-+  When you want to allow a new user to have access to the server parc, you just add him an account on 
-+  your servers, you add his public key into his entry on the LDAP server, it's done. 
-+
-+  Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys).
-+
-+  When the user needs to change his passphrase he can do it directly from his workstation by changing 
-+  his own key set lock passphrase, and all servers are automatically aware.
-+ 
-+  With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself
-+  so he can add/modify/delete himself his public key when needed.
-+
-+\xAD FLAWS :
-+  LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP 
-+  allow write to users dn, somebody could replace someuser's public key by its own and impersonate some 
-+  of your users in all your server farm be VERY CAREFUL.
-+  
-+  MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login 
-+  as the impersonnated user.
-+
-+  If LDAP server is down then, fallback on passwd auth.
-+  
-+  the ldap code part has not been well audited yet.
-+
-+- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif)
-+    --- CUT HERE ---
-+    dn: uid=jdoe,ou=users,dc=foobar,dc=net
-+    objectclass: top
-+    objectclass: person
-+    objectclass: organizationalPerson
-+    objectclass: posixAccount
-+    objectclass: ldapPublicKey
-+    description: My account
-+    cn: John Doe
-+    sn: John Doe
-+    uid: jdoe
-+    uidNumber: 100
-+    gidNumber: 100
-+    homeDirectory: /home/jdoe
-+    sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB....
-+    [...]
-+    --- CUT HERE ---
-+
-+- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif)
-+    --- CUT HERE ---
-+    dn: cn=unix,ou=groups,dc=cuckoos,dc=net
-+    objectclass: top
-+    objectclass: posixGroup
-+    description: Unix based servers group
-+    cn: unix
-+    gidNumber: 1002
-+    memberUid: jdoe
-+    memberUid: user1
-+    memberUid: user2
-+    [...]
-+    --- CUT HERE ---
-+
-+>> FYI: << 
-+Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry
-+
-+- COMPILING:
-+  1. Apply the patch
-+  2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes
-+  3. make
-+  4. it's done.
-+
-+- BLA :
-+  I hope this could help, and i hope to be clear enough,, or give ideas.  questions/comments/improvements are welcome.
-+  
-+- TODO :
-+  Redesign differently.
-+
-+- DOCS/LINK :
-+  http://pacsec.jp/core05/psj05-barisani-en.pdf
-+  http://fritz.potsdam.edu/projects/openssh-lpk/
-+  http://fritz.potsdam.edu/projects/sshgate/
-+  http://dev.inversepath.com/trac/openssh-lpk
-+  http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm )
-+
-+- CONTRIBUTORS/IDEAS/GREETS :
-+  - Falk Siemonsmeier.
-+  - Jacob Rief.
-+  - Michael Durchgraf.
-+  - frederic peters.
-+  - Finlay dobbie.
-+  - Stefan Fisher.
-+  - Robin H. Johnson.
-+  - Adrian Bridgett.
-+
-+- CONTACT :
-+  - Eric AUGE <eau at phear.org>
-+  - Andrea Barisani <andrea at inversepath.com>
-diff --git a/auth-rsa.c b/auth-rsa.c
-index 65571a8..107fcaf 100644
---- a/auth-rsa.c
-+++ b/auth-rsa.c
-@@ -177,10 +177,96 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
- 	FILE *f;
- 	u_long linenum = 0;
- 	Key *key;
-+#ifdef WITH_LDAP_PUBKEY
-+	ldap_key_t * k;
-+	unsigned int i = 0;
-+#endif
- 
- 	/* Temporarily use the user's uid. */
- 	temporarily_use_uid(pw);
- 
-+#ifdef WITH_LDAP_PUBKEY
-+	/* here is the job */
-+	key = key_new(KEY_RSA1);
-+
-+	if (options.lpk.on) {
-+	    debug("[LDAP] trying LDAP first uid=%s", pw->pw_name);
-+	    if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) {
-+		if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
-+		    for (i = 0 ; i < k->num ; i++) {
-+			char *cp, *options = NULL;
-+
-+			for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
-+			    ;
-+			if (!*cp || *cp == '\n' || *cp == '#')
-+			    continue;
-+
-+			/*
-+			* Check if there are options for this key, and if so,
-+			* save their starting address and skip the option part
-+			* for now.  If there are no options, set the starting
-+			* address to NULL.
-+			 */
-+			if (*cp < '0' || *cp > '9') {
-+			    int quoted = 0;
-+			    options = cp;
-+			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
-+				if (*cp == '\\' && cp[1] == '"')
-+				    cp++;	/* Skip both */
-+				else if (*cp == '"')
-+				    quoted = !quoted;
-+			    }
-+			} else
-+			    options = NULL;
-+
-+			/* Parse the key from the line. */
-+			if (hostfile_read_key(&cp, &bits, key) == 0) {
-+			    debug("[LDAP] line %d: non ssh1 key syntax", i);
-+			    continue;
-+			}
-+			/* cp now points to the comment part. */
-+
-+			/* Check if the we have found the desired key (identified by its modulus). */
-+			if (BN_cmp(key->rsa->n, client_n) != 0)
-+			    continue;
-+
-+			/* check the real bits  */
-+			if (bits != (unsigned int)BN_num_bits(key->rsa->n))
-+			    logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: "
-+				    "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits);
-+
-+			/* We have found the desired key. */
-+			/*
-+			* If our options do not allow this key to be used,
-+			* do not send challenge.
-+			 */
-+			if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i))
-+			    continue;
-+
-+			/* break out, this key is allowed */
-+			allowed = 1;
-+
-+			/* add the return stuff etc... */
-+			/* Restore the privileged uid. */
-+			restore_uid();
-+
-+			/* return key if allowed */
-+			if (allowed && rkey != NULL)
-+			    *rkey = key;
-+			else
-+			    key_free(key);
-+
-+			ldap_keys_free(k);
-+			return (allowed);
-+		    }
-+		} else {
-+		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
-+		}
-+	    } else {
-+		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
-+	    }
-+	}
-+#endif
- 	/* The authorized keys. */
- 	file = authorized_keys_file(pw);
- 	debug("trying public RSA key file %s", file);
-diff --git a/auth2-pubkey.c b/auth2-pubkey.c
-index 51aa774..7a3a27b 100644
---- a/auth2-pubkey.c
-+++ b/auth2-pubkey.c
-@@ -58,6 +58,10 @@
- #include "misc.h"
- #include "authfile.h"
- 
-+#ifdef WITH_LDAP_PUBKEY
-+#include "ldapauth.h"
-+#endif
-+
- /* import */
- extern ServerOptions options;
- extern u_char *session_id2;
-@@ -187,10 +191,79 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
- 	u_long linenum = 0;
- 	Key *found;
- 	char *fp;
-+#ifdef WITH_LDAP_PUBKEY
-+	ldap_key_t * k;
-+	unsigned int i = 0;
-+#endif
- 
- 	/* Temporarily use the user's uid. */
- 	temporarily_use_uid(pw);
- 
-+#ifdef WITH_LDAP_PUBKEY
-+ 	found_key = 0;
-+ 	/* allocate a new key type */
-+ 	found = key_new(key->type);
-+ 
-+ 	/* first check if the options is enabled, then try.. */
-+	if (options.lpk.on) {
-+	    debug("[LDAP] trying LDAP first uid=%s",pw->pw_name);
-+	    if (ldap_ismember(&options.lpk, pw->pw_name) > 0) {
-+		if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) {
-+		    /* Skip leading whitespace, empty and comment lines. */
-+		    for (i = 0 ; i < k->num ; i++) {
-+			/* dont forget if multiple keys to reset options */
-+			char *cp, *options = NULL;
-+
-+			for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++)
-+			    ;
-+			if (!*cp || *cp == '\n' || *cp == '#')
-+			    continue;
-+
-+			if (key_read(found, &cp) != 1) {
-+			    /* no key?  check if there are options for this key */
-+			    int quoted = 0;
-+			    debug2("[LDAP] user_key_allowed: check options: '%s'", cp);
-+			    options = cp;
-+			    for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
-+				if (*cp == '\\' && cp[1] == '"')
-+				    cp++;	/* Skip both */
-+				else if (*cp == '"')
-+				    quoted = !quoted;
-+			    }
-+			    /* Skip remaining whitespace. */
-+			    for (; *cp == ' ' || *cp == '\t'; cp++)
-+				;
-+			    if (key_read(found, &cp) != 1) {
-+				debug2("[LDAP] user_key_allowed: advance: '%s'", cp);
-+				/* still no key?  advance to next line*/
-+				continue;
-+			    }
-+			}
-+
-+			if (key_equal(found, key) &&
-+				auth_parse_options(pw, options, file, linenum) == 1) {
-+			    found_key = 1;
-+			    debug("[LDAP] matching key found");
-+			    fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
-+			    verbose("[LDAP] Found matching %s key: %s", key_type(found), fp);
-+
-+			    /* restoring memory */
-+			    ldap_keys_free(k);
-+			    xfree(fp);
-+			    restore_uid();
-+			    key_free(found);
-+			    return found_key;
-+			    break;
-+			}
-+		    }/* end of LDAP for() */
-+		} else {
-+		    logit("[LDAP] no keys found for '%s'!", pw->pw_name);
-+		}
-+	    } else {
-+		logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup);
-+	    }
-+	}
-+#endif
- 	debug("trying public key file %s", file);
- 	f = auth_openkeyfile(file, pw, options.strict_modes);
- 
-diff --git a/config.h.in b/config.h.in
-index a61dec6..eba6884 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -575,6 +575,9 @@
- /* Define to 1 if you have the <linux/if_tun.h> header file. */
- #undef HAVE_LINUX_IF_TUN_H
- 
-+/* Define if you want LDAP support */
-+#undef WITH_LDAP_PUBKEY
-+
- /* Define if your libraries define login() */
- #undef HAVE_LOGIN
- 
-diff --git a/configure b/configure
-index 7c19fc2..8ebf2e1 100755
---- a/configure
-+++ b/configure
-@@ -1340,6 +1340,7 @@ Optional Packages:
-   --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
-   --with-libedit[=PATH]   Enable libedit support for sftp
-   --with-audit=module     Enable EXPERIMENTAL audit support (modules=debug,bsm)
-+  --with-ldap[=PATH]      Enable LDAP pubkey support (optionally in PATH)
-   --with-ssl-dir=PATH     Specify path to OpenSSL installation
-   --without-openssl-header-check Disable OpenSSL version consistency check
-   --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
-@@ -12845,6 +12846,85 @@ echo "$as_me: error: Unknown audit module $withval" >&2;}
- fi
- 
- 
-+# Check whether user wants LDAP support
-+LDAP_MSG="no"
-+
-+# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then
-+  withval=$with_ldap;
-+		if test "x$withval" != "xno" ; then
-+
-+			if test "x$withval" != "xyes" ; then
-+				CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+				LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			fi
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITH_LDAP_PUBKEY 1
-+_ACEOF
-+
-+			LIBS="-lldap $LIBS"
-+			LDAP_MSG="yes"
-+
-+			{ echo "$as_me:$LINENO: checking for LDAP support" >&5
-+echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
-+			cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+				 #include <ldap.h>
-+int
-+main ()
-+{
-+(void)ldap_init(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+				    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+					{ { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5
-+echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+		fi
-+
-+
-+fi
-+
-+
- 
- 
- 
-@@ -30786,6 +30866,7 @@ echo "                   SELinux support: $SELINUX_MSG"
- echo "                 Smartcard support: $SCARD_MSG"
- echo "                     S/KEY support: $SKEY_MSG"
- echo "              TCP Wrappers support: $TCPW_MSG"
-+echo "                      LDAP support: $LDAP_MSG"
- echo "              MD5 password support: $MD5_MSG"
- echo "                   libedit support: $LIBEDIT_MSG"
- echo "  Solaris process contract support: $SPC_MSG"
-diff --git a/configure.ac b/configure.ac
-index a9960a7..d3d85ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1323,6 +1323,37 @@ AC_ARG_WITH(audit,
- 	esac ]
- )
- 
-+# Check whether user wants LDAP support
-+LDAP_MSG="no"
-+AC_ARG_WITH(ldap,
-+	[  --with-ldap[[=PATH]]      Enable LDAP pubkey support (optionally in PATH)],
-+	[
-+		if test "x$withval" != "xno" ; then
-+
-+			if test "x$withval" != "xyes" ; then
-+				CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+				LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			fi
-+
-+			AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support])
-+			LIBS="-lldap $LIBS"
-+			LDAP_MSG="yes"
-+	
-+			AC_MSG_CHECKING([for LDAP support])
-+			AC_TRY_COMPILE(
-+				[#include <sys/types.h>
-+				 #include <ldap.h>],
-+				[(void)ldap_init(0, 0);],
-+				[AC_MSG_RESULT(yes)],
-+				[
-+				    AC_MSG_RESULT(no) 
-+					AC_MSG_ERROR([** Incomplete or missing ldap libraries **])
-+				]
-+        	)
-+		fi
-+	]
-+)
-+
- dnl    Checks for library functions. Please keep in alphabetical order
- AC_CHECK_FUNCS( \
- 	arc4random \
-@@ -4185,6 +4216,7 @@ echo "                   SELinux support: $SELINUX_MSG"
- echo "                 Smartcard support: $SCARD_MSG"
- echo "                     S/KEY support: $SKEY_MSG"
- echo "              TCP Wrappers support: $TCPW_MSG"
-+echo "                      LDAP support: $LDAP_MSG"

@@ 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  Mon Sep 27 16:02:26 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 14:02:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[11058]
	csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2
Message-ID: <E1P0EHi-0007i0-5k@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11058
          http://gar.svn.sourceforge.net/gar/?rev=11058&view=rev
Author:   dmichelsen
Date:     2010-09-27 14:02:25 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
sasl-2.1.23-mGARv2: Some more adjustments, now waiting on 64 bit libkrb5.so

Modified Paths:
--------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile

Property Changed:
----------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/


Property changes on: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-27 13:19:58 UTC (rev 11057)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-27 14:02:25 UTC (rev 11058)
@@ -43,24 +43,30 @@
 UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # It is a long way to 64 bits...
-# BUILD64 = 1
+BUILD64 = 1
 
 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries
 # before the newly built ones.
+NOISALIST = 1
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 LD_OPTIONS =
 
+EXTRA_CFLAGS = -D__EXTENSIONS__
+
 BUILD_ENV = _REENTRANT=1
 
-EXTRA_LIBS += /opt/csw/bdb47/lib
-EXTRA_LIBS += /opt/csw/mysql5/lib
-EXTRA_LIBS += /opt/csw/postgresql/lib
+EXTRA_LIB += $(prefix)/bdb47/lib
+# EXTRA_LIB += $(prefix)/mysql5/lib
+# EXTRA_LIB += $(prefix)/postgresql/lib
 
-EXTRA_INC = /opt/csw/mysql5/include
+EXTRA_INC = /opt/csw/mysql5/include/mysql
+EXTRA_INC += /opt/csw/postgresql/include
 
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
+NODIRPATHS = --docdir
+
 # SASL configuration
 CONFIGURE_ARGS = $(DIRPATHS) 
 CONFIGURE_ARGS += --enable-shared
@@ -71,8 +77,11 @@
 CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
 CONFIGURE_ARGS += --with-ldap=$(prefix)
-CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5/ 
-CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql 
+# Autoconf tries to find the directory with the shared lib in it. Because of the
+# ISA suffix for 64 bit we must specify the exact library location and add
+# the include directories manually.
+CONFIGURE_ARGS += --with-mysql=$(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql)
+CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2
 CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 


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 Sep 27 18:44:12 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 16:44:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[11059] csw/mgar/pkg
Message-ID: <E1P0GoG-0003RZ-Tg@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11059
          http://gar.svn.sourceforge.net/gar/?rev=11059&view=rev
Author:   dmichelsen
Date:     2010-09-27 16:44:12 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
ss12u1f95rt: Initial commit

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


Property changes on: csw/mgar/pkg/ss12u1f95rt/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/ss12u1f95rt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ss12u1f95rt/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ss12u1f95rt/trunk/Makefile	2010-09-27 16:44:12 UTC (rev 11059)
@@ -0,0 +1,53 @@
+# $Id$
+GARNAME = ss12f95rt
+GARVERSION = 20100927
+CATEGORIES = lib
+
+DESCRIPTION = Sun Studio 12u1 Fortran 95 Runtime Libraries
+define BLURB
+endef
+
+MASTER_SITES = http://developers.sun.com/sunstudio/documentation/ss12u1/
+DISTFILES  = DistributionREADME.txt
+
+VENDOR_URL = http://developers.sun.com/sunstudio/documentation/ss12u1/DistributionREADME.txt
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+LICENSE = DistributionREADME.txt
+
+RUNTIME_DEP_PKGS_CSWss12f95rt = CSWsunmath
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+# SPROl90s: Solaris SPARC Fortran libraries, comprising:
+FLIBS-sparc  = libf77compat.so.1 libfai.so.3 libfai.so.2 libfai.so.1 libfai2.so.3 libfai2.so.2 libfai2.so.1
+FLIBS-sparc += libfmaxlai.so.1 libfmaxvai.so.1 libfminlai.so.1 libfminvai.so.1 libfprodai.so.1 libfsumai.so.1
+FLIBS-sparc += libfsu.so.1 libfui.so.2 libfui.so.1
+
+# These are ISA-specific. Do them later if needed.
+# FLIBS-sparc += libfai_isa.so.1 libfai2_isa.so.1
+# FLIBS-sparc += libfmaxlai_isa.so.1 libfmaxvai_isa.so.1 libfminlai_isa.so.1 libfminvai_isa.so.1 libfprodai_isa.so.1 libfsumai_isa.so.1
+
+# SPROl90s: Solaris x86 Fortran libraries, comprising:
+FLIBS-i386 = libfsu.so.1 libfui.so.2 libfui.so.1
+
+# This is a general lib needed, not Fortran-specific. May put this somewhere else??
+FLIBS-sparc += libm9x.so.0
+FLIBS-i386  += libm9x.so.0
+
+include gar/category.mk
+
+SRCDIR-sparcv9 = v9
+SRCDIR-amd64   = amd64
+
+install-custom:
+	ginstall -d $(DESTDIR)$(libdir)
+	$(foreach L,$(FLIBS-$(GARCH)),ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L;)
+	ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)
+	$(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)/$L; fi;)
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/ss12u1f95rt/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/ss12u1f95rt/trunk/checksums
===================================================================
--- csw/mgar/pkg/ss12u1f95rt/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ss12u1f95rt/trunk/checksums	2010-09-27 16:44:12 UTC (rev 11059)
@@ -0,0 +1 @@
+a0daabe51baebd3e990f0601b77e9a5b  DistributionREADME.txt


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 Sep 27 19:00:17 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 17:00:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[11060] csw/mgar/pkg/krb5-lib/trunk
Message-ID: <E1P0H3p-00039A-Ru@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11060
          http://gar.svn.sourceforge.net/gar/?rev=11060&view=rev
Author:   dmichelsen
Date:     2010-09-27 17:00:17 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
krb5-lib: Update to 1.8.3

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/checksums
    csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch

Added Paths:
-----------
    csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,5 +1,5 @@
 GARNAME = krb5
-GARVERSION = 1.7
+GARVERSION = 1.8.3
 CATEGORIES = server
 
 DESCRIPTION = MIT Kerberos 5
@@ -11,7 +11,7 @@
   Kerberos is available in many commercial products as well.
 endef
 
-MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/
+MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}')/
 DISTFILES  = $(GARNAME)-$(GARVERSION)-signed.tar
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -19,8 +19,9 @@
 
 PATCHFILES  = patch-man2html-perl.patch
 PATCHFILES += 0002-libintl-for-kproplog.patch
-PATCHFILES += 0003-local-libraries-first-when-linking.patch
+# PATCHFILES += 0003-local-libraries-first-when-linking.patch
 PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
+PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
 
 BUILD_DEP_PKGS = CSWtcl
 
@@ -38,10 +39,12 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
+NOISAEXEC = 1
+BUILD64 = 1
+
+# We turn off almost everything as we are just interested in the library.
+NODIRPATHS = --docdir
 CONFIGURE_ARGS  = $(DIRPATHS)
-ifeq ($(ISA),i386)
-CONFIGURE_ARGS += --with-tcl=$(prefix)
-endif
 # --enable-ipv6 is deprecated and autodetected
 #CONFIGURE_ARGS += --enable-ipv6
 CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm
@@ -49,7 +52,9 @@
 CONFIGURE_ARGS += --disable-static --disable-profiled
 CONFIGURE_ARGS += --without-ldap
 
-BUILD64 = 1
+CONFIGURE_ARGS-32 += --with-tcl=$(prefix)
+CONFIGURE_ARGS-64 += --without-tcl
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 
@@ -76,34 +81,10 @@
 CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__)
 #LDFLAGS := $(strip $(LDFLAGS))
 
-EXTRA_LINKER_FLAGS := $(LD_OPTIONS)
-LD_OPTIONS :=
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 post-extract-modulated:
 	@# TODO: Check signature
 	@cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -)
 	@$(MAKECOOKIE)
-
-post-merge:
-	ginstall -m 755 -d $(PKGROOT)$(datadir)/checkpkg/overrides
-	(echo "CSWkrb5lib: symbol-not-found"; \
-	 echo "CSWkrb5libdev: symbol-not-found sclient"; \
-	) > $(PKGROOT)$(datadir)/checkpkg/overrides/krb5_lib
-	@$(MAKECOOKIE)
-
-# Notes: Potential solutions for the overrides integration in GAR:
-#
-# OVERRIDES_CSWkrb5lib = a_name
-# OVERRIDES_CSWkrb5lib_a_name = symbol-not-found
-#
-# Or:
-#
-# define OVERRIDES_CSWkrb5lib
-# symbol-not-found
-# endef
-#
-# Note: In either case, the result content should be:
-#
-# CSWkrb5lib: symbol-not-found
-#
-# ...placed in /opt/csw/share/checkpkg/overrides/krb5_lib

Modified: csw/mgar/pkg/krb5-lib/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/checksums	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/checksums	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,5 +1 @@
-ddcb250250f96a457798b469b3a813e8  0002-libintl-for-kproplog.patch
-2f4671672bce98d1157b49ba7b6846c3  0003-local-libraries-first-when-linking.patch
-f0bec7c3f02810838559e1dd764b111e  0004-libkdb_ldap-isblank-define.patch
-9f7b3402b4731a7fa543db193bf1b564  krb5-1.7-signed.tar
-6c2c7718f024c85f66fdc26398090c23  patch-man2html-perl.patch
+7c5f38e31ee744cb538eed2301096b93  krb5-1.8.3-signed.tar

Modified: csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch	2010-09-27 16:44:12 UTC (rev 11059)
+++ csw/mgar/pkg/krb5-lib/trunk/files/0002-libintl-for-kproplog.patch	2010-09-27 17:00:17 UTC (rev 11060)
@@ -1,18 +1,18 @@
-From 7aa639db0238c894c12d8d9728e684b3ddbdc5dc Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Fri, 5 Feb 2010 10:31:20 +0100
-Subject: [PATCH 2/4] libintl for kproplog
+From 94e59f7701fdf0e2b93796f16864aadaaaa14669 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Aug 2010 12:34:41 +0200
+Subject: [PATCH] libintl for kproplog
 
 ---
  src/slave/Makefile.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
-index 6ff3c71..31f6844 100644
+index 20bef7c..a9e1988 100644
 --- a/src/slave/Makefile.in
 +++ b/src/slave/Makefile.in
-@@ -27,7 +27,7 @@ kpropd: $(SERVEROBJS) $(KADMCLNT_DEPLIBS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) $(
- 	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KADMCLNT_LIBS) $(KDB5_LIB) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@
+@@ -25,7 +25,7 @@ kpropd: $(SERVEROBJS) $(KDB5_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(
+ 	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KDB5_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@
  
  kproplog: $(LOGOBJS)
 -	$(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
@@ -21,5 +21,5 @@
  install::
  	for f in kprop kpropd kproplog; do \
 -- 
-1.6.6
+1.7.1
 

Copied: csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch (from rev 11055, csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch)
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch	                        (rev 0)
+++ csw/mgar/pkg/krb5-lib/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch	2010-09-27 17:00:17 UTC (rev 11060)
@@ -0,0 +1,24 @@
+From 2827729c42021ec00658d7836e981e4b02f837be Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Aug 2010 00:10:24 +0200
+Subject: [PATCH] Add strings.h to setenv.c for strlen and other stuff
+
+---
+ src/clients/ksu/setenv.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/clients/ksu/setenv.c b/src/clients/ksu/setenv.c
+index 6e8710d..9658ee7 100644
+--- a/src/clients/ksu/setenv.c
++++ b/src/clients/ksu/setenv.c
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <strings.h>
+ #include "autoconf.h"
+ 
+ static char *_findenv(char *, int *);
+-- 
+1.7.1
+


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

From dmichelsen at users.sourceforge.net  Mon Sep 27 20:39:39 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 27 Sep 2010 18:39:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[11061]
	csw/mgar/pkg/autoconf/trunk/Makefile
Message-ID: <E1P0Ibz-0006Bm-CY@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11061
          http://gar.svn.sourceforge.net/gar/?rev=11061&view=rev
Author:   dmichelsen
Date:     2010-09-27 18:39:39 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
autoconf: Add buildtime dependency to Sun Studio 12 Runtime for Fortran 95

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

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2010-09-27 17:00:17 UTC (rev 11060)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2010-09-27 18:39:39 UTC (rev 11061)
@@ -18,6 +18,10 @@
 PATCHFILES = 0001-Prefer-CSW-tools.patch
 
 BUILD_DEP_PKGS = CSWhelp2man
+
+# We need the Fortran runtime libs or the Fortran tests with fail
+BUILD_DEP_PKGS += CSWss12f95rt
+
 RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl
 
 VENDOR_URL = http://www.gnu.org/software/autoconf/


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 Sep 28 10:42:28 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 08:42:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[11062]
 csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ Makefile
Message-ID: <E1P0Vlc-0003qJ-76@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11062
          http://gar.svn.sourceforge.net/gar/?rev=11062&view=rev
Author:   dmichelsen
Date:     2010-09-28 08:42:27 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
sasl-2.1.23-mGARv2: Adjust flags

Modified Paths:
--------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile

Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-27 18:39:39 UTC (rev 11061)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-28 08:42:27 UTC (rev 11062)
@@ -12,9 +12,8 @@
 endef
 
 MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
-WORKSRC = $(WORKDIR)/cyrus-$(GARNAME)-$(GARVERSION)
-
-DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz
+DISTNAME = cyrus-$(GARNAME)-$(GARVERSION)
+DISTFILES = $(DISTNAME).tar.gz
 DISTFILES += cswsaslauthd.init saslauthd.init.CSW
 DISTFILES += README.sasl README.saslauthd
 
@@ -29,11 +28,14 @@
 CATALOGNAME_CSWsaslgssapi = sasl_gssapi
 CATALOGNAME_CSWsaslsql = sasl_sql
 
-RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt CSWbdb47
+RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt CSWbdb47 CSWoldaprt CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite
 
+CHECKPKG_OVERRIDES_CSWsaslgssapi += surplus-dependency|CSWsasl
+CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl
+
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
 SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon
 SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding
@@ -42,22 +44,11 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# It is a long way to 64 bits...
-BUILD64 = 1
-
-# Do not use LD_OPTIONS as it breaks tests by using the installed libraries
-# before the newly built ones.
-NOISALIST = 1
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-LD_OPTIONS =
-
 EXTRA_CFLAGS = -D__EXTENSIONS__
 
 BUILD_ENV = _REENTRANT=1
 
-EXTRA_LIB += $(prefix)/bdb47/lib
-# EXTRA_LIB += $(prefix)/mysql5/lib
-# EXTRA_LIB += $(prefix)/postgresql/lib
+EXTRA_LIB = $(prefix)/bdb47/lib
 
 EXTRA_INC = /opt/csw/mysql5/include/mysql
 EXTRA_INC += /opt/csw/postgresql/include
@@ -65,6 +56,14 @@
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
+# Do not use LD_OPTIONS as it breaks tests by using the installed libraries
+# before the newly built ones.
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+LD_OPTIONS =
+
+BUILD64 = 1
+NOISALIST = 1
+
 NODIRPATHS = --docdir
 
 # SASL configuration
@@ -76,13 +75,13 @@
 CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ 
 CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
-CONFIGURE_ARGS += --with-ldap=$(prefix)
+CONFIGURE_ARGS += --with-ldap=$(libdir)
 # Autoconf tries to find the directory with the shared lib in it. Because of the
 # ISA suffix for 64 bit we must specify the exact library location and add
 # the include directories manually.
 CONFIGURE_ARGS += --with-mysql=$(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql)
 CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += --with-openssl=$(prefix)
+CONFIGURE_ARGS += --with-openssl=$(libdir)
 CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2
 CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 
 CONFIGURE_ARGS += --enable-login


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 Sep 28 12:41:16 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 10:41:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[11063]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: <E1P0Xca-0004VE-V1@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11063
          http://gar.svn.sourceforge.net/gar/?rev=11063&view=rev
Author:   dmichelsen
Date:     2010-09-28 10:41:16 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
openldap: Restructure module building due to bug in handling back_perl, make sure libldap is correctly bound as documented in #4555

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2010-09-28 08:42:27 UTC (rev 11062)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2010-09-28 10:41:16 UTC (rev 11063)
@@ -68,6 +68,14 @@
 
 MIGRATECONF = openldap
 
+# Is this causing this?
+#   https://www.opencsw.org/mantis/view.php?id=4555
+NOISALIST = 1
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
+NODIRPATHS = --docdir
+
 BUILD64 = 1
 NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -76,21 +84,29 @@
 CONFIGURE_ARGS += --enable-modules
 CONFIGURE_ARGS += --enable-rlookups
 CONFIGURE_ARGS += --enable-slp
+CONFIGURE_ARGS += --enable-backends=mod
+CONFIGURE_ARGS += --enable-overlays=mod
+
+# Disable MySQL Cluster
+CONFIGURE_ARGS += --disable-ndb
+
 # Disable TCPwrappers in 64 bit until the libraries are available
 #   <http://opencsw.org/mantis/view.php?id=3748>
 CONFIGURE_ARGS_32 = --enable-wrappers
 # spasswd requires Cyrus SASL
 CONFIGURE_ARGS_32 += --enable-spasswd
+
 # Disable Cyrus SASL in 64 bit until the libraries are available
 #   <http://opencsw.org/mantis/view.php?id=3749>
 CONFIGURE_ARGS_64 += --without-cyrus-sasl
+
+# We have Perl only for 32 bit:
+#   <http://opencsw.org/mantis/view.php?id=4484>
+CONFIGURE_ARGS_32 += --enable-perl=mod
+CONFIGURE_ARGS_64 += --enable-perl=no
+
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
-CONFIGURE_ARGS += --enable-backends=mod
-CONFIGURE_ARGS += --enable-overlays=mod
 
-# Disable MySQL Cluster
-CONFIGURE_ARGS += --disable-ndb
-
 SKIPTEST ?= 1
 TEST_TARGET = check
 
@@ -103,6 +119,10 @@
 MERGE_SCRIPTS_isa-default64-garversion-2.4.22 = copy-relocated-only
 MERGE_DIRS_isa-default64-garversion-2.4.22 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
+# Perl backend is built, although it has been told not to.
+EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
+EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
+
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -119,9 +139,6 @@
 ARCHALL_CSWoldapdevel = 1
 CHECKPKG_OVERRIDES_CSWoldapdevel += archall-devel-package
 
-# override because checking an amd binary on i386 is pointless
-CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2|is|needed|by|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.5
-
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))


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

From dmichelsen at users.sourceforge.net  Tue Sep 28 14:03:51 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 12:03:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[11064] csw/mgar/pkg/ftgl/trunk
Message-ID: <E1P0YuV-0007vZ-OU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11064
          http://gar.svn.sourceforge.net/gar/?rev=11064&view=rev
Author:   dmichelsen
Date:     2010-09-28 12:03:51 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
ftgl: Add patches and compiler directives

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

Added Paths:
-----------
    csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch
    csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
    csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch
    csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 10:41:16 UTC (rev 11063)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 12:03:51 UTC (rev 11064)
@@ -1,5 +1,7 @@
 GARNAME = ftgl
-GARVERSION = 2.1.3-rc5
+GARVERSION = 2.1.3rc5
+FILEVERSION = 2.1.3-rc5
+DISTVERSION = 2.1.3~rc5
 CATEGORIES = lib
 
 DESCRIPTION = Library that uses Freetype2 to simplify rendering fonts in OpenGL applications
@@ -7,28 +9,45 @@
 endef
 
 MASTER_SITES = $(SF_MIRROR)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES  = $(GARNAME)-$(FILEVERSION).tar.bz2
+DISTNAME = $(GARNAME)-$(DISTVERSION)
 
+PATCHFILES  = 0001-Do-not-use-gcc-specific-flags.patch 
+PATCHFILES += 0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
+PATCHFILES += 0003-Force-GNU-sed-when-using-i.patch
+PATCHFILES += 0004-Keep-libtool-from-stripping-norunpath-during-linking.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-WORKSRC = $(WORKDIR)/$(GARNAME)-2.1.3~rc5
+PACKAGES = CSWftgl CSWftgldevel
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+CATALOGNAME_CSWftgl = ftgl
+CATALOGNAME_CSWftgldevel = ftgl_devel
 
+SPKG_DESC_CSWftgl = $(DESCRIPTION)
+SPKG_DESC_CSWftgldevel = FTGL Development Files
+
+DEP_PKGS_CSWftgl = CSWmesa CSWzlib CSWftype2
+RUNTIME_DEP_PKGS_CSWftgldevel = CSWftgl
+CHECKPKG_OVERRIDES_CSWftgldevel = surplus-dependency|CSWftgl
+
+PKGFILES_CSWftgl = $(PKGFILES_RT)
+
 NOISAEXEC = 1
 NOISALIST = 1
-BUILD64 = 1
 
-# Remove after rebuild of CSWmesa against OpenCSW X11
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so.0
+# First we need CSWfreeglut in 64 bit
+# BUILD64 = 1
 
+# Needed for __func__ used in Patch 0002
+EXTRA_CXXFLAGS = -features=extensions -norunpath
+EXTRA_LDFLAGS = -lm
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-gl-inc=$(includedir)
 CONFIGURE_ARGS += --with-gl-lib=$(libdir)
+CONFIGURE_ARGS += --with-glut-inc=$(includedir)
+CONFIGURE_ARGS += --with-glut-lib=$(libdir)
 
 include gar/category.mk

Added: csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,27 @@
+From 32ffda7617d493a749b236f946fa1e4c2cc56537 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 12:26:53 +0200
+Subject: [PATCH] Do not use gcc-specific flags
+
+---
+ configure |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index bcaecab..bc3efc2 100755
+--- a/configure
++++ b/configure
+@@ -23977,8 +23977,8 @@ fi
+ CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src"
+ 
+ # Warning flags
+-CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
+-CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
++#CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
++#CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+ 
+ # Build HTML documentatin?
+ # Extract the first word of "doxygen", so it can be a program name with args.
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,94 @@
+From 544ab77e5e33cd8c571b4d73900ff8d486f53ad9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 12:37:43 +0200
+Subject: [PATCH 2/2] Use Sun Studio __func__ instead of gcc __FUNCTION__
+
+---
+ src/FTFont/FTFontGlue.cpp     |    2 +-
+ src/FTGlyph/FTGlyphGlue.cpp   |    2 +-
+ src/FTLayout/FTLayoutGlue.cpp |   12 ++++++------
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/FTFont/FTFontGlue.cpp b/src/FTFont/FTFontGlue.cpp
+index b23e787..dfcacce 100644
+--- a/src/FTFont/FTFontGlue.cpp
++++ b/src/FTFont/FTFontGlue.cpp
+@@ -127,7 +127,7 @@ void ftglDestroyFont(FTGLfont *f)
+ {
+     if(!f || !f->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete f->ptr;
+diff --git a/src/FTGlyph/FTGlyphGlue.cpp b/src/FTGlyph/FTGlyphGlue.cpp
+index 0fbbc01..dcc90a1 100644
+--- a/src/FTGlyph/FTGlyphGlue.cpp
++++ b/src/FTGlyph/FTGlyphGlue.cpp
+@@ -150,7 +150,7 @@ void ftglDestroyGlyph(FTGLglyph *g)
+ {
+     if(!g || !g->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete g->ptr;
+diff --git a/src/FTLayout/FTLayoutGlue.cpp b/src/FTLayout/FTLayoutGlue.cpp
+index 60f428d..651396f 100644
+--- a/src/FTLayout/FTLayoutGlue.cpp
++++ b/src/FTLayout/FTLayoutGlue.cpp
+@@ -67,7 +67,7 @@ void ftglDestroyLayout(FTGLlayout *l)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete l->ptr;
+@@ -100,13 +100,13 @@ void ftglSetLayoutFont(FTGLlayout *l, FTGLfont *font)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     if(l->type != FTGL::LAYOUT_SIMPLE)
+     {
+         fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+-                        __FUNCTION__, l->type);
++                        __func__, l->type);
+     }
+     l->font = font;
+     return dynamic_cast<FTSimpleLayout*>(l->ptr)->SetFont(font->ptr);
+@@ -117,13 +117,13 @@ FTGLfont *ftglGetLayoutFont(FTGLlayout *l)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return NULL;
+     }
+     if(l->type != FTGL::LAYOUT_SIMPLE)
+     {
+         fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+-                        __FUNCTION__, l->type);
++                        __func__, l->type);
+     }
+     return l->font;
+ }
+@@ -141,7 +141,7 @@ FTGLfont *ftglGetLayoutFont(FTGLlayout *l)
+         if(l->type != FTGL::LAYOUT_SIMPLE) \
+         { \
+             fprintf(stderr, "FTGL warning: %s not implemented for %d\n", \
+-                            __FUNCTION__, l->type); \
++                            __func__, l->type); \
+             cxxerr; \
+         } \
+         return dynamic_cast<FTSimpleLayout*>(l->ptr)->cxxname cxxarg; \
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,25 @@
+From 2302430dbe3c40beb52c30b62dfe999f61e76d4d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 13:07:12 +0200
+Subject: [PATCH 3/3] Force GNU sed when using -i
+
+---
+ docs/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 2deabd6..1e52bae 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -455,7 +455,7 @@ stamp-eps: $(PNGS)
+ html/doxygen.css: stamp-doxygen
+ stamp-doxygen: doxygen.cfg stamp-eps
+ 	$(DOXYGEN) $^
+-	sed -i 's/%FTGL/FTGL/' html/*html
++	gsed -i 's/%FTGL/FTGL/' html/*html
+ 	touch $@
+ 
+ latex/ftgl.pdf: stamp-latex
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,25 @@
+From 69188e3dd08b92b9447ceb4f4dd4eb6a768b707f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 13:54:31 +0200
+Subject: [PATCH 4/4] Keep libtool from stripping -norunpath during linking
+
+---
+ .auto/ltmain.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/.auto/ltmain.sh b/.auto/ltmain.sh
+index 0bf3848..bda2ca2 100644
+--- a/.auto/ltmain.sh
++++ b/.auto/ltmain.sh
+@@ -1676,7 +1676,7 @@ EOF
+       # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+-- 
+1.7.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  Tue Sep 28 14:18:50 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 12:18:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[11065] csw/mgar/pkg/freeglut/trunk
Message-ID: <E1P0Z90-0001H9-9g@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 11065
          http://gar.svn.sourceforge.net/gar/?rev=11065&view=rev
Author:   dmichelsen
Date:     2010-09-28 12:18:50 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
freeglut: Use SUNW x11 again and add more patches

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

Added Paths:
-----------
    csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:03:51 UTC (rev 11064)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:18:50 UTC (rev 11065)
@@ -8,8 +8,10 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Add-support-for-Sun.patch
 
+PATCHFILES  = 0001-Add-support-for-Sun.patch
+PATCHFILES += 0002-Fix-windows-line-ending-and-wrong-endif.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -17,23 +19,13 @@
 
 DEP_PKGS = CSWmesa
 
-# If we put the include into CPPFLAGS it is too ear\xC3ly in the commandline
+# If we put the include into CPPFLAGS it is too early in the commandline
 # and the installed headers take precedence over the newly built.
 CPPFLAGS =
-EXTRA_CFLAGS = -I/opt/csw/include
+EXTRA_CFLAGS = -I/opt/csw/include -DSUN_OGL_NO_VERTEX_MACROS
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
-# Drop after CSWmesa has been rebuild against CSW X11
-# Drats, doesn't work here. Wait for CSWmesa
-# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
-
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/freeglut/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeglut/trunk/checksums	2010-09-28 12:03:51 UTC (rev 11064)
+++ csw/mgar/pkg/freeglut/trunk/checksums	2010-09-28 12:18:50 UTC (rev 11065)
@@ -1,2 +1 @@
-9fc7b274d0c43a9312f19c5d2aee73d9  0001-Add-support-for-Sun.patch
 39f0f2de89f399529d2b981188082218  freeglut-2.6.0.tar.gz

Added: csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch
===================================================================
--- csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch	                        (rev 0)
+++ csw/mgar/pkg/freeglut/trunk/files/0002-Fix-windows-line-ending-and-wrong-endif.patch	2010-09-28 12:18:50 UTC (rev 11065)
@@ -0,0 +1,74 @@
+From 92b7f7a86d9fa0a356c57087b944d37ee24a0231 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 14:08:03 +0200
+Subject: [PATCH 2/2] Fix windows line ending and wrong endif
+
+---
+ progs/demos/smooth_opengl3/smooth_opengl3.c |   44 +++++++++++++--------------
+ 1 files changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
+index a36f090..8784759 100755
+--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
++++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
+@@ -93,8 +93,7 @@ void checkError(const char *functionName)
+ 
+ typedef ptrdiff_t ourGLsizeiptr;
+ typedef char ourGLchar;
+-
+-#if defined(WIN32)
++
+ #ifndef APIENTRY
+ #define APIENTRY
+ #endif
+@@ -118,27 +117,26 @@ typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size,
+ typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+ typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
+ typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+-#endif  /* defined(WIN32) */
+-
+-PFNGLGENBUFFERSPROC gl_GenBuffers;
+-PFNGLBINDBUFFERPROC gl_BindBuffer;
+-PFNGLBUFFERDATAPROC gl_BufferData;
+-PFNGLCREATESHADERPROC gl_CreateShader;
+-PFNGLSHADERSOURCEPROC gl_ShaderSource;
+-PFNGLCOMPILESHADERPROC gl_CompileShader;
+-PFNGLCREATEPROGRAMPROC gl_CreateProgram;
+-PFNGLATTACHSHADERPROC gl_AttachShader;
+-PFNGLLINKPROGRAMPROC gl_LinkProgram;
+-PFNGLUSEPROGRAMPROC gl_UseProgram;
+-PFNGLGETSHADERIVPROC gl_GetShaderiv;
+-PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
+-PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
+-PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
+-PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
+-PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
+-PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
+-PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
+-PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
++
++PFNGLGENBUFFERSPROC gl_GenBuffers;
++PFNGLBINDBUFFERPROC gl_BindBuffer;
++PFNGLBUFFERDATAPROC gl_BufferData;
++PFNGLCREATESHADERPROC gl_CreateShader;
++PFNGLSHADERSOURCEPROC gl_ShaderSource;
++PFNGLCOMPILESHADERPROC gl_CompileShader;
++PFNGLCREATEPROGRAMPROC gl_CreateProgram;
++PFNGLATTACHSHADERPROC gl_AttachShader;
++PFNGLLINKPROGRAMPROC gl_LinkProgram;
++PFNGLUSEPROGRAMPROC gl_UseProgram;
++PFNGLGETSHADERIVPROC gl_GetShaderiv;
++PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
++PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
++PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
++PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
++PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
++PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
++PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
++PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
+ 
+ void initExtensionEntries(void) 
+ {
+-- 
+1.7.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  Tue Sep 28 14:26:03 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 12:26:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[11066]
	csw/mgar/pkg/freeglut/trunk/Makefile
Message-ID: <E1P0ZFz-00040O-Jx@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11066
          http://gar.svn.sourceforge.net/gar/?rev=11066&view=rev
Author:   dmichelsen
Date:     2010-09-28 12:26:03 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
freeglut: Add the usual amd64 override

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

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:18:50 UTC (rev 11065)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-28 12:26:03 UTC (rev 11066)
@@ -29,4 +29,7 @@
 
 TEST_TARGET = check
 
+# No 64 bit libs on Solaris 9 x86
+CHECKPKG_OVERRIDES_CSWfreeglut += soname-not-found|libXxf86vm.so.1|is|needed|by|opt/csw/lib/amd64/libglut.so.3.9.0
+
 include gar/category.mk


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

From janholzh at users.sourceforge.net  Tue Sep 28 15:04:40 2010
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Tue, 28 Sep 2010 13:04:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[11067] csw/mgar/pkg/transmission/trunk
Message-ID: <E1P0ZrM-0008Bz-6d@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11067
          http://gar.svn.sourceforge.net/gar/?rev=11067&view=rev
Author:   janholzh
Date:     2010-09-28 13:04:39 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
transmission: Update to 2.0.4 remove ccsw x11 stuff fix build

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

Added Paths:
-----------
    csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch

Removed Paths:
-------------
    csw/mgar/pkg/transmission/trunk/files/linker-include.patch

Modified: csw/mgar/pkg/transmission/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transmission/trunk/Makefile	2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/Makefile	2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,5 +1,5 @@
 GARNAME = transmission
-GARVERSION = 1.93
+GARVERSION = 2.04
 CATEGORIES = net
 
 DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client
@@ -8,7 +8,7 @@
 MASTER_SITES = http://mirrors.m0k.org/transmission/files/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 PATCHFILES = icons-makefile.patch
-#PATCHFILES += linker-include.patch
+PATCHFILES += 0002-add-setenv-patch.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
@@ -29,21 +29,24 @@
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibcairo
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibdbus
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibevent
-#RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibxext
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWpango
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWzlib
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWdbus
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWgconf2
+RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWiconv
 
+
 RUNTIME_DEP_PKGS_CSWtransmission = CSWcurlrt
 RUNTIME_DEP_PKGS_CSWtransmission += CSWlibevent
 RUNTIME_DEP_PKGS_CSWtransmission += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWtransmission += CSWosslrt
 RUNTIME_DEP_PKGS_CSWtransmission += CSWzlib
+RUNTIME_DEP_PKGS_CSWtransmission += CSWiconv
 
 
 
+
 RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWtransmission
 
 PKGFILES_CSWtransmission  = /opt/csw/bin/transmissioncli
@@ -56,14 +59,16 @@
 CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2
 
 
-EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv 
+#EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv 
+EXTRA_CFLAGS = -DNO_SYS_QUEUE_H
+EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv 
 
-EXTRA_INC = /opt/csw/X11/include
-EXTRA_LIB = /opt/csw/X11/lib 
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_INC = /opt/csw/X11/include
+#EXTRA_LIB = /opt/csw/X11/lib 
+#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
 CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk --disable-silent-rules
-STRIP_LIBTOOL = 1
+#STRIP_LIBTOOL = 1
 
 TEST_TARGET = check
 CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWtransmission

Modified: csw/mgar/pkg/transmission/trunk/checksums
===================================================================
--- csw/mgar/pkg/transmission/trunk/checksums	2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/checksums	2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,2 +1 @@
-cbdb5cfaf24b68727042c3828b252534  icons-makefile.patch
-f68358d03e46bec5704bbaa894990152  transmission-1.93.tar.bz2
+84fe15eb7e000fdc369def513299358b  transmission-2.04.tar.bz2

Added: csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch	                        (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch	2010-09-28 13:04:39 UTC (rev 11067)
@@ -0,0 +1,42 @@
+From 4164824ced3e17247d15bfeca890d127fc313d24 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Tue, 28 Sep 2010 13:57:15 +0200
+Subject: [PATCH] add setenv patch
+
+---
+ libtransmission/torrent.c |   18 ++++++++++++++++++
+ ltmain.sh                 |    2 +-
+ 2 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
+index ba9fc83..f6d45de 100644
+--- a/libtransmission/torrent.c
++++ b/libtransmission/torrent.c
+@@ -47,6 +47,24 @@
+ #include "verify.h"
+ #include "version.h"
+ 
++#ifdef __sun
++void setenv(char *n, char *v, int x) {
++  char buf[256];
++  snprintf(buf,sizeof(buf),"%s=%s",n,v);
++  putenv(buf);
++}
++
++void unsetenv(char *env_name) {
++  extern char **environ;
++  char **cc;
++  int l;
++  l=strlen(env_name);
++  for (cc=environ;*cc!=NULL;cc++) {
++    if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break;
++  } for (; *cc != NULL; cc++) *cc=cc[1];
++}
++#endif
++
+ /***
+ ****
+ ***/
+-- 
+1.7.3
+

Deleted: csw/mgar/pkg/transmission/trunk/files/linker-include.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/linker-include.patch	2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/files/linker-include.patch	2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,25 +0,0 @@
-From 84469352eccf90852d7d58241516619ad1545272 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at build8s.(none)>
-Date: Wed, 6 Jan 2010 15:28:43 +0100
-Subject: [PATCH] describe your change
-
----
- gtk/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gtk/Makefile.in b/gtk/Makefile.in
-index 81b4e46..0c145b8 100644
---- a/gtk/Makefile.in
-+++ b/gtk/Makefile.in
-@@ -88,7 +88,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
- am__v_lt_0 = --silent
- transmission_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(transmission_LDFLAGS) $(LDFLAGS) -o $@
-+	$(transmission_LDFLAGS) $(LDFLAGS) /usr/openwin/lib/libXext.so -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--- 
-1.6.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 Sep 28 15:31:17 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 13:31:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[11068]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0aH7-0005tk-Ga@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11068
          http://gar.svn.sourceforge.net/gar/?rev=11068&view=rev
Author:   bdwalton
Date:     2010-09-28 13:31:17 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: correct alternatives setup (thanks |woody|)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 13:04:39 UTC (rev 11067)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 13:31:17 UTC (rev 11068)
@@ -79,8 +79,8 @@
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
 ALTERNATIVES_CSWapache2 = prefork worker
-ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.prefork 100
-ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/apache2/sbin/httpd.worker 50
+ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100
+ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 50
 
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config


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

From dmichelsen at users.sourceforge.net  Tue Sep 28 15:35:15 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 13:35:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[11069] csw/mgar/pkg/ftgl/trunk/Makefile
Message-ID: <E1P0aKx-0000jU-K0@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11069
          http://gar.svn.sourceforge.net/gar/?rev=11069&view=rev
Author:   dmichelsen
Date:     2010-09-28 13:35:15 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
ftgl: Doesn't find libGL on Solaris 10, investigate later

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

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 13:31:17 UTC (rev 11068)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 13:35:15 UTC (rev 11069)
@@ -28,7 +28,8 @@
 SPKG_DESC_CSWftgl = $(DESCRIPTION)
 SPKG_DESC_CSWftgldevel = FTGL Development Files
 
-DEP_PKGS_CSWftgl = CSWmesa CSWzlib CSWftype2
+DEP_PKGS_CSWftgl = CSWmesa CSWzlib CSWftype2 CSWfreeglut
+CHECKPKG_OVERRIDES_CSWftgl = surplus-dependency|CSWfreeglut
 RUNTIME_DEP_PKGS_CSWftgldevel = CSWftgl
 CHECKPKG_OVERRIDES_CSWftgldevel = surplus-dependency|CSWftgl
 
@@ -36,15 +37,25 @@
 
 NOISAEXEC = 1
 NOISALIST = 1
+BUILD64 = 1
 
-# First we need CSWfreeglut in 64 bit
-# BUILD64 = 1
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 # Needed for __func__ used in Patch 0002
 EXTRA_CXXFLAGS = -features=extensions -norunpath
 EXTRA_LDFLAGS = -lm
+#EXTRA_LIB-5.10 = /usr/X11/lib
+#EXTRA_LIB = $(EXTRA_LIB-$(GAROSREL))
 
 CONFIGURE_ARGS = $(DIRPATHS)
+#CONFIGURE_ARGS += --x-includes=/usr/openwin/include
+#CONFIGURE_ARGS += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR))
+#CONFIGURE_ARGS-5.9 += --with-gl-inc=$(includedir)
+#CONFIGURE_ARGS-5.9 += --with-gl-lib=$(libdir)
+#CONFIGURE_ARGS-5.10 += --with-gl-inc=/usr/X11/include
+#CONFIGURE_ARGS-5.10 += --with-gl-lib=$(abspath /usr/X11/lib/$(MM_LIBDIR))
+#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
 CONFIGURE_ARGS += --with-gl-inc=$(includedir)
 CONFIGURE_ARGS += --with-gl-lib=$(libdir)
 CONFIGURE_ARGS += --with-glut-inc=$(includedir)


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 Sep 28 16:19:25 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 14:19:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[11070] csw/mgar/pkg
Message-ID: <E1P0b1h-0007Cn-4b@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11070
          http://gar.svn.sourceforge.net/gar/?rev=11070&view=rev
Author:   dmichelsen
Date:     2010-09-28 14:19:24 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
mcrypt: Rename from libmcrypt to match upstream name

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

Added Paths:
-----------
    csw/mgar/pkg/mcrypt/
    csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch

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

Modified: csw/mgar/pkg/mcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/Makefile	2009-12-07 09:20:11 UTC (rev 7572)
+++ csw/mgar/pkg/mcrypt/trunk/Makefile	2010-09-28 14:19:24 UTC (rev 11070)
@@ -1,5 +1,5 @@
-GARNAME = libmcrypt
-GARVERSION = 2.5.8
+GARNAME = mcrypt
+GARVERSION = 2.6.8
 CATEGORIES = lib
 
 DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes
@@ -11,14 +11,17 @@
 
 SF_PROJ = mcrypt
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES  = 0001-Do-not-use-Wall-on-Sun-Compiler.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 BUILD64 = 1
 NOISALIST = 1
 
+EXTRA_CPPFLAGS = -D__const=const
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dynamic-loading
 CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes

Modified: csw/mgar/pkg/mcrypt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/checksums	2009-12-07 09:20:11 UTC (rev 7572)
+++ csw/mgar/pkg/mcrypt/trunk/checksums	2010-09-28 14:19:24 UTC (rev 11070)
@@ -1 +1,2 @@
-c4f491dd411a09e9de3b8702ea6f73eb  libmcrypt-2.5.8.tar.bz2
+ea9996462d0eaa7fbc7a00f37e33f81b  0001-Do-not-use-Wall-on-Sun-Compiler.patch
+97639f8821b10f80943fa17da302607e  mcrypt-2.6.8.tar.gz

Added: csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch
===================================================================
--- csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch	                        (rev 0)
+++ csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch	2010-09-28 14:19:24 UTC (rev 11070)
@@ -0,0 +1,39 @@
+From e79f30991cc404eb768138b163d3bb2e03240413 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 26 Dec 2009 22:27:56 +0100
+Subject: [PATCH] Do not use Wall on Sun Compiler
+
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index e9109f0..9f1207b 100755
+--- a/configure
++++ b/configure
+@@ -14218,7 +14218,7 @@ fi
+ 
+ 
+ LIBS="${LIBS} ${LIBMCRYPT_LIBS}"
+-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall"
++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}"
+ 
+ 
+ { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+diff --git a/configure.in b/configure.in
+index 32512c8..d875c75 100644
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,7 @@ AM_GNU_GETTEXT([external])
+ *** in OpenPGP packets.))
+ 
+ LIBS="${LIBS} ${LIBMCRYPT_LIBS}"
+-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall"
++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}"
+ 
+ 
+ AC_C_CONST
+-- 
+1.6.5.1
+


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

From dmichelsen at users.sourceforge.net  Tue Sep 28 16:39:57 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 28 Sep 2010 14:39:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[11071] csw/mgar/pkg/libmcrypt/
Message-ID: <E1P0bLZ-0007mO-3u@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11071
          http://gar.svn.sourceforge.net/gar/?rev=11071&view=rev
Author:   dmichelsen
Date:     2010-09-28 14:39:56 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
libmcrypt: This *IS* different from mcrypt, reinstantiate

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


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 Sep 28 17:07:57 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 15:07:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[11072] csw/mgar/pkg/apache2/trunk/files
Message-ID: <E1P0bmf-0003em-Qs@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11072
          http://gar.svn.sourceforge.net/gar/?rev=11072&view=rev
Author:   bdwalton
Date:     2010-09-28 15:07:57 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: add some readme files

Added Paths:
-----------
    csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_prefork
    csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker
    csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2

Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_prefork
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_prefork	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_prefork	2010-09-28 15:07:57 UTC (rev 11072)
@@ -0,0 +1,8 @@
+Hello CSW User/Sysadmin,
+
+The package CSWap2prefork is now just a placeholder to ensure
+dependencies can be met with other packages.  It contains no useful
+files.
+
+Thanks
+-The OpenCSW apache2 team.

Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-09-28 15:07:57 UTC (rev 11072)
@@ -0,0 +1,8 @@
+Hello CSW User/Sysadmin,
+
+The package CSWap2worker is now just a placeholder to ensure
+dependencies can be met with other packages.  It contains no useful
+files.
+
+Thanks
+-The OpenCSW apache2 team.

Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2	2010-09-28 15:07:57 UTC (rev 11072)
@@ -0,0 +1,15 @@
+Hello CSW User/Sysadmin,
+
+Please note that some recent changes to packages may affect the way
+you're used to working with the CSW apache2 packages.
+
+In the past, CSWap2prefork and CSWap2worker delivered a specific mpm
+module for use with apache2.  We now ship both mpm modules as part of
+CSWapache2 and allow you to toggle between them using the alternatives
+support that recently materialized.  The default mpm is prefork.
+
+We still provide CSWap2prefork and CSWap2worker for the time being,
+but they're dummy packages used only to fill dependencies.
+
+Thanks
+-The OpenCSW apache2 team.


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 Sep 28 17:09:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 15:09:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[11073]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0bnv-00080V-Ja@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11073
          http://gar.svn.sourceforge.net/gar/?rev=11073&view=rev
Author:   bdwalton
Date:     2010-09-28 15:09:15 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: add ap2_{prefork,worker} as dummy packages with easy kill switch

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 15:07:57 UTC (rev 11072)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 15:09:15 UTC (rev 11073)
@@ -42,20 +42,39 @@
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec
 
+
+NEED_DUMMY_AP2 = 1
+
+ifeq ($(NEED_DUMMY_AP2), 1)
+# These packages are dummy versions to make dependencies nicer
+# as various things depend on CSWap2prefork currently
+PACKAGES += CSWap2prefork CSWap2worker
+endif
+
 ARCHALL_CSWapache2-manual = 1
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual
 CATALOGNAME_CSWap2suexec = ap2_suexec
+ifeq ($(NEED_DUMMY_AP2), 1)
+CATALOGNAME_CSWap2prefork = ap2_prefork
+CATALOGNAME_CSWap2worker = ap2_worker
+endif
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
+ifeq ($(NEED_DUMMY_AP2), 1)
+SPKG_DESC_CSWap2prefork = A dummy stub for the old prefork mpm package
+SPKG_DESC_CSWap2worker = A dummy stub for the old worker mpm package
+endif
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWap2worker CSWap2perfork
-INCOMPATIBLE_PKGS_CSWapache2 += CSWapache2c
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWapache2c
+ifneq ($(NEED_DUMMY_AP2), 1)
+INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWap2worker
+endif
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
@@ -63,11 +82,19 @@
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
+ifeq ($(NEED_DUMMY_AP2), 1)
+RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2
+endif
 
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
+ifeq ($(NEED_DUMMY_AP2), 1)
+CHECPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
+endif
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib


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 Sep 28 18:05:38 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 16:05:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[11074]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0cgU-0002MF-AA@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11074
          http://gar.svn.sourceforge.net/gar/?rev=11074&view=rev
Author:   bdwalton
Date:     2010-09-28 16:05:38 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: add README files documenting re-org

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 15:09:15 UTC (rev 11073)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:05:38 UTC (rev 11074)
@@ -36,6 +36,7 @@
 DISTFILES += httpd-mpm.conf.CSW
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
+DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork README.CSW.ap2_worker
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -163,6 +164,10 @@
 PKGFILES_CSWap2suexec = .*sbin/suexec .*libexecdir/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
+ifeq ($(NEED_DUMMY_AP2), 1)
+PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
+PKGFILES_CSWap2worker = .*share/doc/ap2_worker.*
+endif
 
 include gar/category.mk
 
@@ -178,8 +183,15 @@
 	@$(MAKECOOKIE)
 
 
-post-install-modulated: rename-httpd copy-local-files create-templates
+post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes
 
+copy-readmes:
+	@(cd $(WORKDIR); for f in README.CSW*; do \
+		p=`echo $$f | sed 's/README.CSW.//'`; \
+		ginstall -d -m0755 $(DESTDIR)/$(prefix)/share/doc/$$p; \
+		ginstall -m 0644 $$f $(DESTDIR)/$(prefix)/share/doc/$$p/README.CSW; \
+	done)
+
 rename-httpd:
 	@if test -f $(APACHE_ROOT)/sbin/httpd ; then \
 	    ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \


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 Sep 28 18:11:09 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 16:11:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[11075]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0clp-00020k-NY@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11075
          http://gar.svn.sourceforge.net/gar/?rev=11075&view=rev
Author:   bdwalton
Date:     2010-09-28 16:11:09 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: archall = 1 for dummy ap2_ mpm packages

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:05:38 UTC (rev 11074)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:11:09 UTC (rev 11075)
@@ -53,6 +53,10 @@
 endif
 
 ARCHALL_CSWapache2-manual = 1
+ifeq ($(NEED_DUMMY_AP2), 1)
+ARCHALL_CSWap2prefork = 1
+ARCHALL_CSWap2worker = 1
+endif
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel


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 Sep 28 18:16:12 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 16:16:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[11076]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0cqi-0002uY-UM@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11076
          http://gar.svn.sourceforge.net/gar/?rev=11076&view=rev
Author:   bdwalton
Date:     2010-09-28 16:16:12 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: correct typo in checkpkg overrides

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:11:09 UTC (rev 11075)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:16:12 UTC (rev 11076)
@@ -97,8 +97,8 @@
 CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
 ifeq ($(NEED_DUMMY_AP2), 1)
-CHECPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
-CHECPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
 endif
 
 # We need this to get bdb48/lib into the runpath


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 Sep 28 18:25:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 16:25:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[11077] csw/mgar/pkg/apache2/trunk
Message-ID: <E1P0czT-0002Q6-Qe@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11077
          http://gar.svn.sourceforge.net/gar/?rev=11077&view=rev
Author:   bdwalton
Date:     2010-09-28 16:25:15 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: make a dummy apache2rt package as well

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

Added Paths:
-----------
    csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2rt

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:16:12 UTC (rev 11076)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:25:15 UTC (rev 11077)
@@ -37,19 +37,19 @@
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork README.CSW.ap2_worker
+DISTFILES += README.CSW.apache2rt
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec
 
-
 NEED_DUMMY_AP2 = 1
 
 ifeq ($(NEED_DUMMY_AP2), 1)
 # These packages are dummy versions to make dependencies nicer
 # as various things depend on CSWap2prefork currently
-PACKAGES += CSWap2prefork CSWap2worker
+PACKAGES += CSWap2prefork CSWap2worker CSWapache2rt
 endif
 
 ARCHALL_CSWapache2-manual = 1
@@ -65,6 +65,7 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 CATALOGNAME_CSWap2prefork = ap2_prefork
 CATALOGNAME_CSWap2worker = ap2_worker
+CATALOGNAME_CSWapache2rt = apache2rt
 endif
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
@@ -74,11 +75,12 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 SPKG_DESC_CSWap2prefork = A dummy stub for the old prefork mpm package
 SPKG_DESC_CSWap2worker = A dummy stub for the old worker mpm package
+SPKG_DESC_CSWapache2rt = A dummy stub for the old apache2rt package
 endif
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWapache2c
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
 ifneq ($(NEED_DUMMY_AP2), 1)
-INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWap2worker
+INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWap2worker CSWapache2rt
 endif
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
@@ -90,6 +92,7 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2
+RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
 endif
 
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
@@ -99,6 +102,7 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 endif
 
 # We need this to get bdb48/lib into the runpath
@@ -171,6 +175,7 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
 PKGFILES_CSWap2worker = .*share/doc/ap2_worker.*
+PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 endif
 
 include gar/category.mk

Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2rt
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2rt	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2rt	2010-09-28 16:25:15 UTC (rev 11077)
@@ -0,0 +1,8 @@
+Hello CSW User/Sysadmin,
+
+The package CSWapache2rt is now just a placeholder to ensure
+dependencies can be met with other packages.  It contains no useful
+files.
+
+Thanks
+-The OpenCSW apache2 team.


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 Sep 28 18:50:28 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 16:50:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[11078]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0dNs-0004XP-FQ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11078
          http://gar.svn.sourceforge.net/gar/?rev=11078&view=rev
Author:   bdwalton
Date:     2010-09-28 16:50:28 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: add a post-install message about package re-org

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:25:15 UTC (rev 11077)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:50:28 UTC (rev 11078)
@@ -114,6 +114,8 @@
 # the Makefile.
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
+POSTMSG_CSWapache2 = /opt/csw/share/doc/apache2/README.CSW
+
 ALTERNATIVES_CSWapache2 = prefork worker
 ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100
 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 50


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 Sep 28 19:13:49 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 17:13:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[11079]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0dkT-0006qv-VC@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11079
          http://gar.svn.sourceforge.net/gar/?rev=11079&view=rev
Author:   bdwalton
Date:     2010-09-28 17:13:49 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: set apache2rt dummy package arch=all

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 16:50:28 UTC (rev 11078)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 17:13:49 UTC (rev 11079)
@@ -56,6 +56,7 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 ARCHALL_CSWap2prefork = 1
 ARCHALL_CSWap2worker = 1
+ARCHALL_CSWapache2rt = 1
 endif
 
 CATALOGNAME_CSWapache2 = apache2


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 Sep 28 19:50:54 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 28 Sep 2010 17:50:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[11080]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0eKM-0004rl-2S@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11080
          http://gar.svn.sourceforge.net/gar/?rev=11080&view=rev
Author:   bdwalton
Date:     2010-09-28 17:50:53 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: postmsg is not a per package variable

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 17:13:49 UTC (rev 11079)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 17:50:53 UTC (rev 11080)
@@ -115,7 +115,7 @@
 # the Makefile.
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
-POSTMSG_CSWapache2 = /opt/csw/share/doc/apache2/README.CSW
+POSTMSG = /opt/csw/share/doc/apache2/README.CSW
 
 ALTERNATIVES_CSWapache2 = prefork worker
 ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100


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

From bdwalton at users.sourceforge.net  Wed Sep 29 02:12:20 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 00:12:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[11081]
 csw/mgar/pkg/apache2/trunk/files/CSWapache2. preinstall
Message-ID: <E1P0kHU-0006ZA-Nq@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11081
          http://gar.svn.sourceforge.net/gar/?rev=11081&view=rev
Author:   bdwalton
Date:     2010-09-29 00:12:20 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: add a preinstall script for CSWapache2 to handle the (potentially) dangling httpd

Added Paths:
-----------
    csw/mgar/pkg/apache2/trunk/files/CSWapache2.preinstall

Added: csw/mgar/pkg/apache2/trunk/files/CSWapache2.preinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2.preinstall	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.preinstall	2010-09-29 00:12:20 UTC (rev 11081)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# The old apache2 packages could potentially leave a dangling
+# sbin/httpd file.  As this would prevent successful delivery of the
+# new packages (alternatives won't instantiate sbin/httpd as a symlink
+# since it exists already), we need to kill sbin/httpd if it exists
+# when CSWapache2 is installed.
+
+HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd
+
+if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then
+   rm -f "$HTTPD"
+fi
+
+exit 0


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

From bdwalton at users.sourceforge.net  Wed Sep 29 02:13:03 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 00:13:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[11082]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0kIB-0004xZ-2M@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11082
          http://gar.svn.sourceforge.net/gar/?rev=11082&view=rev
Author:   bdwalton
Date:     2010-09-29 00:13:02 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: re-add adm scripts (incl new apache2 preinstall)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 00:12:20 UTC (rev 11081)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 00:13:02 UTC (rev 11082)
@@ -31,6 +31,9 @@
 # Standard package bits
 DISTFILES += CSWapache2.killproc cswapache2
 
+DISTFILES += CSWapache2.preinstall CSWapache2postinstall
+DISTFILES += CSWap2suexec.postinstall CSWap2suexec.preremove
+
 # Configuration templates
 DISTFILES += httpd.conf.CSW
 DISTFILES += httpd-mpm.conf.CSW


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

From bdwalton at users.sourceforge.net  Wed Sep 29 02:17:03 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 00:17:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[11083]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0kM3-0006he-Px@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11083
          http://gar.svn.sourceforge.net/gar/?rev=11083&view=rev
Author:   bdwalton
Date:     2010-09-29 00:17:03 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: correct typo in postinstall DISTFILES addition

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 00:13:02 UTC (rev 11082)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 00:17:03 UTC (rev 11083)
@@ -31,7 +31,7 @@
 # Standard package bits
 DISTFILES += CSWapache2.killproc cswapache2
 
-DISTFILES += CSWapache2.preinstall CSWapache2postinstall
+DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
 DISTFILES += CSWap2suexec.postinstall CSWap2suexec.preremove
 
 # Configuration templates


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

From bdwalton at users.sourceforge.net  Wed Sep 29 03:11:31 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 01:11:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[11084]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0lCl-00047u-Lf@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11084
          http://gar.svn.sourceforge.net/gar/?rev=11084&view=rev
Author:   bdwalton
Date:     2010-09-29 01:11:31 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: correct pkgfiles split for suexec module

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 00:17:03 UTC (rev 11083)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 01:11:31 UTC (rev 11084)
@@ -175,7 +175,7 @@
 LIBTOOL_LADIR = $(APACHE_ROOT)/lib
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
-PKGFILES_CSWap2suexec = .*sbin/suexec .*libexecdir/.*suexec.* .*/man/.*suexec.*
+PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 ifeq ($(NEED_DUMMY_AP2), 1)


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

From bdwalton at users.sourceforge.net  Wed Sep 29 04:15:45 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 02:15:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[11085]
	csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW
Message-ID: <E1P0mCv-0003sT-6B@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11085
          http://gar.svn.sourceforge.net/gar/?rev=11085&view=rev
Author:   bdwalton
Date:     2010-09-29 02:15:44 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: update template for httpd.conf

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW

Modified: csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW	2010-09-29 01:11:31 UTC (rev 11084)
+++ csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW	2010-09-29 02:15:44 UTC (rev 11085)
@@ -13,9 +13,9 @@
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "var/log/foo.log"
+# with "/", the value of ServerRoot is prepended -- so "var/log/foo_log"
 # with ServerRoot set to "/opt/csw/apache2" will be interpreted by the
-# server as "/opt/csw/apache2/var/log/foo.log".
+# server as "/opt/csw/apache2/var/log/foo_log".
 
 #
 # ServerRoot: The top of the directory tree under which the server's
@@ -54,7 +54,7 @@
 LoadModule authn_file_module libexec/mod_authn_file.so
 LoadModule authn_dbm_module libexec/mod_authn_dbm.so
 LoadModule authn_anon_module libexec/mod_authn_anon.so
-#LoadModule authn_dbd_module libexec/mod_authn_dbd.so
+LoadModule authn_dbd_module libexec/mod_authn_dbd.so
 LoadModule authn_default_module libexec/mod_authn_default.so
 LoadModule authn_alias_module libexec/mod_authn_alias.so
 LoadModule authz_host_module libexec/mod_authz_host.so
@@ -66,63 +66,65 @@
 LoadModule authz_default_module libexec/mod_authz_default.so
 LoadModule auth_basic_module libexec/mod_auth_basic.so
 LoadModule auth_digest_module libexec/mod_auth_digest.so
-#LoadModule file_cache_module libexec/mod_file_cache.so
-#LoadModule cache_module libexec/mod_cache.so
-#LoadModule disk_cache_module libexec/mod_disk_cache.so
-#LoadModule mem_cache_module libexec/mod_mem_cache.so
-#LoadModule dbd_module libexec/mod_dbd.so
-#LoadModule bucketeer_module libexec/mod_bucketeer.so
-#LoadModule dumpio_module libexec/mod_dumpio.so
-#LoadModule ext_filter_module libexec/mod_ext_filter.so
+LoadModule file_cache_module libexec/mod_file_cache.so
+LoadModule cache_module libexec/mod_cache.so
+LoadModule disk_cache_module libexec/mod_disk_cache.so
+LoadModule mem_cache_module libexec/mod_mem_cache.so
+LoadModule dbd_module libexec/mod_dbd.so
+LoadModule bucketeer_module libexec/mod_bucketeer.so
+LoadModule dumpio_module libexec/mod_dumpio.so
+LoadModule reqtimeout_module libexec/mod_reqtimeout.so
+LoadModule ext_filter_module libexec/mod_ext_filter.so
 LoadModule include_module libexec/mod_include.so
-#LoadModule filter_module libexec/mod_filter.so
-#LoadModule charset_lite_module libexec/mod_charset_lite.so
+LoadModule filter_module libexec/mod_filter.so
+LoadModule substitute_module libexec/mod_substitute.so
+LoadModule charset_lite_module libexec/mod_charset_lite.so
 LoadModule deflate_module libexec/mod_deflate.so
 LoadModule ldap_module libexec/mod_ldap.so
 LoadModule log_config_module libexec/mod_log_config.so
-#LoadModule log_forensic_module libexec/mod_log_forensic.so
-#LoadModule logio_module libexec/mod_logio.so
+LoadModule log_forensic_module libexec/mod_log_forensic.so
+LoadModule logio_module libexec/mod_logio.so
 LoadModule env_module libexec/mod_env.so
 LoadModule mime_magic_module libexec/mod_mime_magic.so
-#LoadModule cern_meta_module libexec/mod_cern_meta.so
+LoadModule cern_meta_module libexec/mod_cern_meta.so
 LoadModule expires_module libexec/mod_expires.so
 LoadModule headers_module libexec/mod_headers.so
-#LoadModule ident_module libexec/mod_ident.so
-#LoadModule usertrack_module libexec/mod_usertrack.so
-#LoadModule unique_id_module libexec/mod_unique_id.so
+LoadModule ident_module libexec/mod_ident.so
+LoadModule usertrack_module libexec/mod_usertrack.so
+LoadModule unique_id_module libexec/mod_unique_id.so
 LoadModule setenvif_module libexec/mod_setenvif.so
-#LoadModule version_module libexec/mod_version.so
-#LoadModule proxy_module libexec/mod_proxy.so
-#LoadModule proxy_connect_module libexec/mod_proxy_connect.so
-#LoadModule proxy_ftp_module libexec/mod_proxy_ftp.so
-#LoadModule proxy_http_module libexec/mod_proxy_http.so
-#LoadModule proxy_ajp_module libexec/mod_proxy_ajp.so
-#LoadModule proxy_balancer_module libexec/mod_proxy_balancer.so
-<IfDefine SSL>
+LoadModule version_module libexec/mod_version.so
+LoadModule proxy_module libexec/mod_proxy.so
+LoadModule proxy_connect_module libexec/mod_proxy_connect.so
+LoadModule proxy_ftp_module libexec/mod_proxy_ftp.so
+LoadModule proxy_http_module libexec/mod_proxy_http.so
+LoadModule proxy_scgi_module libexec/mod_proxy_scgi.so
+LoadModule proxy_ajp_module libexec/mod_proxy_ajp.so
+LoadModule proxy_balancer_module libexec/mod_proxy_balancer.so
 LoadModule ssl_module libexec/mod_ssl.so
-</IfDefine>
 LoadModule mime_module libexec/mod_mime.so
-#LoadModule dav_module libexec/mod_dav.so
+LoadModule dav_module libexec/mod_dav.so
 LoadModule status_module libexec/mod_status.so
 LoadModule autoindex_module libexec/mod_autoindex.so
-#LoadModule asis_module libexec/mod_asis.so
+LoadModule asis_module libexec/mod_asis.so
 LoadModule info_module libexec/mod_info.so
+LoadModule suexec_module libexec/mod_suexec.so
 LoadModule cgi_module libexec/mod_cgi.so
-#LoadModule cgid_module libexec/mod_cgid.so
-#LoadModule dav_fs_module libexec/mod_dav_fs.so
-#LoadModule dav_lock_module libexec/mod_dav_lock.so
-#LoadModule vhost_alias_module libexec/mod_vhost_alias.so
+LoadModule cgid_module libexec/mod_cgid.so
+LoadModule dav_fs_module libexec/mod_dav_fs.so
+LoadModule dav_lock_module libexec/mod_dav_lock.so
+LoadModule vhost_alias_module libexec/mod_vhost_alias.so
 LoadModule negotiation_module libexec/mod_negotiation.so
 LoadModule dir_module libexec/mod_dir.so
-#LoadModule imagemap_module libexec/mod_imagemap.so
+LoadModule imagemap_module libexec/mod_imagemap.so
 LoadModule actions_module libexec/mod_actions.so
-#LoadModule speling_module libexec/mod_speling.so
+LoadModule speling_module libexec/mod_speling.so
 LoadModule userdir_module libexec/mod_userdir.so
 LoadModule alias_module libexec/mod_alias.so
 LoadModule rewrite_module libexec/mod_rewrite.so
 
+<IfModule !mpm_netware_module>
 <IfModule !mpm_winnt_module>
-<IfModule !mpm_netware_module>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -133,6 +135,7 @@
 #
 User @USER@
 Group @GROUP@
+
 </IfModule>
 </IfModule>
 
@@ -241,6 +244,7 @@
 <FilesMatch "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </FilesMatch>
 
 #
@@ -250,7 +254,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog var/log/error_log
+ErrorLog "var/log/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -279,13 +283,13 @@
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog var/log/access_log common
+    CustomLog "var/log/access_log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog var/log/access_log combined
+    #CustomLog "var/log/access_log" combined
 </IfModule>
 
 <IfModule alias_module>


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

From bdwalton at users.sourceforge.net  Wed Sep 29 04:17:27 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 02:17:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[11086]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0mEZ-0002iT-Vx@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11086
          http://gar.svn.sourceforge.net/gar/?rev=11086&view=rev
Author:   bdwalton
Date:     2010-09-29 02:17:27 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: force prefork to be last modulation so httpd.conf is readily available in full form

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 02:15:44 UTC (rev 11085)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 02:17:27 UTC (rev 11086)
@@ -18,7 +18,13 @@
 
 # Build multiple mpm's and merge them all into one install
 EXTRA_MODULATORS = MPM
-MODULATIONS_MPM = prefork worker
+# !!!NOTE, NOTE, NOTE!!! prefork must be last as it's the one where
+# all modules are built.  This affects the default httpd.conf that
+# gets generated.  The other modulations will generate httpd.conf
+# files that lack the important LoadModule lines.  This is primarily
+# useful at version bump time when files/httpd.conf.CSW may need an
+# update to reflect new modules, etc.
+MODULATIONS_MPM = worker prefork
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
 MERGE_SCRIPTS_isa-default-mpm-worker = copy-all


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

From bdwalton at users.sourceforge.net  Wed Sep 29 05:08:27 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 03:08:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[11087] csw/mgar/pkg/apache2/trunk
Message-ID: <E1P0n1v-00047R-LN@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11087
          http://gar.svn.sourceforge.net/gar/?rev=11087&view=rev
Author:   bdwalton
Date:     2010-09-29 03:08:27 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: dynamically create httpd.conf template instead of lugging one around

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

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 02:17:27 UTC (rev 11086)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 03:08:27 UTC (rev 11087)
@@ -41,7 +41,6 @@
 DISTFILES += CSWap2suexec.postinstall CSWap2suexec.preremove
 
 # Configuration templates
-DISTFILES += httpd.conf.CSW
 DISTFILES += httpd-mpm.conf.CSW
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
@@ -212,20 +211,22 @@
 		ginstall -d -m0755 $(DESTDIR)/$(prefix)/share/doc/$$p; \
 		ginstall -m 0644 $$f $(DESTDIR)/$(prefix)/share/doc/$$p/README.CSW; \
 	done)
+	@$(MAKECOOKIE)
 
 rename-httpd:
 	@if test -f $(APACHE_ROOT)/sbin/httpd ; then \
 	    ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \
 	fi
 
+
 # Copy in specialized templates
 copy-local-files:
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m0644 $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc
 	@ginstall -m0644 $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall -m0644 $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra
 	@ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin
+	@$(MAKECOOKIE)
 
 # Create stock templates
 template_list  = share/htdocs/index.html
@@ -247,3 +248,11 @@
 				gmv -v $$file $$file.CSW ; \
 			done )
 	@$(MAKECOOKIE)
+
+
+post-merge:
+	@(cd $(PKGROOT)/$(prefix)/apache2/etc/; \
+	perl -pi -e "s/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/" httpd.conf; \
+		mv httpd.conf httpd.conf.CSW )
+	@$(MAKECOOKIE)
+

Deleted: csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW	2010-09-29 02:17:27 UTC (rev 11086)
+++ csw/mgar/pkg/apache2/trunk/files/httpd.conf.CSW	2010-09-29 03:08:27 UTC (rev 11087)
@@ -1,486 +0,0 @@
-#
-# This is the main Apache HTTP server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
-# In particular, see 
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "var/log/foo_log"
-# with ServerRoot set to "/opt/csw/apache2" will be interpreted by the
-# server as "/opt/csw/apache2/var/log/foo_log".
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# at a local disk.  If you wish to share the same ServerRoot for multiple
-# httpd daemons, you will need to change at least LockFile and PidFile.
-#
-ServerRoot "/opt/csw/apache2"
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule authn_file_module libexec/mod_authn_file.so
-LoadModule authn_dbm_module libexec/mod_authn_dbm.so
-LoadModule authn_anon_module libexec/mod_authn_anon.so
-LoadModule authn_dbd_module libexec/mod_authn_dbd.so
-LoadModule authn_default_module libexec/mod_authn_default.so
-LoadModule authn_alias_module libexec/mod_authn_alias.so
-LoadModule authz_host_module libexec/mod_authz_host.so
-LoadModule authz_groupfile_module libexec/mod_authz_groupfile.so
-LoadModule authz_user_module libexec/mod_authz_user.so
-LoadModule authz_dbm_module libexec/mod_authz_dbm.so
-LoadModule authz_owner_module libexec/mod_authz_owner.so
-LoadModule authnz_ldap_module libexec/mod_authnz_ldap.so
-LoadModule authz_default_module libexec/mod_authz_default.so
-LoadModule auth_basic_module libexec/mod_auth_basic.so
-LoadModule auth_digest_module libexec/mod_auth_digest.so
-LoadModule file_cache_module libexec/mod_file_cache.so
-LoadModule cache_module libexec/mod_cache.so
-LoadModule disk_cache_module libexec/mod_disk_cache.so
-LoadModule mem_cache_module libexec/mod_mem_cache.so
-LoadModule dbd_module libexec/mod_dbd.so
-LoadModule bucketeer_module libexec/mod_bucketeer.so
-LoadModule dumpio_module libexec/mod_dumpio.so
-LoadModule reqtimeout_module libexec/mod_reqtimeout.so
-LoadModule ext_filter_module libexec/mod_ext_filter.so
-LoadModule include_module libexec/mod_include.so
-LoadModule filter_module libexec/mod_filter.so
-LoadModule substitute_module libexec/mod_substitute.so
-LoadModule charset_lite_module libexec/mod_charset_lite.so
-LoadModule deflate_module libexec/mod_deflate.so
-LoadModule ldap_module libexec/mod_ldap.so
-LoadModule log_config_module libexec/mod_log_config.so
-LoadModule log_forensic_module libexec/mod_log_forensic.so
-LoadModule logio_module libexec/mod_logio.so
-LoadModule env_module libexec/mod_env.so
-LoadModule mime_magic_module libexec/mod_mime_magic.so
-LoadModule cern_meta_module libexec/mod_cern_meta.so
-LoadModule expires_module libexec/mod_expires.so
-LoadModule headers_module libexec/mod_headers.so
-LoadModule ident_module libexec/mod_ident.so
-LoadModule usertrack_module libexec/mod_usertrack.so
-LoadModule unique_id_module libexec/mod_unique_id.so
-LoadModule setenvif_module libexec/mod_setenvif.so
-LoadModule version_module libexec/mod_version.so
-LoadModule proxy_module libexec/mod_proxy.so
-LoadModule proxy_connect_module libexec/mod_proxy_connect.so
-LoadModule proxy_ftp_module libexec/mod_proxy_ftp.so
-LoadModule proxy_http_module libexec/mod_proxy_http.so
-LoadModule proxy_scgi_module libexec/mod_proxy_scgi.so
-LoadModule proxy_ajp_module libexec/mod_proxy_ajp.so
-LoadModule proxy_balancer_module libexec/mod_proxy_balancer.so
-LoadModule ssl_module libexec/mod_ssl.so
-LoadModule mime_module libexec/mod_mime.so
-LoadModule dav_module libexec/mod_dav.so
-LoadModule status_module libexec/mod_status.so
-LoadModule autoindex_module libexec/mod_autoindex.so
-LoadModule asis_module libexec/mod_asis.so
-LoadModule info_module libexec/mod_info.so
-LoadModule suexec_module libexec/mod_suexec.so
-LoadModule cgi_module libexec/mod_cgi.so
-LoadModule cgid_module libexec/mod_cgid.so
-LoadModule dav_fs_module libexec/mod_dav_fs.so
-LoadModule dav_lock_module libexec/mod_dav_lock.so
-LoadModule vhost_alias_module libexec/mod_vhost_alias.so
-LoadModule negotiation_module libexec/mod_negotiation.so
-LoadModule dir_module libexec/mod_dir.so
-LoadModule imagemap_module libexec/mod_imagemap.so
-LoadModule actions_module libexec/mod_actions.so
-LoadModule speling_module libexec/mod_speling.so
-LoadModule userdir_module libexec/mod_userdir.so
-LoadModule alias_module libexec/mod_alias.so
-LoadModule rewrite_module libexec/mod_rewrite.so
-
-<IfModule !mpm_netware_module>
-<IfModule !mpm_winnt_module>
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.  
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User @USER@
-Group @GROUP@
-
-</IfModule>
-</IfModule>
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin at your-domain.com
-#
-ServerAdmin @ADMIN@
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-ServerName @HOSTNAME@:80
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/opt/csw/apache2/share/htdocs"
-
-#
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# features.  
-#
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# This should be changed to whatever you set DocumentRoot to.
-#
-<Directory "/opt/csw/apache2/share/htdocs">
-    #
-    # Possible values for the Options directive are "None", "All",
-    # or any combination of:
-    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-    #
-    # Note that "MultiViews" must be named *explicitly* --- "Options All"
-    # doesn't give it to you.
-    #
-    # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.2/mod/core.html#options
-    # for more information.
-    #
-    Options Indexes FollowSymLinks
-
-    #
-    # AllowOverride controls what directives may be placed in .htaccess files.
-    # It can be "All", "None", or any combination of the keywords:
-    #   Options FileInfo AuthConfig Limit
-    #
-    AllowOverride None
-
-    #
-    # Controls who can get stuff from this server.
-    #
-    Order allow,deny
-    Allow from all
-
-</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
-    DirectoryIndex index.html
-</IfModule>
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-<FilesMatch "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy All
-</FilesMatch>
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "var/log/error_log"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
-    #
-    # The following directives define some format nicknames for use with
-    # a CustomLog directive (see below).
-    #
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
-    <IfModule logio_module>
-      # You need to enable mod_logio.c to use %I and %O
-      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-    </IfModule>
-
-    #
-    # The location and format of the access logfile (Common Logfile Format).
-    # If you do not define any access logfiles within a <VirtualHost>
-    # container, they will be logged here.  Contrariwise, if you *do*
-    # define per-<VirtualHost> access logfiles, transactions will be
-    # logged therein and *not* in this file.
-    #
-    CustomLog "var/log/access_log" common
-
-    #
-    # If you prefer a logfile with access, agent, and referer information
-    # (Combined Logfile Format) you can use the following directive.
-    #
-    #CustomLog "var/log/access_log" combined
-</IfModule>
-
-<IfModule alias_module>
-    #
-    # Redirect: Allows you to tell clients about documents that used to 
-    # exist in your server's namespace, but do not anymore. The client 
-    # will make a new request for the document at its new location.
-    # Example:
-    # Redirect permanent /foo http://www.example.com/bar
-
-    #
-    # Alias: Maps web paths into filesystem paths and is used to
-    # access content that does not live under the DocumentRoot.
-    # Example:
-    # Alias /webpath /full/filesystem/path
-    #
-    # If you include a trailing / on /webpath then the server will
-    # require it to be present in the URL.  You will also likely
-    # need to provide a <Directory> section to allow access to
-    # the filesystem path.
-
-    #
-    # ScriptAlias: This controls which directories contain server scripts. 
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the target directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the
-    # client.  The same rules about trailing "/" apply to ScriptAlias
-    # directives as to Alias.
-    #
-    ScriptAlias /cgi-bin/ "/opt/csw/apache2/share/cgi-bin/"
-
-</IfModule>
-
-<IfModule cgid_module>
-    #
-    # ScriptSock: On threaded servers, designate the path to the UNIX
-    # socket used to communicate with the CGI daemon of mod_cgid.
-    #
-    #Scriptsock /var/run/cgisock
-</IfModule>
-
-#
-# "/opt/csw/apache2/share/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/opt/csw/apache2/share/cgi-bin">
-    AllowOverride None
-    Options None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-#
-# DefaultType: the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-<IfModule mime_module>
-    #
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
-    TypesConfig etc/mime.types
-
-    #
-    # AddType allows you to add to or override the MIME configuration
-    # file specified in TypesConfig for specific file types.
-    #
-    #AddType application/x-gzip .tgz
-    #
-    # AddEncoding allows you to have certain browsers uncompress
-    # information on the fly. Note: Not all browsers support this.
-    #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
-    #
-    # If the AddEncoding directives above are commented-out, then you
-    # probably should define those extensions to indicate media types:
-    #
-    AddType application/x-compress .Z
-    AddType application/x-gzip .gz .tgz
-
-    #
-    # AddHandler allows you to map certain file extensions to "handlers":
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action directive (see below)
-    #
-    # To use CGI scripts outside of ScriptAliased directories:
-    # (You will also need to add "ExecCGI" to the "Options" directive.)
-    #
-    #AddHandler cgi-script .cgi
-
-    # For files that include their own HTTP headers:
-    #AddHandler send-as-is asis
-
-    # For server-parsed imagemap files:
-    #AddHandler imap-file map
-
-    # For type maps (negotiated resources):
-    #AddHandler type-map var
-
-    #
-    # Filters allow you to process content before it is sent to the client.
-    #
-    # To parse .shtml files for server-side includes (SSI):
-    # (You will also need to add "Includes" to the "Options" directive.)
-    #
-    #AddType text/html .shtml
-    #AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-#MIMEMagicFile etc/magic
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall is used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted 
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-#
-#EnableMMAP off
-#EnableSendfile off
-
-# Supplemental configuration
-#
-# The configuration files in the etc/extra/ directory can be 
-# included to add extra features or to modify the default configuration of 
-# the server, or you may simply copy their contents here and change as 
-# necessary.
-
-# Server-pool management (MPM specific)
-Include etc/extra/httpd-mpm.conf
-
-# Multi-language error messages
-#Include etc/extra/httpd-multilang-errordoc.conf
-
-# Fancy directory listings
-#Include etc/extra/httpd-autoindex.conf
-
-# Language settings
-#Include etc/extra/httpd-languages.conf
-
-# User home directories
-#Include etc/extra/httpd-userdir.conf
-
-# Real-time info on requests and configuration
-#Include etc/extra/httpd-info.conf
-
-# Virtual hosts
-#Include etc/extra/httpd-vhosts.conf
-
-# Local access to the Apache HTTP Server Manual
-#Include etc/extra/httpd-manual.conf
-
-# Distributed authoring and versioning (WebDAV)
-#Include etc/extra/httpd-dav.conf
-
-# Various default settings
-#Include etc/extra/httpd-default.conf
-
-# Secure (SSL/TLS) connections
-#
-# Note: The following must must be present to support
-#       starting without SSL on platforms with no /dev/random equivalent
-#       but a statically compiled-in mod_ssl.
-#
-<IfModule ssl_module>
-Include etc/extra/httpd-ssl.conf
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-</IfModule>


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

From bdwalton at users.sourceforge.net  Wed Sep 29 05:14:46 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 03:14:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[11088]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0n82-0007Kj-T9@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11088
          http://gar.svn.sourceforge.net/gar/?rev=11088&view=rev
Author:   bdwalton
Date:     2010-09-29 03:14:46 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: ensure suexec actually has setuid bit set via prototype filter

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 03:08:27 UTC (rev 11087)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 03:14:46 UTC (rev 11088)
@@ -189,6 +189,8 @@
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 endif
 
+PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; { print }'
+
 include gar/category.mk
 
 CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS)


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

From dmichelsen at users.sourceforge.net  Wed Sep 29 09:36:29 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Sep 2010 07:36:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[11089]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1P0rDJ-0001Rq-Qn@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11089
          http://gar.svn.sourceforge.net/gar/?rev=11089&view=rev
Author:   dmichelsen
Date:     2010-09-29 07:36:29 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
subversion: Move from apache2rt to apr/apr-util

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-09-29 03:14:46 UTC (rev 11088)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-09-29 07:36:29 UTC (rev 11089)
@@ -80,7 +80,6 @@
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon
 
-
 SPKG_DESC_CSWap2svn           = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn         = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
@@ -98,10 +97,12 @@
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWexpat
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWsvn
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWiconv
-RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWneon
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapr-util
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWbdb48
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapr
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
@@ -117,9 +118,11 @@
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWexpat
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWapr-util
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWapr
 
 SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
 CATALOGNAME_CSWrbsvn       = rbsvn
@@ -129,10 +132,12 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWoldaprt
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWapr-util
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWapr
 
 SPKG_DESC_CSWpythonsvn           = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn         = pythonsvn
@@ -143,9 +148,11 @@
 RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWpython
 RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWsvn
 RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWiconv
-RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWapr-util
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWbdb48
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWapr
 CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-py_
 
@@ -165,9 +172,9 @@
 SVNLIB     = $(prefix)/lib/svn
 JAVA_HOME  = /usr/jdk1.6.0_20
 
-EXTRA_INC += $(prefix)/apache2/include
+#EXTRA_INC += $(prefix)/apache2/include
 
-EXTRA_LIB += /opt/csw/apache2/lib
+#EXTRA_LIB += /opt/csw/apache2/lib
 EXTRA_LIB += /opt/csw/bdb48/lib
 EXTRA_LIB += $(SVNLIB)
 EXTRA_LINKER_FLAGS = -lintl -liconv
@@ -175,7 +182,7 @@
 # Only add $ISALIST to dirs which ship optimized versions (done by explicitly
 # excluding those lib dirs which are known not to ship optimized versions).
 RUNPATH_ISALIST  = $(libdir)
-RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) 
+#RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) 
 
 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
 PROTOTYPE_MODIFIERS += cswpycompile
@@ -196,8 +203,8 @@
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb48/include:/opt/csw/bdb48/lib:db
 CONFIGURE_ARGS += --enable-javahl
-CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
-CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
+CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
+CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
 CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
 CONFIGURE_ARGS += --with-sasl=$(prefix)


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 Sep 29 09:43:05 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Sep 2010 07:43:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[11090]
	csw/mgar/pkg/vim/tags/vim-7.2.148, REV=2009.04.08/
Message-ID: <E1P0rJh-0001bO-RS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11090
          http://gar.svn.sourceforge.net/gar/?rev=11090&view=rev
Author:   dmichelsen
Date:     2010-09-29 07:43:05 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
vim: Tag 7.2.148,REV=2009.04.08

Added Paths:
-----------
    csw/mgar/pkg/vim/tags/vim-7.2.148,REV=2009.04.08/


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 Sep 29 10:19:22 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Sep 2010 08:19:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[11091]
	csw/mgar/pkg/freeglut/trunk/Makefile
Message-ID: <E1P0rso-0002Z7-IS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11091
          http://gar.svn.sourceforge.net/gar/?rev=11091&view=rev
Author:   dmichelsen
Date:     2010-09-29 08:19:22 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
freeglut: Add patch location

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

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-29 07:43:05 UTC (rev 11090)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2010-09-29 08:19:22 UTC (rev 11091)
@@ -9,6 +9,8 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+# Use these patches until this is fixed:
+#   http://sourceforge.net/tracker/index.php?func=detail&aid=3077828&group_id=1032&atid=101032
 PATCHFILES  = 0001-Add-support-for-Sun.patch
 PATCHFILES += 0002-Fix-windows-line-ending-and-wrong-endif.patch
 


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 Sep 29 10:40:08 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 29 Sep 2010 08:40:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[11092] csw/mgar/pkg/ftgl/trunk/Makefile
Message-ID: <E1P0sCu-0005AD-1P@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11092
          http://gar.svn.sourceforge.net/gar/?rev=11092&view=rev
Author:   dmichelsen
Date:     2010-09-29 08:40:07 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
ftgl: Disable 64 bit for now

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

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-29 08:19:22 UTC (rev 11091)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-29 08:40:07 UTC (rev 11092)
@@ -12,6 +12,8 @@
 DISTFILES  = $(GARNAME)-$(FILEVERSION).tar.bz2
 DISTNAME = $(GARNAME)-$(DISTVERSION)
 
+# Use these patches until this is fixed:
+#   http://sourceforge.net/tracker/?func=detail&atid=980351&aid=3077204&group_id=202130
 PATCHFILES  = 0001-Do-not-use-gcc-specific-flags.patch 
 PATCHFILES += 0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
 PATCHFILES += 0003-Force-GNU-sed-when-using-i.patch
@@ -37,7 +39,9 @@
 
 NOISAEXEC = 1
 NOISALIST = 1
-BUILD64 = 1
+# Unless the Solaris 10 compilation problem with both SUNW mesa and CSW mesa
+# installed exists disable 64 bit for now.
+# BUILD64 = 1
 
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)


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

From bdwalton at users.sourceforge.net  Wed Sep 29 14:50:26 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 29 Sep 2010 12:50:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[11093]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P0w78-0005sX-Cs@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11093
          http://gar.svn.sourceforge.net/gar/?rev=11093&view=rev
Author:   bdwalton
Date:     2010-09-29 12:50:26 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
apache2: disable suexec in the template httpd.conf

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 08:40:07 UTC (rev 11092)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 12:50:26 UTC (rev 11093)
@@ -254,7 +254,7 @@
 
 post-merge:
 	@(cd $(PKGROOT)/$(prefix)/apache2/etc/; \
-	perl -pi -e "s/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/" httpd.conf; \
+	perl -pi -e 's/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; s/^(LoadModule.*suexec.*)/#$$1/' httpd.conf; \
 		mv httpd.conf httpd.conf.CSW )
 	@$(MAKECOOKIE)
 


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

From bdwalton at users.sourceforge.net  Thu Sep 30 02:23:07 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 00:23:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[11094]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P16vT-0001qK-8W@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11094
          http://gar.svn.sourceforge.net/gar/?rev=11094&view=rev
Author:   bdwalton
Date:     2010-09-30 00:23:06 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
apache2: add some experimental support for a new CAS

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-29 12:50:26 UTC (rev 11093)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-30 00:23:06 UTC (rev 11094)
@@ -125,6 +125,9 @@
 
 POSTMSG = /opt/csw/share/doc/apache2/README.CSW
 
+AP2_MODS = 1
+AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so
+
 ALTERNATIVES_CSWapache2 = prefork worker
 ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100
 ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 50


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

From bdwalton at users.sourceforge.net  Thu Sep 30 03:08:31 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 01:08:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[11095]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P17dP-0006jw-1X@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11095
          http://gar.svn.sourceforge.net/gar/?rev=11095&view=rev
Author:   bdwalton
Date:     2010-09-30 01:08:30 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
apache2: drop the postinst,prerem scripts for ap2_suexec (will use CAS)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-30 00:23:06 UTC (rev 11094)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-30 01:08:30 UTC (rev 11095)
@@ -38,7 +38,6 @@
 DISTFILES += CSWapache2.killproc cswapache2
 
 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
-DISTFILES += CSWap2suexec.postinstall CSWap2suexec.preremove
 
 # Configuration templates
 DISTFILES += httpd-mpm.conf.CSW


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

From bdwalton at users.sourceforge.net  Thu Sep 30 03:43:25 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 01:43:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[11096]
	csw/mgar/pkg/cswclassutils/trunk/files
Message-ID: <E1P18BB-0007xH-CP@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11096
          http://gar.svn.sourceforge.net/gar/?rev=11096&view=rev
Author:   bdwalton
Date:     2010-09-30 01:43:25 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
cswclassutils: add i/r scripts for apache module install/uninstall

Added Paths:
-----------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod	2010-09-30 01:43:25 UTC (rev 11096)
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# i.cswap2mod - Class action script for installing apache2 modules
+#
+# $Id$
+#
+# Written by Ben Walton
+#
+# 2010-09-29 First Release
+#
+
+AP2_PREFIX=/opt/csw/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+AP2_APXS=$AP2_BINDIR/apxs
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+
+while read src dest; do
+      # Place the file first
+      /usr/bin/cp -p $src $dest || exit 2
+      echo $dest
+      
+      CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG
+      APXS=$PKG_INSTALL_ROOT/$AP2_APXS
+      MODFILE=`basename $dest`
+      MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'`
+
+      # This check ensures we have an httpd.conf where we expect it
+      # and that apxs is available.  This (hopefully) prevents us from
+      # doing anything if the local system has completely reworked the
+      # etc/ file structure
+      if [ -f "$CONF" -a -x "$APXS" ]; then
+	  # Enable the module
+	  chroot $PKG_INSTALL_ROOT \
+	      $APXS -e -a -n $MODNAME $MODFILE
+	  cat <<END
+
+
+NOTICE: The $MODNAME module was enabled in httpd.conf but the server
+was not restarted.  Please modify httpd.conf as appropriate and
+restart apache.
+
+
+END
+      fi
+done
+
+exit 0


Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswap2mod
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod	2010-09-30 01:43:25 UTC (rev 11096)
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# r.cswap2mod - Class action script for removing apache2 modules
+#
+# $Id$
+#
+# Written by Ben Walton
+#
+# 2010-09-29 First Release
+#
+
+AP2_PREFIX=/opt/csw/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+AP2_APXS=$AP2_BINDIR/apxs
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+
+while read dest; do
+      echo $dest
+      
+      CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG
+      APXS=$PKG_INSTALL_ROOT/$AP2_APXS
+      MODFILE=`basename $dest`
+      MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'`
+
+      # This check ensures we have an httpd.conf where we expect it
+      # and that apxs is available.  This (hopefully) prevents us from
+      # doing anything if the local system has completely reworked the
+      # etc/ file structure
+      if [ -f "$CONF" -a -x "$APXS" ]; then
+	  # Disable the module
+	  chroot $PKG_INSTALL_ROOT \
+	      $APXS -e -A -n $MODNAME $MODFILE
+	  cat <<END
+
+
+NOTICE: The $MODNAME module was disabled in httpd.conf but the server
+was not restarted.  Please modify httpd.conf as appropriate and
+restart apache.
+
+
+END
+      fi
+
+      # Now actually remove the file.
+      /usr/bin/rm -f $dest || exit 2
+
+done
+
+exit 0


Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswap2mod
___________________________________________________________________
Added: svn:keywords
   + Id


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

From bdwalton at users.sourceforge.net  Thu Sep 30 03:45:14 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 01:45:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[11097] csw/mgar/gar/v2/gar.pkg.mk
Message-ID: <E1P18Cw-0004MU-Hd@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11097
          http://gar.svn.sourceforge.net/gar/?rev=11097&view=rev
Author:   bdwalton
Date:     2010-09-30 01:45:14 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
gar/v2: add handling for the upcoming cswap2mod CAS

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-09-30 01:43:25 UTC (rev 11096)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-09-30 01:45:14 UTC (rev 11097)
@@ -185,6 +185,10 @@
 # This is the default path for texinfo pages to be picked up. Extend or replace as necessary.
 TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO)
 
+# if AP2_MODS is set, files matching this pattern will have cswap2mod
+# set as their class
+AP2_MODFILES ?= /opt/csw/apache2/libexec/.*\.so $(EXTRA_AP2_MODFILES)
+
 # - set class for all config files
 _CSWCLASS_FILTER = | perl -ane '\
 		$(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\
@@ -197,6 +201,7 @@
 		$(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
 		$(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\
+		$(if $(AP2_MODS),$(foreach FILE,$(AP2_MODFILES),$$F[1] = "cswap2mod" if( $$F[2] =~ m(^$(FILE)$$) );))\
 		print join(" ", at F),"\n";'
 
 # If you add another filter above, also add the class to this list. It is used
@@ -216,6 +221,7 @@
 _CSWCLASSES += cswinetd
 _CSWCLASSES += cswinitsmf
 _CSWCLASSES += cswtexinfo
+_CSWCLASSES += cswap2mod
 _CSWCLASSES += cswpostmsg
 
 # Make sure the configuration files always have a .CSW suffix and rename the


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

From bdwalton at users.sourceforge.net  Thu Sep 30 03:52:32 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 01:52:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[11098]
	csw/mgar/pkg/cswclassutils/trunk/Makefile
Message-ID: <E1P18K0-0008G3-7v@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11098
          http://gar.svn.sourceforge.net/gar/?rev=11098&view=rev
Author:   bdwalton
Date:     2010-09-30 01:52:32 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
cswclassutils: version bump for ap2mods

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

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-09-30 01:45:14 UTC (rev 11097)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-09-30 01:52:32 UTC (rev 11098)
@@ -1,7 +1,7 @@
 # $HeadURL$
 
 GARNAME = cswclassutils
-GARVERSION = 1.40
+GARVERSION = 1.41
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities


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

From bdwalton at users.sourceforge.net  Thu Sep 30 04:04:19 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 02:04:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[11099]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1P18VP-0004t4-Qi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11099
          http://gar.svn.sourceforge.net/gar/?rev=11099&view=rev
Author:   bdwalton
Date:     2010-09-30 02:04:19 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
apache2: ap2_worker has nothing depending on it, no stub required

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-30 01:52:32 UTC (rev 11098)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-30 02:04:19 UTC (rev 11099)
@@ -43,7 +43,7 @@
 DISTFILES += httpd-mpm.conf.CSW
 DISTFILES += httpd-ssl.conf.CSW
 DISTFILES += update20to22
-DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork README.CSW.ap2_worker
+DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -56,13 +56,12 @@
 ifeq ($(NEED_DUMMY_AP2), 1)
 # These packages are dummy versions to make dependencies nicer
 # as various things depend on CSWap2prefork currently
-PACKAGES += CSWap2prefork CSWap2worker CSWapache2rt
+PACKAGES += CSWap2prefork CSWapache2rt
 endif
 
 ARCHALL_CSWapache2-manual = 1
 ifeq ($(NEED_DUMMY_AP2), 1)
 ARCHALL_CSWap2prefork = 1
-ARCHALL_CSWap2worker = 1
 ARCHALL_CSWapache2rt = 1
 endif
 
@@ -72,7 +71,6 @@
 CATALOGNAME_CSWap2suexec = ap2_suexec
 ifeq ($(NEED_DUMMY_AP2), 1)
 CATALOGNAME_CSWap2prefork = ap2_prefork
-CATALOGNAME_CSWap2worker = ap2_worker
 CATALOGNAME_CSWapache2rt = apache2rt
 endif
 
@@ -82,13 +80,12 @@
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
 ifeq ($(NEED_DUMMY_AP2), 1)
 SPKG_DESC_CSWap2prefork = A dummy stub for the old prefork mpm package
-SPKG_DESC_CSWap2worker = A dummy stub for the old worker mpm package
 SPKG_DESC_CSWapache2rt = A dummy stub for the old apache2rt package
 endif
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c CSWap2worker
 ifneq ($(NEED_DUMMY_AP2), 1)
-INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWap2worker CSWapache2rt
+INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWapache2rt
 endif
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
@@ -99,7 +96,6 @@
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 ifeq ($(NEED_DUMMY_AP2), 1)
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
 endif
 
@@ -109,7 +105,6 @@
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
 ifeq ($(NEED_DUMMY_AP2), 1)
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 endif
 
@@ -187,7 +182,6 @@
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 ifeq ($(NEED_DUMMY_AP2), 1)
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
-PKGFILES_CSWap2worker = .*share/doc/ap2_worker.*
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 endif
 


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

From bdwalton at users.sourceforge.net  Thu Sep 30 04:05:13 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 30 Sep 2010 02:05:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[11100] csw/mgar/pkg/apache2/trunk/files
Message-ID: <E1P18WH-0000Fe-PW@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11100
          http://gar.svn.sourceforge.net/gar/?rev=11100&view=rev
Author:   bdwalton
Date:     2010-09-30 02:05:13 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
apache2: drop the postinstall/preremove scripts for suexec, drop the readme for ap2_worker stub

Removed Paths:
-------------
    csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.postinstall
    csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.preremove
    csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.postinstall	2010-09-30 02:04:19 UTC (rev 11099)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.postinstall	2010-09-30 02:05:13 UTC (rev 11100)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-
-# Enable the suexec module
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-chroot $PKG_INSTALL_ROOT \
-    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n suexec mod_suexec.so
-
-cat <<END
-
-NOTICE: mod_suexec is enabled in httpd.conf but the server was not restarted.
-Please configure suexec and restart apache.
-
-END
-
-exit 0

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.preremove
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.preremove	2010-09-30 02:04:19 UTC (rev 11099)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.preremove	2010-09-30 02:05:13 UTC (rev 11100)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-
-# Enable the suexec module
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-chroot $PKG_INSTALL_ROOT \
-    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n suexec mod_suexec.so
-
-cat <<END
-
-NOTICE: mod_suexec is disabled in httpd.conf but the server was not restarted.
-Please check your configuration and restart apache.
-
-END
-
-exit 0

Deleted: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-09-30 02:04:19 UTC (rev 11099)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-09-30 02:05:13 UTC (rev 11100)
@@ -1,8 +0,0 @@
-Hello CSW User/Sysadmin,
-
-The package CSWap2worker is now just a placeholder to ensure
-dependencies can be met with other packages.  It contains no useful
-files.
-
-Thanks
--The OpenCSW apache2 team.


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 Sep 30 13:21:44 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 11:21:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[11101] csw/mgar/pkg/libsndfile/branches
Message-ID: <E1P1HCq-0000UG-6N@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11101
          http://gar.svn.sourceforge.net/gar/?rev=11101&view=rev
Author:   dmichelsen
Date:     2010-09-30 11:21:43 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
libsndfile: Make branch for 1.0.22preX

Modified Paths:
--------------
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums

Added Paths:
-----------
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch

Removed Paths:
-------------
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
    csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch

Modified: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile	2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile	2010-09-30 11:21:43 UTC (rev 11101)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = libsndfile
-GARVERSION = 1.0.21
+GARVERSION = 1.0.22pre4
 
 CATEGORIES = lib
 
@@ -31,12 +31,14 @@
 endef
 
 MASTER_SITES = http://www.mega-nerd.com/libsndfile/files/
+MASTER_SITES = http://www.mega-nerd.com/tmp/
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch
 PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
 PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
-PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
+# PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
+PATCHFILES += 0004-Add-branch-for-inttypes.h.patch
 
 # TODO: The __func__ replacement may be enhanced with
 #   http://mail-index.netbsd.org/pkgsrc-users/2009/05/18/msg009885.html

Modified: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/checksums	2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums	2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,5 +1 @@
-5a1c6c4bfb8b8426d8ebc8d67814a7c8  0001-Add-lrintf-workaround-to-regtest.patch
-ab0c6ea20d4bda60f6f6dd4fa4c26871  0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
-599bd5f64872bbddf993ce0815d28417  0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
-732c648739e94cb5fd2e70d983390318  0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
-880a40ec636ab2185b97f8927299b292  libsndfile-1.0.21.tar.gz
+e1b317cdebd6afcb225afec0b081c232  libsndfile-1.0.22pre4.tar.gz

Added: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch	2010-09-30 11:21:43 UTC (rev 11101)
@@ -0,0 +1,28 @@
+From 5640cb876215cfdeaa24794ca996f2164b6a5b10 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 30 Sep 2010 11:09:08 +0200
+Subject: [PATCH 4/4] Add branch for inttypes.h
+
+---
+ programs/common.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/programs/common.c b/programs/common.c
+index 75ae602..d7d58b1 100644
+--- a/programs/common.c
++++ b/programs/common.c
+@@ -35,7 +35,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#if HAVE_STDINT_H
+ #include <stdint.h>
++#elif HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+ 
+ #include <sndfile.h>
+ 
+-- 
+1.7.3
+

Deleted: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch	2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch	2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,25 +0,0 @@
-From a1350cd6d86051e18b4513f1e7babce8fd5d00e0 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 29 Oct 2009 14:00:09 +0100
-Subject: [PATCH 3/3] Disable stop-on-error until cpp_test refcount error is fixed
-
----
- tests/test_wrapper.sh.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tests/test_wrapper.sh.in b/tests/test_wrapper.sh.in
-index 7fb2d8e..8a0557d 100755
---- a/tests/test_wrapper.sh.in
-+++ b/tests/test_wrapper.sh.in
-@@ -12,7 +12,7 @@ if [ ! -f sfversion ]; then
- sfversion=`./sfversion`
- 
- # Force exit on errors.
--set -e
-+# set -e
- 
- # generic-tests
- uname -a
--- 
-1.6.5
-

Deleted: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch	2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch	2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,27 +0,0 @@
---- Makefile.orig       2009-05-18 13:08:50.608183737 +0200
-+++ Makefile
-@@ -36,6 +36,11 @@ CONFIGURE_ENV+=              ac_cv_c_struct_hack=yes
- BUILDLINK_PASSTHRU_DIRS+=      /Developer
- .endif
- 
-+# Needed for sun studio having __func__ defined
-+.if ${PKGSRC_COMPILER} == "sunpro"
-+CFLAGS+=        -features=extensions
-+.endif
-+
- .include "../../audio/flac/buildlink3.mk"
- #BUILDLINK_API_DEPENDS.libvorbis+=     libvorbis>=1.2.1
- .include "../../audio/libvorbis/buildlink3.mk"
-$NetBSD$
-
---- src/common.h.orig   2009-02-13 22:24:08.000000000 +0100
-+++ src/common.h
-@@ -39,7 +39,7 @@
- 
- #if (SIZEOF_LONG == 8)
- #      define  SF_PLATFORM_S64(x)              x##l
--#elif COMPILER_IS_GCC
-+#elif COMPILER_IS_GCC || __SUNPRO_C
- #      define  SF_PLATFORM_S64(x)              x##ll
- #elif OS_IS_WIN32
- #      define  SF_PLATFORM_S64(x)              x##I64


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 Sep 30 13:58:02 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 11:58:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[11102] csw/mgar/pkg
Message-ID: <E1P1Hly-0000xO-KW@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11102
          http://gar.svn.sourceforge.net/gar/?rev=11102&view=rev
Author:   dmichelsen
Date:     2010-09-30 11:58:02 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
glew: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/glew/
    csw/mgar/pkg/glew/branches/
    csw/mgar/pkg/glew/tags/
    csw/mgar/pkg/glew/trunk/
    csw/mgar/pkg/glew/trunk/Makefile
    csw/mgar/pkg/glew/trunk/checksums
    csw/mgar/pkg/glew/trunk/files/
    csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch


Property changes on: csw/mgar/pkg/glew/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/glew/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glew/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/glew/trunk/Makefile	2010-09-30 11:58:02 UTC (rev 11102)
@@ -0,0 +1,65 @@
+# $Id$
+GARNAME = glew
+GARVERSION = 1.5.6
+CATEGORIES = lib
+
+DESCRIPTION = OpenGL Extension Wrangler Library (GLEW)
+define BLURB
+  The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++
+  extension loading library. GLEW provides efficient run-time mechanisms for determining
+  which OpenGL extensions are supported on the target platform. OpenGL core and extension
+  functionality is exposed in a single header file. GLEW has been tested on a variety of
+  operating systems, including Windows, Linux, Mac OS X, FreeBSD, Irix, and Solaris.
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+PATCHFILES = 0001-Use-inttypes-also-for-Solaris.patch
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+
+DEP_PKGS = CSWmesa
+
+LICENSE = LICENSE.txt
+
+NOISALIST = 1
+NOISAEXEC = 1
+BUILD64 = 1
+
+EXTRA_LIB = /usr/openwin/lib
+
+LDOPT-64 = -64
+
+BUILD_OVERRIDE_VARS = CC CFLAGS.EXTRA OPT LDFLAGS.SO
+BUILD_OVERRIDE_VAR_CC = $(CC)
+BUILD_OVERRIDE_VAR_CFLAGS.EXTRA = $(CFLAGS) $(CPPFLAGS) -I/usr/openwin/include -xcode=pic32
+BUILD_OVERRIDE_VAR_LDFLAGS.SO = -G $(LDOPT-$(MEMORYMODEL))
+
+# These are for glew.pc
+BUILD_OVERRIDE_VARS += GLEW_DEST LIBDIR BINDIR INCDIR
+BUILD_OVERRIDE_VAR_GLEW_DEST = $(prefix)
+BUILD_OVERRIDE_VAR_LIBDIR = $(libdir)
+BUILD_OVERRIDE_VAR_BINDIR = $(bindir)
+BUILD_OVERRIDE_VAR_INCDIR = $(includedir)
+
+CONFIGURE_SCRIPTS =
+
+TEST_SCRIPTS = 
+
+INSTALL_OVERRIDE_DIRS = GLEW_DEST BINDIR LIBDIR
+GLEW_DEST = $(prefix)
+BINDIR = $(bindir)
+LIBDIR = $(libdir)
+INSTALL_OVERRIDE_VARS = INSTALL LDFLAGS.EXTRA
+INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
+INSTALL_OVERRIDE_VAR_LDFLAGS.EXTRA = $(LDFLAGS)
+
+MERGE_DIRS_isa-extra = $(libdir)
+
+# These are NOT bad...
+CHECKPKG_OVERRIDES_CSWglew += bad-rpath-entry|/usr/openwin/lib/64|opt/csw/bin/sparcv9/glewinfo
+CHECKPKG_OVERRIDES_CSWglew += bad-rpath-entry|/usr/openwin/lib/64|opt/csw/bin/sparcv9/visualinfo
+CHECKPKG_OVERRIDES_CSWglew += bad-rpath-entry|/usr/openwin/lib/64|opt/csw/lib/sparcv9/libGLEW.so.1.5.6
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/glew/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/glew/trunk/checksums
===================================================================
--- csw/mgar/pkg/glew/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/glew/trunk/checksums	2010-09-30 11:58:02 UTC (rev 11102)
@@ -0,0 +1 @@
+e6f56eb765f1da489a1327793adcf6bb  glew-1.5.6.tgz

Added: csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch	2010-09-30 11:58:02 UTC (rev 11102)
@@ -0,0 +1,25 @@
+From 7da2f65f28296c3755478f2060609a7247a65801 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 29 Sep 2010 12:49:48 +0200
+Subject: [PATCH] Use inttypes also for Solaris
+
+---
+ include/GL/glew.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/GL/glew.h b/include/GL/glew.h
+index 5105a20..9f82d40 100644
+--- a/include/GL/glew.h
++++ b/include/GL/glew.h
+@@ -200,7 +200,7 @@ typedef _W64 int ptrdiff_t;
+ 
+ /* SGI MIPSPro doesn't like stdint.h in C++ mode */
+ 
+-#if defined(__sgi) && !defined(__GNUC__)
++#if defined(__sun) || defined(__sgi) && !defined(__GNUC__)
+ #include <inttypes.h>
+ #else
+ #include <stdint.h>
+-- 
+1.7.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  Thu Sep 30 14:38:49 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 12:38:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[11103] csw/mgar/pkg/glew/trunk/Makefile
Message-ID: <E1P1IPR-00024x-Bc@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11103
          http://gar.svn.sourceforge.net/gar/?rev=11103&view=rev
Author:   dmichelsen
Date:     2010-09-30 12:38:49 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
glew: Use CSW libGL

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

Modified: csw/mgar/pkg/glew/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glew/trunk/Makefile	2010-09-30 11:58:02 UTC (rev 11102)
+++ csw/mgar/pkg/glew/trunk/Makefile	2010-09-30 12:38:49 UTC (rev 11103)
@@ -27,14 +27,14 @@
 NOISAEXEC = 1
 BUILD64 = 1
 
-EXTRA_LIB = /usr/openwin/lib
-
 LDOPT-64 = -64
+EXTRA_CFLAGS-sparc = -xcode=pic32
 
-BUILD_OVERRIDE_VARS = CC CFLAGS.EXTRA OPT LDFLAGS.SO
+BUILD_OVERRIDE_VARS = CC CFLAGS.EXTRA OPT LDFLAGS.SO LDFLAGS.EXTRA
 BUILD_OVERRIDE_VAR_CC = $(CC)
-BUILD_OVERRIDE_VAR_CFLAGS.EXTRA = $(CFLAGS) $(CPPFLAGS) -I/usr/openwin/include -xcode=pic32
+BUILD_OVERRIDE_VAR_CFLAGS.EXTRA = $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS-$(GARCH))
 BUILD_OVERRIDE_VAR_LDFLAGS.SO = -G $(LDOPT-$(MEMORYMODEL))
+BUILD_OVERRIDE_VAR_LDFLAGS.EXTRA = -L$(libdir)
 
 # These are for glew.pc
 BUILD_OVERRIDE_VARS += GLEW_DEST LIBDIR BINDIR INCDIR


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 Sep 30 15:14:49 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 13:14:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[11104] csw/mgar/pkg/gource/trunk
Message-ID: <E1P1IyH-0003BO-BK@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11104
          http://gar.svn.sourceforge.net/gar/?rev=11104&view=rev
Author:   dmichelsen
Date:     2010-09-30 13:14:49 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
gource: Add compile flags and update to 0.28, still does not compile

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

Added Paths:
-----------
    csw/mgar/pkg/gource/trunk/files/0001-Make-sure-we-have-a-prototype-for-sqrt.patch

Modified: csw/mgar/pkg/gource/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gource/trunk/Makefile	2010-09-30 12:38:49 UTC (rev 11103)
+++ csw/mgar/pkg/gource/trunk/Makefile	2010-09-30 13:14:49 UTC (rev 11104)
@@ -1,5 +1,5 @@
 GARNAME = gource
-GARVERSION = 0.26
+GARVERSION = 0.28
 CATEGORIES = apps
 
 DESCRIPTION = Software version control visualization
@@ -9,9 +9,12 @@
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+PATCHFILES = 0001-Make-sure-we-have-a-prototype-for-sqrt.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+EXTRA_CXXFLAGS = -library=stlport4
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/gource/trunk/checksums
===================================================================
--- csw/mgar/pkg/gource/trunk/checksums	2010-09-30 12:38:49 UTC (rev 11103)
+++ csw/mgar/pkg/gource/trunk/checksums	2010-09-30 13:14:49 UTC (rev 11104)
@@ -1 +1 @@
-e5f0b2c1f76d76fef1e318c0a421a111  gource-0.26.tar.gz
+82cadbd7791cff913970a63d63d894ff  gource-0.28.tar.gz

Added: csw/mgar/pkg/gource/trunk/files/0001-Make-sure-we-have-a-prototype-for-sqrt.patch
===================================================================
--- csw/mgar/pkg/gource/trunk/files/0001-Make-sure-we-have-a-prototype-for-sqrt.patch	                        (rev 0)
+++ csw/mgar/pkg/gource/trunk/files/0001-Make-sure-we-have-a-prototype-for-sqrt.patch	2010-09-30 13:14:49 UTC (rev 11104)
@@ -0,0 +1,24 @@
+From 6874fe23f37b83f6d4813b8f5e6dcaf435a7051a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 30 Sep 2010 15:13:31 +0200
+Subject: [PATCH] Make sure we have a prototype for sqrt
+
+---
+ src/core/vectors.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/core/vectors.h b/src/core/vectors.h
+index ef87c23..783b5ac 100644
+--- a/src/core/vectors.h
++++ b/src/core/vectors.h
+@@ -29,6 +29,7 @@
+ #define VECTORS_H
+ 
+ #include <cmath>
++#include <math.h>
+ 
+ template<class T> class vec2 {
+ public:
+-- 
+1.7.2.2
+


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

From dmichelsen at users.sourceforge.net  Thu Sep 30 15:44:38 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 13:44:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[11105] csw/mgar/pkg/rssh/trunk/Makefile
Message-ID: <E1P1JR8-0004Nn-QM@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11105
          http://gar.svn.sourceforge.net/gar/?rev=11105&view=rev
Author:   dmichelsen
Date:     2010-09-30 13:44:38 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
rssh: Skip dependency to CSWossh fixing #4549

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

Modified: csw/mgar/pkg/rssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rssh/trunk/Makefile	2010-09-30 13:14:49 UTC (rev 11104)
+++ csw/mgar/pkg/rssh/trunk/Makefile	2010-09-30 13:44:38 UTC (rev 11105)
@@ -25,7 +25,9 @@
 BUILD_DEP_PKGS = CSWossh CSWcvs CSWrdist CSWrsync
 
 # We need at least OpenSSH, the other programs are optional
-RUNTIME_DEP_PKGS = CSWossh
+# Looks like I was wrong: even that one is optional. See
+#   https://www.opencsw.org/mantis/view.php?id=4549
+# RUNTIME_DEP_PKGS = CSWossh
 
 sysconfdir = /etc/opt/csw
 MIGRATE_FILES = rssh.conf
@@ -44,7 +46,7 @@
 PROTOTYPE_FILES_makesuid = $(libexecdir)/rssh_chroot_helper
 PROTOTYPE_PERMS_makesuid = 4755
 
-CHECKPKG_OVERRIDES_CSWrssh += surplus-dependency|CSWossh
+# CHECKPKG_OVERRIDES_CSWrssh += surplus-dependency|CSWossh
 
 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 Sep 30 16:34:27 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 30 Sep 2010 14:34:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[11106]
	csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <E1P1KDL-0005lO-MO@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11106
          http://gar.svn.sourceforge.net/gar/?rev=11106&view=rev
Author:   dmichelsen
Date:     2010-09-30 14:34:27 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
libserf: Move to APR

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2010-09-30 13:44:38 UTC (rev 11105)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2010-09-30 14:34:27 UTC (rev 11106)
@@ -15,7 +15,7 @@
 MASTER_SITES = http://serf.googlecode.com/files/
 DISTFILES  = $(DISTNAME).tar.bz2
 
-RUNTIME_DEP_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
+DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -27,24 +27,21 @@
 # Make sure the current directory comes before everything else
 INCLUDE_FLAGS = -I. -I$(includedir)
 
+EXTRA_LIB = $(prefix)/bdb48/lib
+
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 CONFIGURE_ARGS = $(DIRPATHS)
-# CONFIGURE_ARGS += --with-openssl=$(prefix)
-CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
-CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
+CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
+CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config
 
 TEST_TARGET = check
 
-# as long as apache does not depend on apr, serf as well 
-# does not depend on it
-CHECKPKG_OVERRIDES_CSWlibserf += missing-dependency|CSWapr
-
 include gar/category.mk
 
-APR_LIBTOOL = $(shell /opt/csw/apache2/bin/apr-config --apr-libtool)
+post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool)
 post-configure-modulated:
 	gcp $(APR_LIBTOOL) $(WORKSRC)
 	perl -i -pne 's|$(APR_LIBTOOL)|$(abspath $(WORKSRC)/libtool)|' $(WORKSRC)/Makefile


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

From wahwah at users.sourceforge.net  Thu Sep 30 18:27:38 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 30 Sep 2010 16:27:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[11107] csw/mgar/gar/v2/lib/python
Message-ID: <E1P1Lys-0003oM-7q@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11107
          http://gar.svn.sourceforge.net/gar/?rev=11107&view=rev
Author:   wahwah
Date:     2010-09-30 16:27:38 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
mGAR v2: Adding /usr/openwin/lib/64 to the RPATH whitelist.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/testdata/rpaths.py

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-09-30 14:34:27 UTC (rev 11106)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-09-30 16:27:38 UTC (rev 11107)
@@ -91,7 +91,7 @@
      r"$") % RPATH_PARTS,
     r"^\$ORIGIN$",
     r"^\$ORIGIN/..$",
-    r"^/usr(/(ccs|dt|openwin))?/lib(/sparcv9)?$",
+    r"^/usr(/(ccs|dt|openwin))?/lib(/(sparcv9|amd64|64))?$",
 ]
 # Check ldd -r only for Perl modules
 SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$"

Modified: csw/mgar/gar/v2/lib/python/testdata/rpaths.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/rpaths.py	2010-09-30 14:34:27 UTC (rev 11106)
+++ csw/mgar/gar/v2/lib/python/testdata/rpaths.py	2010-09-30 16:27:38 UTC (rev 11107)
@@ -181,6 +181,7 @@
      '/usr/local/lib',
      '/usr/local/openldap-2.3/lib',
      '/usr/openwin/lib',
+     '/usr/openwin/lib/64',
      '/usr/sfw/lib',
      '/usr/ucblib',
      '/usr/xpg4/lib',


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:15:20 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:15:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[11108] csw/mgar/pkg/cpan
Message-ID: <E1P1QTI-00065s-Qo@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11108
          http://gar.svn.sourceforge.net/gar/?rev=11108&view=rev
Author:   bonivart
Date:     2010-09-30 21:15:20 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Struct-Compare: initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Struct-Compare/
    csw/mgar/pkg/cpan/Struct-Compare/branches/
    csw/mgar/pkg/cpan/Struct-Compare/tags/
    csw/mgar/pkg/cpan/Struct-Compare/trunk/
    csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile
    csw/mgar/pkg/cpan/Struct-Compare/trunk/checksums
    csw/mgar/pkg/cpan/Struct-Compare/trunk/files/
    csw/mgar/pkg/cpan/Struct-Compare/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Struct-Compare/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile	2010-09-30 21:15:20 UTC (rev 11108)
@@ -0,0 +1,17 @@
+GARNAME = Struct-Compare
+GARVERSION = 1.0.1
+CATEGORIES = cpan
+AUTHOR = ZENSPIDER
+
+DESCRIPTION = Recursive diff for perl structures
+define BLURB
+  Recursive diff for perl structures
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmstructcompare
+CATALOGNAME = pm_structcompare
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Struct-Compare/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Struct-Compare/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Struct-Compare/trunk/checksums	2010-09-30 21:15:20 UTC (rev 11108)
@@ -0,0 +1 @@
+7adacc9b55115b82ce87d68133e46550  Struct-Compare-1.0.1.tar.gz

Added: csw/mgar/pkg/cpan/Struct-Compare/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Struct-Compare/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Struct-Compare/trunk/files/COPYING	2010-09-30 21:15:20 UTC (rev 11108)
@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2001 Ryan Davis, Zen Spider Software
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:23:34 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:23:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[11109] csw/mgar/pkg/cpan
Message-ID: <E1P1QbG-0004Kf-5V@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11109
          http://gar.svn.sourceforge.net/gar/?rev=11109&view=rev
Author:   bonivart
Date:     2010-09-30 21:23:33 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Crypt-PasswdMD5: initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/branches/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/tags/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/checksums
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/files/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	2010-09-30 21:23:33 UTC (rev 11109)
@@ -0,0 +1,17 @@
+GARNAME = Crypt-PasswdMD5
+GARVERSION = 1.3
+CATEGORIES = cpan
+AUTHOR = LUISMUNOZ
+
+DESCRIPTION = Provides interoperable MD5-based crypt() functions
+define BLURB
+  Provides interoperable MD5-based crypt() functions
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmpdfreuse
+CATALOGNAME = pm_pdfreuse
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/checksums	2010-09-30 21:23:33 UTC (rev 11109)
@@ -0,0 +1 @@
+368205b1be8c0d4f807afe25d6fbd1ad  Crypt-PasswdMD5-1.3.tar.gz

Added: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/files/COPYING	2010-09-30 21:23:33 UTC (rev 11109)
@@ -0,0 +1,7 @@
+This software is (c) Luis E. Mu?oz.  It can be used under the terms of
+the perl artistic license provided  that proper credit for the work of
+the  author is  preserved in  the form  of this  copyright  notice and
+license for this module.
+
+No warranty of any kind is  expressed or implied. This code might make
+your computer go up in a puff of black smoke.


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:35:43 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:35:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[11110]
	csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
Message-ID: <E1P1Qn1-0006rC-36@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11110
          http://gar.svn.sourceforge.net/gar/?rev=11110&view=rev
Author:   bonivart
Date:     2010-09-30 21:35:42 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Crypt-PasswdMD5: fix pkgname

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	2010-09-30 21:23:33 UTC (rev 11109)
+++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	2010-09-30 21:35:42 UTC (rev 11110)
@@ -10,8 +10,8 @@
 
 DISTFILES += COPYING
 
-PACKAGES = CSWpmpdfreuse
-CATALOGNAME = pm_pdfreuse
+PACKAGES = CSWpmcryptpasswdmd5
+CATALOGNAME = pm_cryptpasswdmd5
 ARCHALL = 1
 
 include gar/category.mk


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:46:55 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:46:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[11111] csw/mgar/pkg/cpan
Message-ID: <E1P1Qxr-0005Dl-34@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11111
          http://gar.svn.sourceforge.net/gar/?rev=11111&view=rev
Author:   bonivart
Date:     2010-09-30 21:46:54 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Passwd-Unix: initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Passwd-Unix/
    csw/mgar/pkg/cpan/Passwd-Unix/branches/
    csw/mgar/pkg/cpan/Passwd-Unix/tags/
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/files/
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Passwd-Unix/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	2010-09-30 21:46:54 UTC (rev 11111)
@@ -0,0 +1,17 @@
+GARNAME = Passwd-Unix
+GARVERSION = 0.52
+CATEGORIES = cpan
+AUTHOR = STRZELEC
+
+DESCRIPTION = Abstract interface to /etc/passwd, /etc/shadow and /etc/group format files
+define BLURB
+  Abstract interface to /etc/passwd, /etc/shadow and /etc/group format files
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmpdfreuse
+CATALOGNAME = pm_pdfreuse
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums	2010-09-30 21:46:54 UTC (rev 11111)
@@ -0,0 +1 @@
+5590c788a541b1268f38dadf9a829692  Passwd-Unix-0.52.tar.gz

Added: csw/mgar/pkg/cpan/Passwd-Unix/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Passwd-Unix/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/files/COPYING	2010-09-30 21:46:54 UTC (rev 11111)
@@ -0,0 +1,4 @@
+    This program is free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
+
+    See http://www.perl.com/perl/misc/Artistic.html


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:48:10 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:48:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[11112]
	csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
Message-ID: <E1P1Qz4-0007FY-Lj@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11112
          http://gar.svn.sourceforge.net/gar/?rev=11112&view=rev
Author:   bonivart
Date:     2010-09-30 21:48:10 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Passwd-Unix: fix pkg-name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	2010-09-30 21:46:54 UTC (rev 11111)
+++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	2010-09-30 21:48:10 UTC (rev 11112)
@@ -10,8 +10,8 @@
 
 DISTFILES += COPYING
 
-PACKAGES = CSWpmpdfreuse
-CATALOGNAME = pm_pdfreuse
+PACKAGES = CSWpmpasswdunix
+CATALOGNAME = pm_passwdunix
 ARCHALL = 1
 
 include gar/category.mk


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

From bonivart at users.sourceforge.net  Thu Sep 30 23:54:27 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 30 Sep 2010 21:54:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[11113]
	csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
Message-ID: <E1P1R59-0005RI-20@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11113
          http://gar.svn.sourceforge.net/gar/?rev=11113&view=rev
Author:   bonivart
Date:     2010-09-30 21:54:26 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Passwd-Unix: add deps

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	2010-09-30 21:48:10 UTC (rev 11112)
+++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile	2010-09-30 21:54:26 UTC (rev 11113)
@@ -14,4 +14,6 @@
 CATALOGNAME = pm_passwdunix
 ARCHALL = 1
 
+RUNTIME_DEP_PKGS += CSWpmcryptpasswdmd5 CSWpmstructcompare
+
 include gar/category.mk


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