From dmichelsen at users.sourceforge.net  Sat Feb  1 15:00:12 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat,  1 Feb 2014 14:00:12 +0000
Subject: SF.net SVN: gar:[22926] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fGcQ72kZ1z6j@mail.opencsw.org>

Revision: 22926
          http://sourceforge.net/p/gar/code/22926
Author:   dmichelsen
Date:     2014-02-01 14:00:10 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Fix wrong ref in scanner.pl

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

Added Paths:
-----------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-31 12:33:48 UTC (rev 22925)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-01 14:00:10 UTC (rev 22926)
@@ -22,6 +22,9 @@
 #   http://mirrorbrain.org/issues/issue138
 PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
 
+# Use patch until this is fixed:
+PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
+
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths

Added: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	2014-02-01 14:00:10 UTC (rev 22926)
@@ -0,0 +1,25 @@
+From 5ca8b992d77a3479f1081432d21f8a96382b41c6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 1 Feb 2014 14:56:06 +0100
+Subject: [PATCH] Do not take ref on a simple scalar string or it wont match
+
+---
+ tools/scanner.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/scanner.pl b/tools/scanner.pl
+index ab9bcb8..4216721 100755
+--- a/tools/scanner.pl
++++ b/tools/scanner.pl
+@@ -774,7 +774,7 @@ sub ftp_readdir
+   return unless defined $ftp;
+   my $text = ftp_cont($ftp, "$url/$name");
+ 
+-  if(!ref($text) && \$text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
++  if(!ref($text) && $text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
+ 
+     # Bug: Net::FTP wrongly reports timeouts (421) as code 550:
+     # sunsite.informatik.rwth-aachen.de: ftp dir: ftp://sunsite.informatik.rwth-aachen.de/pub/linux/opensuse/distribution/11.0/repo/debug/suse/i686
+-- 
+1.8.4.1
+

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


From dmichelsen at users.sourceforge.net  Sat Feb  1 15:08:40 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat,  1 Feb 2014 14:08:40 +0000
Subject: SF.net SVN: gar:[22927] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fGccw1CjwzBP@mail.opencsw.org>

Revision: 22927
          http://sourceforge.net/p/gar/code/22927
Author:   dmichelsen
Date:     2014-02-01 14:08:40 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Add bug location

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

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-01 14:00:10 UTC (rev 22926)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-01 14:08:40 UTC (rev 22927)
@@ -23,6 +23,7 @@
 PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
 
 # Use patch until this is fixed:
+#   http://mirrorbrain.org/issues/issue139
 PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
 
 VENDOR_URL = http://mirrorbrain.org

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


From chninkel at users.sourceforge.net  Sat Feb  1 16:11:42 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  1 Feb 2014 15:11:42 +0000
Subject: SF.net SVN: gar:[22928] csw/mgar/pkg/openssh/trunk
Message-ID: <3fGf0R55BBzHR@mail.opencsw.org>

Revision: 22928
          http://sourceforge.net/p/gar/code/22928
Author:   chninkel
Date:     2014-02-01 15:11:41 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
openssh/trunk: updated to 6.5

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 14:08:40 UTC (rev 22927)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 15:11:41 UTC (rev 22928)
@@ -12,7 +12,7 @@
 ###### Package information #######
 
 NAME = openssh
-VERSION = 6.4p1
+VERSION = 6.5p1
 GSSKEX_PATCH_VERSION = 6.3p1
 GSSKEX_PATCH_DATE = 20130920
 GARTYPE = v2

Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums	2014-02-01 14:08:40 UTC (rev 22927)
+++ csw/mgar/pkg/openssh/trunk/checksums	2014-02-01 15:11:41 UTC (rev 22928)
@@ -1 +1 @@
-a62b88b884df0b09b8a8c5789ac9e51b  openssh-6.4p1.tar.gz
+a084e7272b8cbd25afe0f5dce4802fef  openssh-6.5p1.tar.gz

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-01 14:08:40 UTC (rev 22927)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-01 15:11:41 UTC (rev 22928)
@@ -1,3 +1,9 @@
+openssh (6.5p1,REV=2014.01.31) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 31 Jan 2014 09:23:22 +0100
+
 openssh (6.4p1,REV=2013.11.09) 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  Sat Feb  1 16:12:04 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  1 Feb 2014 15:12:04 +0000
Subject: SF.net SVN: gar:[22929] csw/mgar/pkg/openssh/trunk
Message-ID: <3fGf252lfDzLq@mail.opencsw.org>

Revision: 22929
          http://sourceforge.net/p/gar/code/22929
Author:   chninkel
Date:     2014-02-01 15:12:03 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
openssh/trunk: updated GSS Key exchange patch

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

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

Removed Paths:
-------------
    csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 15:11:41 UTC (rev 22928)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 15:12:03 UTC (rev 22929)
@@ -13,8 +13,8 @@
 
 NAME = openssh
 VERSION = 6.5p1
-GSSKEX_PATCH_VERSION = 6.3p1
-GSSKEX_PATCH_DATE = 20130920
+GSSKEX_PATCH_VERSION = 6.5p1
+GSSKEX_PATCH_DATE = 20140201
 GARTYPE = v2
 
 DESCRIPTION = OpenSSH Secure Shell

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-01 15:11:41 UTC (rev 22928)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-01 15:12:03 UTC (rev 22929)
@@ -1,6 +1,7 @@
 openssh (6.5p1,REV=2014.01.31) unstable
 
   * New upstream release.
+  * Updated the GSSAPI key exchange patch
 
  -- Yann Rouillard <yann at opencsw.org>  Fri, 31 Jan 2014 09:23:22 +0100
 

Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch	2014-02-01 15:11:41 UTC (rev 22928)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch	2014-02-01 15:12:03 UTC (rev 22929)
@@ -1,2934 +0,0 @@
-diff --speed-large-files --minimal -Nru openssh-5.8p1/ChangeLog.gssapi openssh-5.8p1.new/ChangeLog.gssapi
---- openssh-5.8p1/ChangeLog.gssapi	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.8p1.new/ChangeLog.gssapi	2011-02-12 18:07:10.948345760 +0100
-@@ -0,0 +1,113 @@
-+20110101
-+  - Finally update for OpenSSH 5.6p1
-+  - Add GSSAPIServerIdentity option from Jim Basney
-+ 
-+20100308
-+  - [ Makefile.in, key.c, key.h ]
-+    Updates for OpenSSH 5.4p1
-+  - [ servconf.c ]
-+    Include GSSAPI options in the sshd -T configuration dump, and flag
-+    some older configuration options as being unsupported. Thanks to Colin 
-+    Watson.
-+  -
-+
-+20100124
-+  - [ sshconnect2.c ]
-+    Adapt to deal with additional element in Authmethod structure. Thanks to
-+    Colin Watson
-+
-+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 --speed-large-files --minimal -Nru openssh-5.8p1/Makefile.in openssh-5.8p1.new/Makefile.in
---- openssh-5.8p1/Makefile.in	2011-02-04 01:42:13.000000000 +0100
-+++ openssh-5.8p1.new/Makefile.in	2011-02-12 18:07:10.990611445 +0100
-@@ -75,6 +75,7 @@
- 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
- 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
- 	kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
-+	kexgssc.o \
- 	msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
- 	jpake.o schnorr.o ssh-pkcs11.o kr1.o
- 
-@@ -91,7 +92,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 kexecdhs.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 \
- 	sftp-server.o sftp-common.o \
- 	roaming_common.o roaming_serv.o
-diff --speed-large-files --minimal -Nru openssh-5.8p1/auth-krb5.c openssh-5.8p1.new/auth-krb5.c
---- openssh-5.8p1/auth-krb5.c	2009-12-21 00:49:22.000000000 +0100
-+++ openssh-5.8p1.new/auth-krb5.c	2011-02-12 18:07:11.002529804 +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, oerrno;
-+	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, oerrno;
-+#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:"));
- 	oerrno = errno;
-@@ -249,6 +261,7 @@
- 		return oerrno;
- 	}
- 	close(tmpfd);
-+#endif
- 
- 	return (krb5_cc_resolve(ctx, ccname, ccache));
- }
-diff --speed-large-files --minimal -Nru openssh-5.8p1/auth2-gss.c openssh-5.8p1.new/auth2-gss.c
---- openssh-5.8p1/auth2-gss.c	2007-12-02 12:59:45.000000000 +0100
-+++ openssh-5.8p1.new/auth2-gss.c	2011-02-12 18:07:11.030761708 +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);
-+	free(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)
-@@ -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 --speed-large-files --minimal -Nru openssh-5.8p1/auth2.c openssh-5.8p1.new/auth2.c
---- openssh-5.8p1/auth2.c	2010-08-31 14:36:39.000000000 +0200
-+++ openssh-5.8p1.new/auth2.c	2011-02-12 18:07:11.043418162 +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
-diff --speed-large-files --minimal -Nru openssh-5.8p1/clientloop.c openssh-5.8p1.new/clientloop.c
---- openssh-5.8p1/clientloop.c	2011-01-16 13:18:35.000000000 +0100
-+++ openssh-5.8p1.new/clientloop.c	2011-02-12 18:07:11.063578136 +0100
-@@ -111,6 +111,10 @@
- #include "msg.h"
- #include "roaming.h"
- 
-+#ifdef GSSAPI
-+#include "ssh-gss.h"
-+#endif
-+
- /* import options */
- extern Options options;
- 
-@@ -1483,6 +1487,15 @@
- 		/* Do channel operations unless rekeying in progress. */
- 		if (!rekeying) {
- 			channel_after_select(readset, writeset);
-+
-+#ifdef GSSAPI
-+			if (options.gss_renewal_rekey &&
-+			    ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
-+				debug("credentials updated - forcing rekey");
-+				need_rekeying = 1;
-+			}
-+#endif
-+
- 			if (need_rekeying || packet_need_rekeying()) {
- 				debug("need rekeying");
- 				xxx_kex->done = 0;
-diff --speed-large-files --minimal -Nru openssh-5.8p1/configure.ac openssh-5.8p1.new/configure.ac
---- openssh-5.8p1/configure.ac	2011-02-04 01:42:14.000000000 +0100
-+++ openssh-5.8p1.new/configure.ac	2011-02-12 18:07:11.092748915 +0100
-@@ -514,6 +514,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 --speed-large-files --minimal -Nru openssh-5.8p1/gss-genr.c openssh-5.8p1.new/gss-genr.c
---- openssh-5.8p1/gss-genr.c	2009-06-22 08:11:07.000000000 +0200
-+++ openssh-5.8p1.new/gss-genr.c	2011-02-12 18:07:11.108432434 +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++)
-+			free(gss_enc2oid[i].encoded);
-+		free(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) {
-+		free(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 --speed-large-files --minimal -Nru openssh-5.8p1/gss-serv-krb5.c openssh-5.8p1.new/gss-serv-krb5.c
---- openssh-5.8p1/gss-serv-krb5.c	2006-09-01 07:38:36.000000000 +0200
-+++ openssh-5.8p1.new/gss-serv-krb5.c	2011-02-12 18:07:11.123072516 +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 @@
- 	OM_uint32 maj_status, min_status;
- 	int len;
-	const char *errmsg;
-+	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 --speed-large-files --minimal -Nru openssh-5.8p1/gss-serv.c openssh-5.8p1.new/gss-serv.c
---- openssh-5.8p1/gss-serv.c	2008-05-19 07:05:07.000000000 +0200
-+++ openssh-5.8p1.new/gss-serv.c	2011-02-12 18:07:11.135178913 +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, NULL}};
-+    GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME,  NULL, {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;
- 
--	gss_buffer_desc ename;
-+	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);
-+
-+		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 --speed-large-files --minimal -Nru openssh-5.8p1/kex.c openssh-5.8p1.new/kex.c
---- openssh-5.8p1/kex.c	2010-09-24 14:11:14.000000000 +0200
-+++ openssh-5.8p1.new/kex.c	2011-02-12 18:07:11.149564726 +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
-@@ -80,6 +84,11 @@
- 	{ KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 },
- 	{ KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 },
- #endif
-+#ifdef GSSAPI
-+	{ KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, EVP_sha1 },
-+	{ KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, EVP_sha1 },
-+	{ KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, EVP_sha1 },
-+#endif
- 	{ NULL, -1, -1, NULL},
- };
- 
-diff --speed-large-files --minimal -Nru openssh-5.8p1/kex.h openssh-5.8p1.new/kex.h
---- openssh-5.8p1/kex.h	2010-09-24 14:11:14.000000000 +0200
-+++ openssh-5.8p1.new/kex.h	2011-02-12 18:07:11.161650596 +0100
-@@ -73,6 +73,9 @@
- 	KEX_DH_GEX_SHA1,
- 	KEX_DH_GEX_SHA256,
- 	KEX_ECDH_SHA2,
-+	KEX_GSS_GRP1_SHA1,
-+	KEX_GSS_GRP14_SHA1,
-+	KEX_GSS_GEX_SHA1,
- 	KEX_MAX
- };
- 
-@@ -129,6 +132,12 @@
- 	int	flags;
- 	const EVP_MD *evp_md;
- 	int	ec_nid;
-+#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 *);
-@@ -156,6 +165,11 @@
- void	 kexecdh_client(Kex *);
- void	 kexecdh_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 --speed-large-files --minimal -Nru openssh-5.8p1/kexgssc.c openssh-5.8p1.new/kexgssc.c
---- openssh-5.8p1/kexgssc.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.8p1.new/kexgssc.c	2011-02-12 18:07:11.176741991 +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)
-+			free(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);
-+	free(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");
-+
-+	free(msg_tok.value);
-+
-+	DH_free(dh);
-+	if (serverhostkey)
-+		free(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 --speed-large-files --minimal -Nru openssh-5.8p1/kexgsss.c openssh-5.8p1.new/kexgsss.c
---- openssh-5.8p1/kexgsss.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssh-5.8p1.new/kexgsss.c	2011-02-12 18:07:11.186584789 +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()))
-+			free(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));
-+
-+		free(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);
-+	free(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 --speed-large-files --minimal -Nru openssh-5.8p1/key.c openssh-5.8p1.new/key.c
---- openssh-5.8p1/key.c	2011-02-04 01:48:34.000000000 +0100
-+++ openssh-5.8p1.new/key.c	2011-02-12 18:07:11.202089386 +0100
-@@ -929,6 +929,7 @@
- 	{ "ecdsa-sha2-nistp521-cert-v01 at openssh.com", "ECDSA-CERT",
- 	    KEY_ECDSA_CERT, NID_secp521r1, 1 },
- #endif /* OPENSSL_HAS_ECC */
-+	{ "null", "null", KEY_NULL, 0, 0 },
- 	{ "ssh-rsa-cert-v00 at openssh.com", "RSA-CERT-V00",
- 	    KEY_RSA_CERT_V00, 0, 1 },
- 	{ "ssh-dss-cert-v00 at openssh.com", "DSA-CERT-V00",
-diff --speed-large-files --minimal -Nru openssh-5.8p1/key.h openssh-5.8p1.new/key.h
---- openssh-5.8p1/key.h	2010-11-05 00:19:49.000000000 +0100
-+++ openssh-5.8p1.new/key.h	2011-02-12 18:07:11.216270794 +0100
-@@ -44,6 +44,7 @@
- 	KEY_ECDSA_CERT,
- 	KEY_RSA_CERT_V00,
- 	KEY_DSA_CERT_V00,
-+	KEY_NULL,
- 	KEY_UNSPEC
- };
- enum fp_type {
-diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor.c openssh-5.8p1.new/monitor.c
---- openssh-5.8p1/monitor.c	2010-09-10 03:23:34.000000000 +0200
-+++ openssh-5.8p1.new/monitor.c	2011-02-12 18:07:11.241713537 +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);
-@@ -1692,6 +1709,13 @@
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
- 	kex->kex[KEX_ECDH_SHA2] = kexecdh_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);
-@@ -1898,6 +1922,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;
- 
-@@ -1925,6 +1952,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);
-@@ -1942,6 +1972,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);
- }
-@@ -1953,6 +1984,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);
-@@ -1979,7 +2013,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);
-@@ -1992,6 +2030,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);
-+
-+	free(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);
-+
-+	free(store.filename);
-+	free(store.envvar);
-+	free(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 --speed-large-files --minimal -Nru openssh-5.8p1/monitor.h openssh-5.8p1.new/monitor.h
---- openssh-5.8p1/monitor.h	2008-11-05 06:20:46.000000000 +0100
-+++ openssh-5.8p1.new/monitor.h	2011-02-12 18:07:11.311728071 +0100
-@@ -53,6 +53,9 @@
-	MONITOR_REQ_JPAKE_STEP2 = 56, MONITOR_ANS_JPAKE_STEP2 = 57,
-	MONITOR_REQ_JPAKE_KEY_CONFIRM = 58, MONITOR_ANS_JPAKE_KEY_CONFIRM = 59,
-	MONITOR_REQ_JPAKE_CHECK_CONFIRM = 60, MONITOR_ANS_JPAKE_CHECK_CONFIRM = 61,
-+
-+	MONITOR_REQ_GSSSIGN = 62, MONITOR_ANS_GSSSIGN = 63,
-+	MONITOR_REQ_GSSUPCREDS = 64, MONITOR_ANS_GSSUPCREDS = 65,
-
-	MONITOR_REQ_PAM_START = 100,
-	MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103,
-	MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105,
-diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.c openssh-5.8p1.new/monitor_wrap.c
---- openssh-5.8p1/monitor_wrap.c	2010-08-31 14:41:14.000000000 +0200
-+++ openssh-5.8p1.new/monitor_wrap.c	2011-02-12 18:07:11.359631731 +0100
-@@ -1232,7 +1232,7 @@
- }
- 
- int
--mm_ssh_gssapi_userok(char *user)
-+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
- {
- 	Buffer m;
- 	int authenticated = 0;
-@@ -1249,6 +1249,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 --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.h openssh-5.8p1.new/monitor_wrap.h
---- openssh-5.8p1/monitor_wrap.h	2009-03-05 14:58:22.000000000 +0100
-+++ openssh-5.8p1.new/monitor_wrap.h	2011-02-12 18:07:11.407619296 +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 --speed-large-files --minimal -Nru openssh-5.8p1/readconf.c openssh-5.8p1.new/readconf.c
---- openssh-5.8p1/readconf.c	2010-11-20 05:19:38.000000000 +0100
-+++ openssh-5.8p1.new/readconf.c	2011-02-12 18:07:11.460306621 +0100
-@@ -129,6 +129,8 @@
- 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+	oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
-+	oGssServerIdentity, 
- 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- 	oSendEnv, oControlPath, oControlMaster, oControlPersist,
- 	oHashKnownHosts,
-@@ -169,10 +171,19 @@
- 	{ "afstokenpassing", oUnsupported },
- #if defined(GSSAPI)
- 	{ "gssapiauthentication", oGssAuthentication },
-+	{ "gssapikeyexchange", oGssKeyEx },
- 	{ "gssapidelegatecredentials", oGssDelegateCreds },
-+	{ "gssapitrustdns", oGssTrustDns },
-+	{ "gssapiclientidentity", oGssClientIdentity },
-+	{ "gssapiserveridentity", oGssServerIdentity },
-+	{ "gssapirenewalforcesrekey", oGssRenewalRekey },
- #else
- 	{ "gssapiauthentication", oUnsupported },
-+	{ "gssapikeyexchange", oUnsupported },
- 	{ "gssapidelegatecredentials", oUnsupported },
-+	{ "gssapitrustdns", oUnsupported },
-+	{ "gssapiclientidentity", oUnsupported },
-+	{ "gssapirenewalforcesrekey", oUnsupported },
- #endif
- 	{ "fallbacktorsh", oDeprecated },
- 	{ "usersh", oDeprecated },
-@@ -479,10 +490,30 @@
- 		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 oGssServerIdentity:
-+		charptr = &options->gss_server_identity;
-+		goto parse_string;
-+
-+	case oGssRenewalRekey:
-+		intptr = &options->gss_renewal_rekey;
-+		goto parse_flag;
-+
- 	case oBatchMode:
- 		intptr = &options->batch_mode;
- 		goto parse_flag;
-@@ -1092,7 +1123,12 @@
- 	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->gss_server_identity = NULL;
- 	options->password_authentication = -1;
- 	options->kbd_interactive_authentication = -1;
- 	options->kbd_interactive_devices = NULL;
-@@ -1193,8 +1229,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 --speed-large-files --minimal -Nru openssh-5.8p1/readconf.h openssh-5.8p1.new/readconf.h
---- openssh-5.8p1/readconf.h	2010-11-20 05:19:38.000000000 +0100
-+++ openssh-5.8p1.new/readconf.h	2011-02-12 18:07:11.507187275 +0100
-@@ -46,7 +46,12 @@
- 	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 */
-+	char    *gss_server_identity;   /* GSSAPI target principal */
- 	int     password_authentication;	/* Try password
- 						 * authentication. */
- 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.c openssh-5.8p1.new/servconf.c
---- openssh-5.8p1/servconf.c	2010-11-20 05:19:38.000000000 +0100
-+++ openssh-5.8p1.new/servconf.c	2011-02-12 18:07:11.533252334 +0100
-@@ -97,7 +97,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;
-@@ -226,8 +229,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)
-@@ -322,7 +331,9 @@
- 	sBanner, sUseDNS, sHostbasedAuthentication,
- 	sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
- 	sClientAliveCountMax, sAuthorizedKeysFile,
--	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
-+	sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
-+	sGssKeyEx, sGssStoreRekey,
-+	sAcceptEnv, sPermitTunnel,
- 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
- 	sUsePrivilegeSeparation, sAllowAgentForwarding,
- 	sZeroKnowledgePasswordAuthentication, sHostCertificate,
-@@ -386,10 +397,20 @@
- #ifdef GSSAPI
- 	{ "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
- 	{ "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
-+	{ "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
-+	{ "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
-+	{ "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
-+	{ "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
- #else
- 	{ "gssapiauthentication", sUnsupported, SSHCFG_ALL },
- 	{ "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
- #endif
-+	{ "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
-+	{ "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
- 	{ "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
- 	{ "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
- 	{ "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
-@@ -944,10 +965,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;
-@@ -1704,7 +1737,10 @@
- #endif
- #ifdef GSSAPI
- 	dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
-+	dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
- 	dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
-+	dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
-+	dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
- #endif
- #ifdef JPAKE
- 	dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication,
-diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.h openssh-5.8p1.new/servconf.h
---- openssh-5.8p1/servconf.h	2010-11-20 05:19:38.000000000 +0100
-+++ openssh-5.8p1.new/servconf.h	2011-02-12 18:07:11.548572408 +0100
-@@ -97,7 +97,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 --speed-large-files --minimal -Nru openssh-5.8p1/ssh-gss.h openssh-5.8p1.new/ssh-gss.h
---- openssh-5.8p1/ssh-gss.h	2007-06-12 15:40:39.000000000 +0200
-+++ openssh-5.8p1.new/ssh-gss.h	2011-02-12 18:07:11.567306608 +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 --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config openssh-5.8p1.new/ssh_config
---- openssh-5.8p1/ssh_config	2010-01-12 09:40:27.000000000 +0100
-+++ openssh-5.8p1.new/ssh_config	2011-02-12 18:07:11.580240516 +0100
-@@ -26,6 +26,8 @@
- #   HostbasedAuthentication no
- #   GSSAPIAuthentication no
- #   GSSAPIDelegateCredentials no
-+#   GSSAPIKeyExchange no
-+#   GSSAPITrustDNS no
- #   BatchMode no
- #   CheckHostIP yes
- #   AddressFamily any
-diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config.5 openssh-5.8p1.new/ssh_config.5
---- openssh-5.8p1/ssh_config.5	2010-12-26 04:26:48.000000000 +0100
-+++ openssh-5.8p1.new/ssh_config.5	2011-02-12 18:07:11.600266821 +0100
-@@ -508,11 +508,43 @@
- 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 GSSAPIServerIdentity
-+If set, specifies the GSSAPI server identity that ssh should expect when 
-+connecting to the server. The default is unset, which means that the
-+expected GSSAPI server identity will be determined from the target
-+hostname.
- .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 --speed-large-files --minimal -Nru openssh-5.8p1/sshconnect2.c openssh-5.8p1.new/sshconnect2.c
---- openssh-5.8p1/sshconnect2.c	2010-12-01 02:21:51.000000000 +0100
-+++ openssh-5.8p1.new/sshconnect2.c	2011-02-12 18:07:11.623078773 +0100
-@@ -159,9 +159,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;
-@@ -196,6 +221,17 @@
- 	if (options.kex_algorithms != NULL)
- 		myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
- 
-+#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);
-+		free(gss);
-+	}
-+#endif
-+
- 	if (options.rekey_limit || options.rekey_interval)
- 		packet_set_rekey_limits((u_int32_t)options.rekey_limit,
- 
-@@ -206,10 +242,30 @@
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
- 	kex->kex[KEX_ECDH_SHA2] = kexecdh_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;
-+		if (options.gss_server_identity) {
-+			kex->gss_host = options.gss_server_identity;
-+		} else {
-+			kex->gss_host = gss_host;
-+        }
-+	}
-+#endif
-+
- 	xxx_kex = kex;
- 
- 	dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
-@@ -304,6 +360,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 *);
-@@ -319,6 +376,11 @@
- 
- Authmethod authmethods[] = {
- #ifdef GSSAPI
-+	{"gssapi-keyex",
-+		userauth_gsskeyex,
-+		NULL,
-+		&options.gss_authentication,
-+		NULL},
- 	{"gssapi-with-mic",
- 		userauth_gssapi,
- 		NULL,
-@@ -625,19 +687,31 @@
- 	static u_int mech = 0;
- 	OM_uint32 min;
- 	int ok = 0;
-+	const char *gss_host;
-+
-+	if (options.gss_server_identity)
-+		gss_host = options.gss_server_identity;
-+	else 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++;
-@@ -734,8 +808,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");
-@@ -845,6 +919,48 @@
- 	free(msg);
- 	free(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 --speed-large-files --minimal -Nru openssh-5.8p1/sshd.c openssh-5.8p1.new/sshd.c
---- openssh-5.8p1/sshd.c	2011-01-11 07:20:31.000000000 +0100
-+++ openssh-5.8p1.new/sshd.c	2011-02-12 18:07:11.656005267 +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>
-@@ -1590,10 +1594,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);
-@@ -1922,6 +1929,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
-@@ -2303,6 +2364,48 @@
- 
- 	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;
-@@ -2310,6 +2413,13 @@
- 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
- 	kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
- 	kex->kex[KEX_ECDH_SHA2] = kexecdh_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 --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config openssh-5.8p1.new/sshd_config
---- openssh-5.8p1/sshd_config	2010-09-10 03:20:12.000000000 +0200
-+++ openssh-5.8p1.new/sshd_config	2011-02-12 18:07:11.668077725 +0100
-@@ -72,6 +72,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 --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config.5 openssh-5.8p1.new/sshd_config.5
---- openssh-5.8p1/sshd_config.5	2010-12-26 04:26:48.000000000 +0100
-+++ openssh-5.8p1.new/sshd_config.5	2011-02-12 18:07:11.685676774 +0100
-@@ -423,12 +423,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-6.5p1-gsskex-all-20140201.patch (from rev 22928, csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh-6.5p1-gsskex-all-20140201.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/openssh-6.5p1-gsskex-all-20140201.patch	2014-02-01 15:12:03 UTC (rev 22929)
@@ -0,0 +1,2938 @@
+diff --speed-large-files --minimal -Nru openssh-5.8p1/ChangeLog.gssapi openssh-5.8p1.new/ChangeLog.gssapi
+--- openssh-5.8p1/ChangeLog.gssapi	1970-01-01 01:00:00.000000000 +0100
++++ openssh-5.8p1.new/ChangeLog.gssapi	2011-02-12 18:07:10.948345760 +0100
+@@ -0,0 +1,113 @@
++20110101
++  - Finally update for OpenSSH 5.6p1
++  - Add GSSAPIServerIdentity option from Jim Basney
++ 
++20100308
++  - [ Makefile.in, key.c, key.h ]
++    Updates for OpenSSH 5.4p1
++  - [ servconf.c ]
++    Include GSSAPI options in the sshd -T configuration dump, and flag
++    some older configuration options as being unsupported. Thanks to Colin 
++    Watson.
++  -
++
++20100124
++  - [ sshconnect2.c ]
++    Adapt to deal with additional element in Authmethod structure. Thanks to
++    Colin Watson
++
++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 --speed-large-files --minimal -Nru openssh-5.8p1/Makefile.in openssh-5.8p1.new/Makefile.in
+--- openssh-5.8p1/Makefile.in	2011-02-04 01:42:13.000000000 +0100
++++ openssh-5.8p1.new/Makefile.in	2011-02-12 18:07:10.990611445 +0100
+@@ -75,6 +75,7 @@
+ 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+ 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
+ 	kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
++	kexgssc.o \
+ 	msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
+ 	jpake.o schnorr.o ssh-pkcs11.o kr1.o
+ 
+@@ -91,7 +92,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 kexecdhs.o \
+ 	kexc25519s.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 \
+ 	sftp-server.o sftp-common.o \
+ 	roaming_common.o roaming_serv.o
+diff --speed-large-files --minimal -Nru openssh-5.8p1/auth-krb5.c openssh-5.8p1.new/auth-krb5.c
+--- openssh-5.8p1/auth-krb5.c	2009-12-21 00:49:22.000000000 +0100
++++ openssh-5.8p1.new/auth-krb5.c	2011-02-12 18:07:11.002529804 +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, oerrno;
++	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, oerrno;
++#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:"));
+ 	oerrno = errno;
+@@ -249,6 +261,7 @@
+ 		return oerrno;
+ 	}
+ 	close(tmpfd);
++#endif
+ 
+ 	return (krb5_cc_resolve(ctx, ccname, ccache));
+ }
+diff --speed-large-files --minimal -Nru openssh-5.8p1/auth2-gss.c openssh-5.8p1.new/auth2-gss.c
+--- openssh-5.8p1/auth2-gss.c	2007-12-02 12:59:45.000000000 +0100
++++ openssh-5.8p1.new/auth2-gss.c	2011-02-12 18:07:11.030761708 +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);

@@ 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 maciej at opencsw.org  Sat Feb  1 18:02:58 2014
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Sat, 1 Feb 2014 17:02:58 +0000
Subject: SF.net SVN: gar:[22910]
	csw/mgar/gar/v2/lib/python/compare_catalog.py
In-Reply-To: <CALtRa-4KeAyn05HExaewfcuTAcF4UHZotooxExOzwPf-aQMh4Q@mail.gmail.com>
References: <3fDCkQ4HZ9z6v@mail.opencsw.org>
	<CALtRa-4KeAyn05HExaewfcuTAcF4UHZotooxExOzwPf-aQMh4Q@mail.gmail.com>
Message-ID: <CALtRa-4a_6tHJY1R70Cpk35zAE7-BNk+vDvhMpY5U=VDy_8vXA@mail.gmail.com>

Sending again
Em 28/01/2014 16:36, "Maciej (Matchek) Blizi?ski" <maciej at opencsw.org>
escreveu:

> Hi Carsten,
>
> More comments! I hope you'll be able to reduce the size of this script.
>
> 2014-01-28 <cgrzemba at users.sourceforge.net>
>
>> Revision: 22910
>>           http://sourceforge.net/p/gar/code/22910
>> Author:   cgrzemba
>> Date:     2014-01-28 16:20:56 +0000 (Tue, 28 Jan 2014)
>> Log Message:
>> -----------
>> use argparse, add out of order pkg compare
>>
>> Modified Paths:
>> --------------
>>     csw/mgar/gar/v2/lib/python/compare_catalog.py
>>
>> Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
>> ===================================================================
>> --- csw/mgar/gar/v2/lib/python/compare_catalog.py       2014-01-28
>> 12:36:44 UTC (rev 22909)
>> +++ csw/mgar/gar/v2/lib/python/compare_catalog.py       2014-01-28
>> 16:20:56 UTC (rev 22910)
>> @@ -2,55 +2,108 @@
>>
>>  import cjson
>>  import logging
>> -import optparse
>> +import argparse
>>  import urllib2
>>  import sys
>> +import re
>>
>>  logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s')
>>  logger = logging.getLogger(__name__)
>>
>> +remote_scheme = ['http','https']
>> +local_scheme = ['file']
>> +
>> +def prepareCatListFromURI(uri):
>> +    catlst = []
>> +    if '://' in uri:
>>
>
> We can say that you have to have a valid URI that either starts with
> http:// or https:// or file://
>
>
>> +        scheme = uri.split(':')[0]
>> +        if scheme in remote_scheme:
>> +            logger.info("fetch remote %s", uri)
>> +            data = urllib2.urlopen(uri).read()
>>
>
> Let's use the requests module. We have a package.
>
>
> http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/rest.py#L250
>
>
>> +            catlst = cjson.decode(data)
>> +            for e in catlst:
>> +                del e[9]
>> +            return catlst
>> +        elif scheme in local_scheme:
>> +            uri = re.sub('.*://','',uri)
>> +        else:
>> +            logger.error('unsupported URI format')
>> +            sys.exit(4)
>> +    with open(uri) as lcat:
>> +        logger.info("fetch local %s", uri)
>> +        for line in lcat: # skip 4 lines header '# CREATIONDATE'
>>
>
> We already have a parser, please use it.
>
> http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/lib/python/catalog.py#L66
>
>
>> +            if line.startswith("# CREATIONDATE"):
>> +                break
>> +        for line in lcat:
>> +            if line.startswith("-----BEGIN PGP SIGNATURE"):
>> +                break
>> +            catlst.append(line.rstrip().split(' '))
>> +    return catlst
>> +
>> +def compareOutOfOrder(a_catlst, b_catlst, idx):
>> +    a_pkgName2Idx = {}
>> +    i = idx
>> +    for j in range(idx,len(a_catlst)):
>> +        a_pkgName2Idx[a_catlst[j][0]] = j
>> +    # import pdb; pdb.set_trace()
>> +    while i < len(b_catlst):
>> +        if b_catlst[i][0] in a_pkgName2Idx:
>> +            if b_catlst[i] != a_catlst[a_pkgName2Idx[b_catlst[i][0]]]:
>> +                logger.warning("pkgs different at {0},{1}: {2}
>> {3}".format(i,a_pkgName2Idx[b_catlst[i][0]],a_catlst[a_pkgName2Idx[b_catlst[i][0]]],b_catlst[i]))
>> +                sys.exit(1)
>> +        else:
>> +            logger.warning("not in acat: %s", b_catlst[i])
>> +            sys.exit(1)
>> +        i += 1
>> +    b_pkgName2Idx = {}
>> +    for j in range(idx,len(b_catlst)):
>> +        b_pkgName2Idx[b_catlst[j][0]] = j
>> +    # import pdb; pdb.set_trace()
>> +    i = idx
>> +    while i < len(a_catlst):
>> +        if a_catlst[i][0] not in b_pkgName2Idx:
>> +            logger.warning("not in bcat: %s", a_catlst[i])
>> +            sys.exit(1)
>> +        i += 1
>>
>
> Why not convert both to a data structure consisting of basic types: nested
> lists and dicts? Then you can just compare them using the == operator. If
> you wanted some diagnostic output to display the difference, you can always
> serialize them and display the textual diff - it will save you lots of
> lines of code.
>
>
>>  def main():
>> -    parser = optparse.OptionParser()
>> -    parser.add_option("-v","--verbose", dest="verbose",
>> action="store_true",default=False)
>> -    parser.add_option("-a","--existing-catalog", dest="oldcatalog",
>> -                    help='set URI of existing catalog', metavar =
>> 'catalog')
>> -    parser.add_option("-b","--new-catalog", dest="newcatalog",
>> -                    help='set URI of catalog to generate', metavar =
>> 'catalog')
>> -    options, args = parser.parse_args()
>> +    parser = argparse.ArgumentParser()
>> +    parser.add_argument("-v","--verbose", dest="verbose",
>> action="store_true",default=False)
>> +    parser.add_argument("acat",help="catalog URI")
>> +    parser.add_argument("bcat",help="catalog URI")
>> +    args = parser.parse_args()
>>      opterror = False
>> -    if options.verbose:
>> +    if args.verbose:
>>          logger.setLevel(logging.INFO)
>> -    if options.debug:
>> -        logger.setLevel(logging.DEBUG)
>> -    if options.newcatalog is None or options.oldcatalog is None:
>> -        logger.error("mandatory option missing")
>> +    if args.acat is None or args.bcat is None:
>> +        logger.error("mandatory args 'acat' 'bcat' missing")
>>          sys.exit(2)
>> -    oldcat = options.oldcatalog
>> -    newcat = options.newcatalog
>> -    logger.info(" compare %s with %s", oldcat, newcat)
>>
>> -    data = urllib2.urlopen(oldcat).read()
>> -    a_catlst = cjson.decode(data)
>> -    for e in a_catlst:
>> -        del e[9]
>> -    b_catlst = []
>> -    with open(newcat) as nc:
>> -        for i in range(4): # skip 4 lines header
>> -            nc.readline()
>> -        for cl in nc.readlines():
>> -            if "-----BEGIN" == cl.split(' ')[0]:
>> -                break
>> -            b_catlst.append(cl.rstrip().split(' '))
>> +    logger.info("fetch cat_a %s", args.acat)
>> +    a_catlst = prepareCatListFromURI(args.acat)
>> +
>> +    logger.info("fetch cat_b %s", args.bcat)
>> +    b_catlst = prepareCatListFromURI(args.bcat)
>> +
>> +    logger.info("compare ...")
>>      if len(a_catlst) != len(b_catlst):
>> -        logger.warning("a has %d, b has %d
>> packges",len(a_catlst),len(b_catlst))
>> -        sys.exit(1)
>> +        logger.warning("a has %d, b has %d
>> packages",len(a_catlst),len(b_catlst))
>> +        # sys.exit(1)
>>      for i in range(len(b_catlst)):
>> -        if b_catlst[i] != a_catlst[i] :
>> -            logger.warning("a is {0}, b is
>> {1}".format(a_catlst[i],b_catlst[i]))
>> -            sys.exit(1)
>> +        try:
>> +            if b_catlst[i] != a_catlst[i] :
>> +                if b_catlst[i][0] != a_catlst[i][0]:
>> +                    logger.warning("packages out of order: A: %s; B:
>> %s",a_catlst[i][0], b_catlst[i][0])
>>
>
> Hm, what I meant is that out of order comparing:
>
> 1. should just work
> 2. should not be a special case
>
> The code should use such data structures that the ordering doesn't matter.
> For example, if you use a dict, then the ordering doesn't matter:
>
> >>> a = dict([('a', 1), ('b', 2)])
> >>> b = dict([('b', 2), ('a', 1)])
> >>> a == b
> True
>
>
>
>> +                    compareOutOfOrder(a_catlst, b_catlst, i)
>> +                    break
>> +                else:
>> +                    logger.warning("pkgs different: {0}
>> {1}".format(a_catlst[i],b_catlst[i]))
>> +                    sys.exit(1)
>> +        except IndexError as e:
>> +            logger.info("package %s not in acat", b_catlst[i])
>>
>>      # import pdb; pdb.set_trace()
>> -    logger.debug("catalogs are same")
>> +    logger.info("catalogs are same")
>>      sys.exit(0)
>>
>>
>>
>> This was sent by the SourceForge.net collaborative development platform,
>> the world's largest Open Source development site.
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20140201/35337105/attachment.html>

From chninkel at users.sourceforge.net  Sat Feb  1 19:16:10 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  1 Feb 2014 18:16:10 +0000
Subject: SF.net SVN: gar:[22930] csw/mgar/pkg/openssh/trunk/Makefile
Message-ID: <3fGk5H5N4Hzb4@mail.opencsw.org>

Revision: 22930
          http://sourceforge.net/p/gar/code/22930
Author:   chninkel
Date:     2014-02-01 18:16:09 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
openssh/trunk: removed CSWlibgssapi-krb5-2 dependency as it contents has been merged into CSWlibkrb5-3

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 15:12:03 UTC (rev 22929)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 18:16:09 UTC (rev 22930)
@@ -35,13 +35,22 @@
 CATALOGNAME_CSWopenssh = openssh
 SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server 
 BUILD_DEP_PKGS = CSWautoconf CSWlibssl-dev CSWlibz-dev
-RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopenssh-client
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibz1
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWopenssh += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWopenssh += CSWopenssh-client
 
+
+
 OBSOLETED_BY_CSWopenssh = CSWossh
 
 CATALOGNAME_CSWopenssh-client = openssh_client
 SPKG_DESC_CSWopenssh-client = OpenSSH Secure Shell client 
-RUNTIME_DEP_PKGS_CSWopenssh-client = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2 
+RUNTIME_DEP_PKGS_CSWopenssh-client += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWopenssh-client += CSWlibz1
+RUNTIME_DEP_PKGS_CSWopenssh-client += CSWlibkrb5-3
 
 OBSOLETED_BY_CSWopenssh-client = CSWosshclient
 

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


From chninkel at users.sourceforge.net  Sat Feb  1 21:41:06 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  1 Feb 2014 20:41:06 +0000
Subject: SF.net SVN: gar:[22931] csw/mgar/pkg/openssh/trunk/Makefile
Message-ID: <3fGnJW45Jdzl1@mail.opencsw.org>

Revision: 22931
          http://sourceforge.net/p/gar/code/22931
Author:   chninkel
Date:     2014-02-01 20:41:03 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
openssh/trunk: workaround solaris 10 sparc linking issue

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 18:16:09 UTC (rev 22930)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-02-01 20:41:03 UTC (rev 22931)
@@ -42,8 +42,12 @@
 RUNTIME_DEP_PKGS_CSWopenssh += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWopenssh += CSWopenssh-client
 
+# Linking on sparc gives an additional dependency
+# probably because of the current bug with Solaris 10
+# sparc linker (see http://lists.opencsw.org/pipermail/maintainers/2013-November/018780.html)
+RUNTIME_DEP_PKGS_CSWopenssh += $(RUNTIME_DEP_PKGS_CSWopenssh_$(GARCH))
+RUNTIME_DEP_PKGS_CSWopenssh_sparc += CSWlibintl8
 
-
 OBSOLETED_BY_CSWopenssh = CSWossh
 
 CATALOGNAME_CSWopenssh-client = openssh_client
@@ -52,6 +56,12 @@
 RUNTIME_DEP_PKGS_CSWopenssh-client += CSWlibz1
 RUNTIME_DEP_PKGS_CSWopenssh-client += CSWlibkrb5-3
 
+# Linking on sparc gives an additional dependency
+# probably because of the current bug with Solaris 10
+# sparc linker (see http://lists.opencsw.org/pipermail/maintainers/2013-November/018780.html)
+RUNTIME_DEP_PKGS_CSWopenssh-client += $(RUNTIME_DEP_PKGS_CSWopenssh-client_$(GARCH))
+RUNTIME_DEP_PKGS_CSWopenssh-client_sparc += CSWlibintl8
+
 OBSOLETED_BY_CSWopenssh-client = CSWosshclient
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386

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


From rthurner at users.sourceforge.net  Sun Feb  2 01:56:30 2014
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun,  2 Feb 2014 00:56:30 +0000
Subject: SF.net SVN: gar:[22932] csw/mgar/pkg/mercurial/trunk
Message-ID: <3fGtzC4Mq3zwX@mail.opencsw.org>

Revision: 22932
          http://sourceforge.net/p/gar/code/22932
Author:   rthurner
Date:     2014-02-02 00:56:30 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
mercurial/trunk: upgrade to hg-2.9

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile	2014-02-01 20:41:03 UTC (rev 22931)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2014-02-02 00:56:30 UTC (rev 22932)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 2.8.1
+VERSION = 2.9
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2014-02-01 20:41:03 UTC (rev 22931)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2014-02-02 00:56:30 UTC (rev 22932)
@@ -1 +1 @@
-bede5869f9b5d09ab3269bac472495e7  mercurial-2.8.1.tar.gz
+de902a5300beb16c778bc88949832e94  mercurial-2.9.tar.gz

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


From cgrzemba at users.sourceforge.net  Sun Feb  2 21:43:31 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Sun,  2 Feb 2014 20:43:31 +0000
Subject: SF.net SVN: gar:[22933] csw/mgar/gar/v2/lib/python/compare_catalog.py
Message-ID: <3fHPK16mSRz4Q@mail.opencsw.org>

Revision: 22933
          http://sourceforge.net/p/gar/code/22933
Author:   cgrzemba
Date:     2014-02-02 20:43:29 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
implement dictionary compare

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

Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-02 00:56:30 UTC (rev 22932)
+++ csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-02 20:43:29 UTC (rev 22933)
@@ -6,13 +6,34 @@
 import urllib2
 import sys
 import re
+from lib.python import catalog
 
 logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s')
 logger = logging.getLogger(__name__)
 
 remote_scheme = ['http','https']
 local_scheme = ['file']
+catalog_keys = ['catalogname','version','pkgname','file_basename',
+                    'md5sum','size','deps','category','i_deps']
 
+def SplitPkgList(pkglist):
+      if not pkglist:
+        pkglist = ()
+      elif pkglist == "none":
+        pkglist = ()
+      else:
+        pkglist = tuple(pkglist.split("|"))
+      return pkglist
+
+def convToDict(catlst):
+    catdict = []
+    for entry in catlst:
+        del entry[9]
+	entry[6] = SplitPkgList(entry[6])
+	entry[8] = SplitPkgList(entry[8])
+        catdict.append(dict(zip(catalog_keys,entry)))
+    return catdict
+
 def prepareCatListFromURI(uri):
     catlst = []
     if '://' in uri:
@@ -20,52 +41,14 @@
         if scheme in remote_scheme:
             logger.info("fetch remote %s", uri)
             data = urllib2.urlopen(uri).read()
-            catlst = cjson.decode(data)
-            for e in catlst:
-                del e[9]
-            return catlst
+            return convToDict(cjson.decode(data))
         elif scheme in local_scheme:
             uri = re.sub('.*://','',uri)
         else:
             logger.error('unsupported URI format')
             sys.exit(4)
-    with open(uri) as lcat:
-        logger.info("fetch local %s", uri)
-        for line in lcat: # skip 4 lines header '# CREATIONDATE'
-            if line.startswith("# CREATIONDATE"): 
-                break
-        for line in lcat:
-            if line.startswith("-----BEGIN PGP SIGNATURE"): 
-                break
-            catlst.append(line.rstrip().split(' '))
-    return catlst
-            
-def compareOutOfOrder(a_catlst, b_catlst, idx):
-    a_pkgName2Idx = {}
-    i = idx 
-    for j in range(idx,len(a_catlst)):
-        a_pkgName2Idx[a_catlst[j][0]] = j
-    # import pdb; pdb.set_trace()
-    while i < len(b_catlst):
-        if b_catlst[i][0] in a_pkgName2Idx:
-            if b_catlst[i] != a_catlst[a_pkgName2Idx[b_catlst[i][0]]]:
-                logger.warning("pkgs different at {0},{1}: {2} {3}".format(i,a_pkgName2Idx[b_catlst[i][0]],a_catlst[a_pkgName2Idx[b_catlst[i][0]]],b_catlst[i]))
-                sys.exit(1)
-        else:
-            logger.warning("not in acat: %s", b_catlst[i])
-            sys.exit(1)
-        i += 1 
-    b_pkgName2Idx = {}
-    for j in range(idx,len(b_catlst)):
-        b_pkgName2Idx[b_catlst[j][0]] = j
-    # import pdb; pdb.set_trace()
-    i = idx
-    while i < len(a_catlst):
-        if a_catlst[i][0] not in b_pkgName2Idx:
-            logger.warning("not in bcat: %s", a_catlst[i])
-            sys.exit(1)
-        i += 1 
-        
+    return catalog.OpencswCatalog(open(uri)).GetCatalogData()
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("-v","--verbose", dest="verbose", action="store_true",default=False)
@@ -86,26 +69,15 @@
     b_catlst = prepareCatListFromURI(args.bcat)
 
     logger.info("compare ...")
-    if len(a_catlst) != len(b_catlst):
-        logger.warning("a has %d, b has %d packages",len(a_catlst),len(b_catlst))
-        # sys.exit(1)
-    for i in range(len(b_catlst)):
-        try:
-            if b_catlst[i] != a_catlst[i] :
-                if b_catlst[i][0] != a_catlst[i][0]: 
-                    logger.warning("packages out of order: A: %s; B: %s",a_catlst[i][0], b_catlst[i][0])
-                    compareOutOfOrder(a_catlst, b_catlst, i)
-                    break
-                else:
-                    logger.warning("pkgs different: {0} {1}".format(a_catlst[i],b_catlst[i]))
-                    sys.exit(1)
-        except IndexError as e:
-            logger.info("package %s not in acat", b_catlst[i])
-            
-    # import pdb; pdb.set_trace()
-    logger.info("catalogs are same")
-    sys.exit(0)
+    if a_catlst == b_catlst:
+        logger.info("catalogs are same")
+        sys.exit(0)
+    else:
+        for i in range(len(a_catlst)):
+	    for k in catalog_keys:
+                if a_catlst[i][k] != b_catlst[i][k]:
+                    logger.warning("catalogs are different; package index:%d, kex: %s", i, k);
+        sys.exit(1)
 
-
 if __name__ == '__main__':
     main()

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


From dmichelsen at users.sourceforge.net  Sun Feb  2 21:52:14 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun,  2 Feb 2014 20:52:14 +0000
Subject: SF.net SVN: gar:[22934] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fHPWW0lXCz8q@mail.opencsw.org>

Revision: 22934
          http://sourceforge.net/p/gar/code/22934
Author:   dmichelsen
Date:     2014-02-02 20:52:12 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Update to 2.18.0, add apache pre-/post-scripts, more reinplacements

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

Added Paths:
-----------
    csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.postinstall
    csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove
    csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.postinstall
    csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.preremove

Removed Paths:
-------------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Change-default-for-getaddrinfo.patch
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-02 20:43:29 UTC (rev 22933)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-02 20:52:12 UTC (rev 22934)
@@ -2,27 +2,19 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mirrorbrain
-VERSION = 2.17.0
+VERSION = 2.18.0
 GARTYPE = v2
 
 DESCRIPTION = Content distribution tool
 
 MASTER_SITES = http://mirrorbrain.org/files/releases/
 DISTFILES  = $(DISTNAME).tar.gz
+DTSTFILES += CSWap2-mod-autoindex-mb.postinstall
+DTSTFILES += CSWap2-mod-autoindex-mb.preremove
+DTSTFILES += CSWap2-mod-mirrorbrain.postinstall
+DTSTFILES += CSWap2-mod-mirrorbrain.preremove
 
 # Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue130
-PATCHFILES += 0001-Make-geoip-database-position-adjustable.patch
-
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue135
-PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
-
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue138
-PATCHFILES += 0001-Exit-if-geoip-file-cannot-be-opened.patch
-
-# Use patch until this is fixed:
 #   http://mirrorbrain.org/issues/issue139
 PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
 
@@ -93,6 +85,10 @@
 REINPLACE_WITH_python = \#!$(bindir)/python
 REINPLACE_FILES_python += tools/null-rsync
 REINPLACE_FILES_python += mirrorprobe/mirrorprobe.py
+REINPLACE_FILES_python += tools/bdecode
+REINPLACE_FILES_python += tools/rsyncinfo
+REINPLACE_FILES_python += tools/rsyncusers
+REINPLACE_FILES_python += tools/create_timestamp
 
 REINPLACEMENTS += perl
 REINPLACE_MATCH_perl = \#!.*perl.*
@@ -103,12 +99,18 @@
 REINPLACE_MATCH_mbconf = /etc/mirrorbrain.conf
 REINPLACE_WITH_mbconf = $(sysconfdir)/mirrorbrain.conf
 REINPLACE_FILES_mbconf += tools/scanner.pl
+REINPLACE_FILES_mbconf += mirrorprobe/mirrorprobe.py
 
+REINPLACEMENTS += mplog
+REINPLACE_MATCH_mplog = /var/log/mirrorbrain/mirrorprobe.log
+REINPLACE_WITH_mplog = $(localstatedur)/mirrorbrain/mirrorprobe.log
+REINPLACE_FILES_mplog += mirrorprobe/mirrorprobe.py
+
 # The language must be in lower case
-REINPLACEMENTS += sql
-REINPLACE_MATCH_sql = 'SQL'
-REINPLACE_WITH_sql = 'sql'
-REINPLACE_FILES_sql += sql/schema-postgresql.sql
+#REINPLACEMENTS += sql
+#REINPLACE_MATCH_sql = 'SQL'
+#REINPLACE_WITH_sql = 'sql'
+#REINPLACE_FILES_sql += sql/schema-postgresql.sql
 
 GEOIPCITYFILE = $(sharedstatedir)/GeoIP/GeoIPCity.dat
 GEOIPFILE = $(sharedstatedir)/GeoIP/GeoIP.dat
@@ -142,6 +144,10 @@
 	ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_continent $(DESTDIR)$(bindir)/geoiplookup_continent
 	ginstall -m 0755 $(WORKSRC)/tools/null-rsync $(DESTDIR)$(bindir)/null-rsync
 	ginstall -m 0755 $(WORKSRC)/tools/scanner.pl $(DESTDIR)$(bindir)/scanner
+	ginstall -m 0755 $(WORKSRC)/tools/bdecode $(DESTDIR)$(bindir)/bdecode
+	ginstall -m 0755 $(WORKSRC)/tools/rsyncinfo $(DESTDIR)$(bindir)/rsyncinfo
+	ginstall -m 0755 $(WORKSRC)/tools/rsyncusers $(DESTDIR)$(bindir)/rsyncusers
+	ginstall -m 0755 $(WORKSRC)/tools/create_timestamp $(DESTDIR)$(bindir)/create_timestamp
 	ginstall -m 0755 $(WORKSRC)/mirrorprobe/mirrorprobe.py $(DESTDIR)$(bindir)/mirrorprobe
 	ginstall -d $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql
 	ginstall -m 0644 $(WORKSRC)/sql/initialdata-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/initialdata-postgresql.sql

Modified: csw/mgar/pkg/mirrorbrain/trunk/checksums
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-02 20:43:29 UTC (rev 22933)
+++ csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-02 20:52:12 UTC (rev 22934)
@@ -1 +1 @@
-c0556adb5c5eef8983b517f938375abc  mirrorbrain-2.17.0.tar.gz
+b0b9172578cb567aec6eb7a164fba657  mirrorbrain-2.18.0.tar.gz

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

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch	2014-02-02 20:43:29 UTC (rev 22933)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Exit-if-geoip-file-cannot-be-opened.patch	2014-02-02 20:52:12 UTC (rev 22934)
@@ -1,43 +0,0 @@
-From b9bad73a01288801847ba7f01c1980453885cab7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 26 Jan 2014 21:28:31 +0100
-Subject: [PATCH] Exit if geoip file cannot be opened
-
----
- tools/geoiplookup_city.c      | 4 ++++
- tools/geoiplookup_continent.c | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/tools/geoiplookup_city.c b/tools/geoiplookup_city.c
-index 2b33c1d..6faed7e 100644
---- a/tools/geoiplookup_city.c
-+++ b/tools/geoiplookup_city.c
-@@ -58,6 +58,10 @@ int main(int argc, char **argv) {
-         }
- 
- 	gip = GeoIP_open(geoipfilename, GEOIP_STANDARD);
-+	if( gip == NULL ) {
-+		printf("An error occured during GeoIP_open\n");
-+		return 1;
-+	}
- 	edition = GeoIP_database_edition(gip);
- 
- 	if (edition == GEOIP_COUNTRY_EDITION) {
-diff --git a/tools/geoiplookup_continent.c b/tools/geoiplookup_continent.c
-index 983afe2..871b247 100644
---- a/tools/geoiplookup_continent.c
-+++ b/tools/geoiplookup_continent.c
-@@ -56,6 +56,10 @@ int main(int argc, char **argv) {
-         }
- 
- 	gip = GeoIP_open(geoipfilename, GEOIP_STANDARD);
-+	if( gip == NULL ) {
-+		printf("An error occured during GeoIP_open\n");
-+		return 1;
-+	}
- 	edition = GeoIP_database_edition(gip);
- 
- 	if (edition == GEOIP_COUNTRY_EDITION) {
--- 
-1.8.4.1
-

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch	2014-02-02 20:43:29 UTC (rev 22933)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Make-geoip-database-position-adjustable.patch	2014-02-02 20:52:12 UTC (rev 22934)
@@ -1,46 +0,0 @@
-From 8fc9dd041d6c86b62ef81c69f9a121941799be02 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 19 Dec 2013 23:14:38 +0100
-Subject: [PATCH] Make geoip database position adjustable
-
----
- tools/geoiplookup_city.c      | 6 ++++--
- tools/geoiplookup_continent.c | 2 ++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tools/geoiplookup_city.c b/tools/geoiplookup_city.c
-index 9c1c24e..2b33c1d 100644
---- a/tools/geoiplookup_city.c
-+++ b/tools/geoiplookup_city.c
-@@ -27,10 +27,12 @@
- #include <GeoIP.h>
- #include <GeoIPCity.h>
- 
--#define DEFAULT_GEOIPFILE "/var/lib/GeoIP/GeoLiteCity.dat"
-+#ifndef DEFAULT_GEOIPCITYFILE
-+#define DEFAULT_GEOIPCITYFILE "/var/lib/GeoIP/GeoLiteCity.dat"
-+#endif
- 
- int main(int argc, char **argv) {
--	const char *geoipfilename = DEFAULT_GEOIPFILE;
-+	const char *geoipfilename = DEFAULT_GEOIPCITYFILE;
- 	GeoIP *gip = NULL;
- 	GeoIPRecord *gir = NULL;
- 	char *name;
-diff --git a/tools/geoiplookup_continent.c b/tools/geoiplookup_continent.c
-index 1691e8a..983afe2 100644
---- a/tools/geoiplookup_continent.c
-+++ b/tools/geoiplookup_continent.c
-@@ -25,7 +25,9 @@
- #include <GeoIP.h>
- #include <GeoIPCity.h>
- 
-+#ifndef DEFAULT_GEOIPFILE
- #define DEFAULT_GEOIPFILE "/var/lib/GeoIP/GeoIP.dat"
-+#endif
- 
- int main(int argc, char **argv) {
- 	const char *geoipfilename = DEFAULT_GEOIPFILE;
--- 
-1.8.3.4
-

Copied: csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.postinstall (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall)
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.postinstall	2014-02-02 20:52:12 UTC (rev 22934)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+# Disable the autoindex module
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    autoindex mod_autoindex.so
+# Enable the autoindex_mb module
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    autoindex_mb mod_autoindex_mb.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_autoindex_mb is enabled in httpd.conf but the server was not restarted.
+        mod_autoindex has been disabled in httpd.conf as it is incompatible with mod_autoindex_mb.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Copied: csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.preremove)
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove	2014-02-02 20:52:12 UTC (rev 22934)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the autoindex_mb module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    asn mod_autoindex_mb.so
+
+cat <<END
+
+NOTICE: mod_autoindex_mb is disabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Copied: csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.postinstall (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall)
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.postinstall	2014-02-02 20:52:12 UTC (rev 22934)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the mirrorbrain module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    mirrorbrain mod_mirrorbrain.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_mirrorbrain is enabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Copied: csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.preremove (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.preremove)
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.preremove	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-mirrorbrain.preremove	2014-02-02 20:52:12 UTC (rev 22934)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the mirrorbrain module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    mirrorbrain mod_mirrorbrain.so
+
+cat <<END
+
+NOTICE: mod_mirrorbrain is disabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

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


From dmichelsen at users.sourceforge.net  Sun Feb  2 22:14:57 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun,  2 Feb 2014 21:14:57 +0000
Subject: SF.net SVN: gar:[22935] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fHQ174nWPzF3@mail.opencsw.org>

Revision: 22935
          http://sourceforge.net/p/gar/code/22935
Author:   dmichelsen
Date:     2014-02-02 21:14:57 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Fix typo

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

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-02 20:52:12 UTC (rev 22934)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-02 21:14:57 UTC (rev 22935)
@@ -9,10 +9,10 @@
 
 MASTER_SITES = http://mirrorbrain.org/files/releases/
 DISTFILES  = $(DISTNAME).tar.gz
-DTSTFILES += CSWap2-mod-autoindex-mb.postinstall
-DTSTFILES += CSWap2-mod-autoindex-mb.preremove
-DTSTFILES += CSWap2-mod-mirrorbrain.postinstall
-DTSTFILES += CSWap2-mod-mirrorbrain.preremove
+DISTFILES += CSWap2-mod-autoindex-mb.postinstall
+DISTFILES += CSWap2-mod-autoindex-mb.preremove
+DISTFILES += CSWap2-mod-mirrorbrain.postinstall
+DISTFILES += CSWap2-mod-mirrorbrain.preremove
 
 # Use patch until this is fixed:
 #   http://mirrorbrain.org/issues/issue139

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 Feb  3 13:03:24 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  3 Feb 2014 12:03:24 +0000
Subject: SF.net SVN: gar:[22936] csw/mgar/pkg/mc/trunk/Makefile
Message-ID: <3fHnkD1W6Dz1N9@mail.opencsw.org>

Revision: 22936
          http://sourceforge.net/p/gar/code/22936
Author:   dmichelsen
Date:     2014-02-03 12:03:22 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
mc/trunk: Try gcc

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

Modified: csw/mgar/pkg/mc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mc/trunk/Makefile	2014-02-02 21:14:57 UTC (rev 22935)
+++ csw/mgar/pkg/mc/trunk/Makefile	2014-02-03 12:03:22 UTC (rev 22936)
@@ -29,4 +29,6 @@
 CHECKPKG_OVERRIDES_CSWmc += file-with-bad-content|/usr/local|root/opt/csw/libexec/mc/extfs.d/ulib
 CHECKPKG_OVERRIDES_CSWmc += missing-dependency|CSWemacs-common
 
+GARCOMPILER = GNU
+
 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 Feb  3 13:55:06 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  3 Feb 2014 12:55:06 +0000
Subject: SF.net SVN: gar:[22937] csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <3fHpsy46msz1W0@mail.opencsw.org>

Revision: 22937
          http://sourceforge.net/p/gar/code/22937
Author:   dmichelsen
Date:     2014-02-03 12:55:06 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
apr-util/trunk: Add libiconv, libaprutil-1.so is now self-contained

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

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2014-02-03 12:03:22 UTC (rev 22936)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2014-02-03 12:55:06 UTC (rev 22937)
@@ -21,6 +21,7 @@
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibuuid1
+RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibiconv2
 OBSOLETED_BY_CSWlibaprutil1-0 += CSWapr-util
 
 # This is due to different interpretation of -z ignore
@@ -110,6 +111,7 @@
 CONFIGURE_ARGS += --with-freetds=$(prefix)
 CONFIGURE_ARGS += --with-odbc
 CONFIGURE_ARGS += --with-pgsql
+CONFIGURE_ARGS += --with-iconv=$(prefix)
 
 # How do we deal with 64 bit?
 CONFIGURE_ARGS += --with-expat=$(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  Mon Feb  3 15:46:07 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  3 Feb 2014 14:46:07 +0000
Subject: SF.net SVN: gar:[22938] csw/mgar/pkg/apache2/trunk
Message-ID: <3fHsKz58XSzJN@mail.opencsw.org>

Revision: 22938
          http://sourceforge.net/p/gar/code/22938
Author:   dmichelsen
Date:     2014-02-03 14:46:02 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
apache2/trunk: Update to 2.2.26

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2014-02-03 12:55:06 UTC (rev 22937)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2014-02-03 14:46:02 UTC (rev 22938)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = httpd
-VERSION = 2.2.24
+VERSION = 2.2.26
 GARTYPE = v2
 
 DESCRIPTION = A high performance HTTP server.
@@ -98,12 +98,14 @@
 RUNTIME_DEP_PKGS_CSWapache2	  += CSWlibapr-dev CSWlibaprutil-dev
 # Note: This is included as something in mod_dav uses dlopen to leverage it
 RUNTIME_DEP_PKGS_CSWapache2	  += CSWlibaprutil1-dbm-db
+RUNTIME_DEP_PKGS_CSWapache2       += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-dev  = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl
+RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2 CSWapache2c
 RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWap2prefork

Modified: csw/mgar/pkg/apache2/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache2/trunk/checksums	2014-02-03 12:55:06 UTC (rev 22937)
+++ csw/mgar/pkg/apache2/trunk/checksums	2014-02-03 14:46:02 UTC (rev 22938)
@@ -1 +1 @@
-64a3392018ad60583209a16d728180d3  httpd-2.2.24.tar.gz
+8f580ea4f8476d5fb131b772beca33b2  httpd-2.2.26.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 Feb  3 16:36:16 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon,  3 Feb 2014 15:36:16 +0000
Subject: SF.net SVN: gar:[22939] csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <3fHtRr2PVbzQy@mail.opencsw.org>

Revision: 22939
          http://sourceforge.net/p/gar/code/22939
Author:   dmichelsen
Date:     2014-02-03 15:36:14 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
apache2/trunk: Add extra override

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2014-02-03 14:46:02 UTC (rev 22938)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2014-02-03 15:36:14 UTC (rev 22939)
@@ -121,6 +121,7 @@
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-ldap
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWliblber2-4-2
 CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2

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


From dmichelsen at users.sourceforge.net  Tue Feb  4 10:57:34 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  4 Feb 2014 09:57:34 +0000
Subject: SF.net SVN: gar:[22940] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fJLtm0g6SzDT@mail.opencsw.org>

Revision: 22940
          http://sourceforge.net/p/gar/code/22940
Author:   dmichelsen
Date:     2014-02-04 09:57:34 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Add patch for realpath

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

Added Paths:
-----------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-03 15:36:14 UTC (rev 22939)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-04 09:57:34 UTC (rev 22940)
@@ -18,6 +18,10 @@
 #   http://mirrorbrain.org/issues/issue139
 PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
 
+# Use patch until this is fixed:
+#   
+PATCHFILES += 0001-realpath-must-get-preallocated-memory-on-Solaris.patch
+
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths

Added: csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	2014-02-04 09:57:34 UTC (rev 22940)
@@ -0,0 +1,63 @@
+From 502e0e73c9c453c6514b44b0f6ed2a5b142c33a8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 4 Feb 2014 10:43:45 +0100
+Subject: [PATCH] realpath must get preallocated memory on Solaris
+
+---
+ mod_mirrorbrain/mod_mirrorbrain.c | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/mod_mirrorbrain/mod_mirrorbrain.c b/mod_mirrorbrain/mod_mirrorbrain.c
+index 228fb65..da5fdf5 100644
+--- a/mod_mirrorbrain/mod_mirrorbrain.c
++++ b/mod_mirrorbrain/mod_mirrorbrain.c
+@@ -83,6 +83,7 @@
+ 
+ #include <unistd.h> /* for getpid */
+ #include <math.h>   /* for sqrt() and pow() */
++#include <limits.h> /* for PATH_MAX */
+ #include <arpa/inet.h>
+ #ifdef WITH_MEMCACHE
+ #include "mod_memcache.h"
+@@ -1859,7 +1860,17 @@ static int mb_handler(request_rec *r)
+ 
+     /* The basedir might contain symlinks. That needs to be taken into account. 
+      * See discussion in http://mirrorbrain.org/issues/issue17 */
+-    ptr = realpath(cfg->mirror_base, NULL);
++#if defined(__sun) && defined(__SVR4)
++    ptr = malloc( PATH_MAX );
++    if (ptr == NULL) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
++                "[mod_mirrorbrain] Error allocating memory for path for document root");
++        return DECLINED; /* fail gracefully */
++    }
++#else
++    ptr = NULL;
++#endif
++    ptr = realpath(cfg->mirror_base, ptr);
+     if (ptr == NULL) {
+         /* this should never happen, because the MirrorBrainEngine directive would never
+          * be applied to a non-existing directories */
+@@ -1878,8 +1889,17 @@ static int mb_handler(request_rec *r)
+         filename = apr_pstrcat(r->pool, mirror_base, "/", yum->dir, "/", yum->file, NULL);
+         debugLog(r, cfg, "yum path on disk: %s", filename);
+     }
+-
+-    ptr = realpath(filename, NULL);
++#if defined(__sun) && defined(__SVR4)
++    ptr = malloc( PATH_MAX );
++    if (ptr == NULL) {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
++                "[mod_mirrorbrain] Error allocating memory for path for filename");
++        return DECLINED; /* fail gracefully */
++    }
++#else
++    ptr = NULL;
++#endif
++    ptr = realpath(filename, ptr);
+     if (ptr == NULL) {
+         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
+                 "[mod_mirrorbrain] Error canonicalizing filename '%s'", filename);
+-- 
+1.8.4.1
+

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 Feb  4 11:02:14 2014
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue,  4 Feb 2014 10:02:14 +0000
Subject: SF.net SVN: gar:[22941] csw/mgar/pkg/dhcp/trunk
Message-ID: <3fJM006v5lzJB@mail.opencsw.org>

Revision: 22941
          http://sourceforge.net/p/gar/code/22941
Author:   bonivart
Date:     2014-02-04 10:02:14 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
dhcp/trunk: update to 4.3.0

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

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2014-02-04 09:57:34 UTC (rev 22940)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2014-02-04 10:02:14 UTC (rev 22941)
@@ -1,28 +1,24 @@
 NAME = dhcp
-VERSION = 4.2.5
+VERSION = 4.3.0
 
 # Enable these for Px-releases
-RELEASE = P1
-DISTVERSION = $(VERSION)-$(RELEASE)
-SPKG_VERSION = $(VERSION)$(RELEASE)
-DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+#RELEASE = P1
+#DISTVERSION = $(VERSION)-$(RELEASE)
+#SPKG_VERSION = $(VERSION)$(RELEASE)
+#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)
+#WORKSRC = $(WORKDIR)/$(DISTNAME)
 
 GARTYPE = v2
 
 DESCRIPTION = ISC DHCP reference implementation
 define BLURB
-  ISC DHCP is open-source software that implements the Dynamic Host
-  Configuration Protocols for connection to a local network. It is a reference
-  implementation of those protocols, but it is also production-grade software,
-  suitable for use in high-volume and high-reliability applications. 
 endef
 
 # Toggle between these for normal/Px-releases
-#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/
-MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/
-#DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/
+#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+#DISTFILES  = $(DISTNAME).tar.gz
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2014-02-04 09:57:34 UTC (rev 22940)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2014-02-04 10:02:14 UTC (rev 22941)
@@ -1 +1 @@
-f68e3c1f00a9af5742bc5e71d567cf93  dhcp-4.2.5-P1.tar.gz
+1020d77e1a4c1f01b76279caff9beb80  dhcp-4.3.0.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Feb  4 12:36:07 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue,  4 Feb 2014 11:36:07 +0000
Subject: SF.net SVN: gar:[22942] csw/mgar/pkg/mod_geoip/trunk
Message-ID: <3fJP4L4p5PzhH@mail.opencsw.org>

Revision: 22942
          http://sourceforge.net/p/gar/code/22942
Author:   dmichelsen
Date:     2014-02-04 11:36:06 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
mod_geoip/trunk: Added pre-/post-install, example conf

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

Added Paths:
-----------
    csw/mgar/pkg/mod_geoip/trunk/files/
    csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.postinstall
    csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.preremove
    csw/mgar/pkg/mod_geoip/trunk/files/httpd-geoip.conf.CSW

Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/Makefile	2014-02-04 10:02:14 UTC (rev 22941)
+++ csw/mgar/pkg/mod_geoip/trunk/Makefile	2014-02-04 11:36:06 UTC (rev 22942)
@@ -1,3 +1,7 @@
+# TBD:
+# - Test, test, test!! Especially mirrorbrain
+# - Make sure httpd-geoip.conf is installed and added to httpd.conf
+
 NAME = mod_geoip2
 VERSION = 1.2.8
 GARTYPE = v2
@@ -9,13 +13,18 @@
   as opposed to looking up arbitrary addresses.
 endef
 
-PACKAGES = CSWap2modgeoip2
-
 MASTER_SITES = http://www.maxmind.com/download/geoip/api/mod_geoip2/
 DISTFILES  = mod_geoip2-latest.tar.gz
+DISTFILES += CSWap2-mod-geoip.postinstall
+DISTFILES += CSWap2-mod-geoip.preremove
+DISTFILES += httpd-geoip.conf.CSW
+
 WORKSRC = $(WORKDIR)/mod_geoip2_$(VERSION)
 #PATCHDIR = $(WORKDIR)/$(DISTNAME)-src
 
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWgeoip-dev
+
 # Apache paths
 AP2_ROOT      = $(prefix)/apache2
 AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
@@ -27,12 +36,11 @@
 CONFIGURE_ARGS += --libexecdir=$(AP2_ROOT)/libexec
 CONFIGURE_ARGS += --with-apxs=$(AP2_ROOT)/sbin/apxs
 
-BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWapache2-dev
-BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWgeoip-dev
+PACKAGES = CSWap2modgeoip2
 RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWgeolitedb
 RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWlibgeoip1
-#PKGFILES_CSWap2modgeoip2 += $(AP2_LIBEXEC)/mod_geoip2.so
+OBSOLETED_BY_CSWap2-mod-geoip += CSWap2modgeoip2
 
 # This dependency should be in place.
 CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWgeolitedb

Copied: csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.postinstall (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall)
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.postinstall	2014-02-04 11:36:06 UTC (rev 22942)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the geoip module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    geoip mod_geoip.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_geoip is enabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Copied: csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.preremove (from rev 22420, csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.preremove)
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.preremove	                        (rev 0)
+++ csw/mgar/pkg/mod_geoip/trunk/files/CSWap2-mod-geoip.preremove	2014-02-04 11:36:06 UTC (rev 22942)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the geoip module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    geoip mod_geoip.so
+
+cat <<END
+
+NOTICE: mod_geoip is disabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Added: csw/mgar/pkg/mod_geoip/trunk/files/httpd-geoip.conf.CSW
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/files/httpd-geoip.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/mod_geoip/trunk/files/httpd-geoip.conf.CSW	2014-02-04 11:36:06 UTC (rev 22942)
@@ -0,0 +1,5 @@
+<IfModule mod_geoip.c>
+   GeoIPEnable On
+   GeoIPDBFile /opt/csw/share/GeoIP/GeoIPCity.dat MMapCache
+   GeoIPOutput Env
+</IfModule>

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


From lblume at users.sourceforge.net  Wed Feb  5 06:44:50 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed,  5 Feb 2014 05:44:50 +0000
Subject: SF.net SVN: gar:[22943] csw/mgar/pkg/pidgin/trunk
Message-ID: <3fJsDW5W1Kzbx@mail.opencsw.org>

Revision: 22943
          http://sourceforge.net/p/gar/code/22943
Author:   lblume
Date:     2014-02-05 05:44:49 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
pidgin/trunk: Bump to 2.10.9

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

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-04 11:36:06 UTC (rev 22942)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-05 05:44:49 UTC (rev 22943)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME    = pidgin
-VERSION = 2.10.7
+VERSION = 2.10.9
 GARTYPE = v2
 
 DESCRIPTION = Multi-protocol IM client

Modified: csw/mgar/pkg/pidgin/trunk/checksums
===================================================================
--- csw/mgar/pkg/pidgin/trunk/checksums	2014-02-04 11:36:06 UTC (rev 22942)
+++ csw/mgar/pkg/pidgin/trunk/checksums	2014-02-05 05:44:49 UTC (rev 22943)
@@ -1 +1 @@
-ea88976b9952e80b702b030489f94393  pidgin-2.10.7.tar.bz2
+10a4a69d077893f6dd3438cd8af94e81  pidgin-2.10.9.tar.bz2

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


From lblume at users.sourceforge.net  Wed Feb  5 16:04:41 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed,  5 Feb 2014 15:04:41 +0000
Subject: SF.net SVN: gar:[22944] csw/mgar/pkg/pidgin/trunk/Makefile
Message-ID: <3fK5fh6lSszSD@mail.opencsw.org>

Revision: 22944
          http://sourceforge.net/p/gar/code/22944
Author:   lblume
Date:     2014-02-05 15:04:39 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
pidgin/trunk: Update soname numbers in overrides

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

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-05 05:44:49 UTC (rev 22943)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-05 15:04:39 UTC (rev 22944)
@@ -125,9 +125,9 @@
 CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/libjabber.so
 CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/liboscar.so
 CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/libymsg.so
-CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgnt.so.0.8.9|soname=libgnt.so.0|pkgname=CSWpidgin|expected=CSWlibgnt0
-CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.10.7|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0
-CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.10.7|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0
+CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgnt.so.0.8.10|soname=libgnt.so.0|pkgname=CSWpidgin|expected=CSWlibgnt0
+CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.10.9|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0
+CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.10.9|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0
 
 CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWaspell
 CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWtcl

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


From lblume at users.sourceforge.net  Wed Feb  5 16:09:02 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed,  5 Feb 2014 15:09:02 +0000
Subject: SF.net SVN: gar:[22945] csw/mgar/pkg/pidgin/trunk/Makefile
Message-ID: <3fK5mQ6NR4zX2@mail.opencsw.org>

Revision: 22945
          http://sourceforge.net/p/gar/code/22945
Author:   lblume
Date:     2014-02-05 15:09:00 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
pidgin/trunk: Workaround the ld bug

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

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-05 15:04:39 UTC (rev 22944)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2014-02-05 15:09:00 UTC (rev 22945)
@@ -85,6 +85,18 @@
 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3
 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2
 
+###
+# due to the ld bug
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpangocairo1-0-0
+###
+
 BUILD_DEP_PKGS += CSWpkgconfig
 BUILD_DEP_PKGS += CSWlibxml2-dev
 BUILD_DEP_PKGS += CSWlibharfbuzz-dev

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


From dmichelsen at users.sourceforge.net  Wed Feb  5 16:22:25 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed,  5 Feb 2014 15:22:25 +0000
Subject: SF.net SVN: gar:[22946] csw/mgar/pkg/sudo/trunk
Message-ID: <3fK62y0jmZzc5@mail.opencsw.org>

Revision: 22946
          http://sourceforge.net/p/gar/code/22946
Author:   dmichelsen
Date:     2014-02-05 15:22:24 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
sudo/trunk: Update to 1.8.9p5

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2014-02-05 15:09:00 UTC (rev 22945)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2014-02-05 15:22:24 UTC (rev 22946)
@@ -2,7 +2,7 @@
 #
 
 NAME = sudo
-VERSION = 1.8.9p4
+VERSION = 1.8.9p5
 GARTYPE = v2
 
 EXTRA_MODULATORS = LDAP

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2014-02-05 15:09:00 UTC (rev 22945)
+++ csw/mgar/pkg/sudo/trunk/checksums	2014-02-05 15:22:24 UTC (rev 22946)
@@ -1 +1 @@
-a46f6de8645e6c5b6668d30657439d1c  sudo-1.8.9p4.tar.gz
+d3f1f1cfca6b2b06b048e1abb7d0227e  sudo-1.8.9p5.tar.gz

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


From cgrzemba at users.sourceforge.net  Wed Feb  5 17:06:53 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  5 Feb 2014 16:06:53 +0000
Subject: SF.net SVN: gar:[22947] csw/mgar/pkg
Message-ID: <3fK72M60wczkX@mail.opencsw.org>

Revision: 22947
          http://sourceforge.net/p/gar/code/22947
Author:   cgrzemba
Date:     2014-02-05 16:06:52 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
sane-backends/trunk: Initial commit

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

Added: csw/mgar/pkg/sane-backends/Makefile
===================================================================
--- csw/mgar/pkg/sane-backends/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sane-backends/Makefile	2014-02-05 16:06:52 UTC (rev 22947)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/sane-backends/trunk
===================================================================
--- csw/mgar/pkg/sane-backends/trunk	2014-02-05 15:22:24 UTC (rev 22946)
+++ csw/mgar/pkg/sane-backends/trunk	2014-02-05 16:06:52 UTC (rev 22947)

Property changes on: csw/mgar/pkg/sane-backends/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/sane-backends/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sane-backends/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sane-backends/trunk/Makefile	2014-02-05 16:06:52 UTC (rev 22947)
@@ -0,0 +1,59 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = sane-backends
+VERSION = 1.0.24
+GARTYPE = v2
+# CATEGORIES = category
+
+DESCRIPTION = Sane backend
+define BLURB
+  Long description
+endef
+
+# http://sourceforge.net/projects/cupsdriverkodak/files/Scanning%20-%20sane%20backend/sane-backends-1.0.24.tar.gz/download
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJECT = cupsdriverkodak
+DISTFILES  = $(DISTNAME).tar.gz
+
+# solaris studio does not like __attribute__ and __pack__
+GARCOMPILER = GCC4
+
+PACKAGES += CSWlibsane1
+CATALOGNAME_CSWlibsane1 = libsane1
+PKGFILES_CSWlibsane1 += $(call baseisadirs,$(libdir),libsane\.so\.1\.0\.24)
+PKGFILES_CSWlibsane1 += $(call baseisadirs,$(libdir),libsane\.so\.1(\.\d+)*)
+PKGFILES_CSWlibsane1 += $(libdir)/sane/libsane.*
+SPKG_DESC_CSWlibsane1 += $(DESCRIPTION), libsane.so.1
+RUNTIME_DEP_PKGS_CSWlibsane1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsane1 += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWlibsane1 += CSWlibjpeg7
+CHECKPKG_OVERRIDES_CSWlibsane1 += shared-lib-package-contains-so-symlink
+CHECKPKG_OVERRIDES_CSWlibsane1 += soname-not-part-of-filename
+
+OBSOLETED_BY_CSWlibsane1 = CSWsaneback
+
+PACKAGES += CSWsane-backends
+SPKG_DESC_CSWsane-backends += $(DESCRIPTION), tools and docs
+RUNTIME_DEP_PKGS_CSWsane-backends += CSWlibsane1
+CHECKPKG_OVERRIDES_CSWsane-backends += file-with-bad-content
+
+
+PACKAGES += CSWsane-backends-dev
+CATALOGNAME_CSWsane-backends-dev = sane_backends_dev
+SPKG_DESC_CSWsane-backends-dev += $(DESCRIPTION), development files
+PKGFILES_CSWsane-backends-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWsane-backends-dev += CSWlibsane1
+OBSOLETED_BY_CSWsane-backends-dev = CSWsaneback
+
+EXTRA_LDFLAGS = -lrt
+
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-snmp=no
+
+EXTRA_TEST_ENV = PATH=/opt/csw/gnu:$(PATH)
+SKIPTEST = 1
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/sane-backends/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/sane-backends/trunk/checksums
===================================================================
--- csw/mgar/pkg/sane-backends/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/sane-backends/trunk/checksums	2014-02-05 16:06:52 UTC (rev 22947)
@@ -0,0 +1 @@
+1ca68e536cd7c1852322822f5f6ac3a4  sane-backends-1.0.24.tar.gz

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


From cgrzemba at users.sourceforge.net  Wed Feb  5 17:10:28 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed,  5 Feb 2014 16:10:28 +0000
Subject: SF.net SVN: gar:[22948] csw/mgar/pkg/lang-python/pycairo/trunk
Message-ID: <3fK76W1SLRznw@mail.opencsw.org>

Revision: 22948
          http://sourceforge.net/p/gar/code/22948
Author:   cgrzemba
Date:     2014-02-05 16:10:27 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
lang-python/pycairo/trunk: update 1.10.0 do not package, because license not found

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

Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-05 16:06:52 UTC (rev 22947)
+++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-05 16:10:27 UTC (rev 22948)
@@ -1,22 +1,21 @@
-NAME      = pycairo
-VERSION   = 1.8.10
-CATEGORIES   = lib
+NAME      = py2cairo
+VERSION   = 1.10.0
 GARTYPE = v2
+CATEGORIES   = python
 
-DESCRIPTION  = Python binding for Cairo library
+DESCRIPTION  = Python binding for Cairo library for Python2
 define BLURB
   This package contains the pycairo Python module which implements
   a binding the the cairo Library.
 endef
 
 MASTER_SITES  = http://www.cairographics.org/releases/
-DISTFILES     = py2cairo-$(VERSION).tar.gz
+# DISTFILES     = pycairo-$(VERSION).tar.bz2 
+DISTFILES     = $(DISTNAME).tar.bz2
 
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
-PYCOMPILE = 1 
 # EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc 
-PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
 
 PACKAGES = CSWpy-cairo
 SPKG_DESC_CSWpy-cairo = $(DESCRIPTION); main
@@ -24,16 +23,33 @@
 RUNTIME_DEP_PKGS_CSWpy-cairo += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-cairo += CSWlibcairo2
 
-# We define upstream file regex so we can be notifed of 
-# new upstream software release
-UFILES_REGEX = py2cairo-(\d+(?:\.\d+)*).tar.gz
-
 CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -lcairo
 CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo
 EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS
 
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+SKIPTEST = 1
+INSTALL_SCRIPTS = custom
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
 
+configure-custom:
+	cd $(WORKSRC) && ./waf configure --prefix=$(prefix)
+	$(MAKECOOKIE)
 
+build-custom:
+	cd $(WORKSRC) && ./waf build
+	$(MAKECOOKIE)
+
+install-custom:
+	cd $(WORKSRC) && DESTDIR=$(DESTDIR) ./waf install
+	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
+	ginstall -d $(DESTDIR)$(docdir)/py_cairo
+	ginstall -m 644 $(WORKSRC)/COPYING  $(DESTDIR)$(docdir)/$(NAME)/license
+	ginstall -m 644 $(WORKSRC)/COPYING  $(DESTDIR)$(docdir)/py_cairo/
+	ginstall -m 644 $(WORKSRC)/COPYING-LGPL-2.1  $(DESTDIR)$(docdir)/$(NAME)
+	ginstall -m 644 $(WORKSRC)/COPYING-MPL-1.1  $(DESTDIR)$(docdir)/$(NAME)
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/lang-python/pycairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pycairo/trunk/checksums	2014-02-05 16:06:52 UTC (rev 22947)
+++ csw/mgar/pkg/lang-python/pycairo/trunk/checksums	2014-02-05 16:10:27 UTC (rev 22948)
@@ -1 +1 @@
-87421a6a70304120555ba7ba238f3dc3  py2cairo-1.8.10.tar.gz
+20337132c4ab06c1146ad384d55372c5  py2cairo-1.10.0.tar.bz2

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


From chninkel at users.sourceforge.net  Wed Feb  5 20:30:11 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed,  5 Feb 2014 19:30:11 +0000
Subject: SF.net SVN: gar:[22949] csw/mgar/pkg/vsftpd/trunk/Makefile
Message-ID: <3fKCXs47Yzz1QY@mail.opencsw.org>

Revision: 22949
          http://sourceforge.net/p/gar/code/22949
Author:   chninkel
Date:     2014-02-05 19:30:07 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
vsftpd/trunk: disable lazy loading as it can mess with vsftpd process chrooting

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

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2014-02-05 16:10:27 UTC (rev 22948)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2014-02-05 19:30:07 UTC (rev 22949)
@@ -139,6 +139,9 @@
 CFLAGS += -I/usr/include -Idummyinc 
 endif
 
+EXTRA_LD_OPTIONS += -z nolazyload
+
+
 INSTALL_ENV += INSTALL="ginstall"
 
 

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


From cgrzemba at users.sourceforge.net  Thu Feb  6 08:20:37 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  6 Feb 2014 07:20:37 +0000
Subject: SF.net SVN: gar:[22950] csw/mgar/pkg/sane-backends/trunk/Makefile
Message-ID: <3fKWJZ3sWpzZh@mail.opencsw.org>

Revision: 22950
          http://sourceforge.net/p/gar/code/22950
Author:   cgrzemba
Date:     2014-02-06 07:20:37 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
sane-backends/trunk: relocate conf files to libsane package

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

Modified: csw/mgar/pkg/sane-backends/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sane-backends/trunk/Makefile	2014-02-05 19:30:07 UTC (rev 22949)
+++ csw/mgar/pkg/sane-backends/trunk/Makefile	2014-02-06 07:20:37 UTC (rev 22950)
@@ -24,6 +24,7 @@
 PKGFILES_CSWlibsane1 += $(call baseisadirs,$(libdir),libsane\.so\.1\.0\.24)
 PKGFILES_CSWlibsane1 += $(call baseisadirs,$(libdir),libsane\.so\.1(\.\d+)*)
 PKGFILES_CSWlibsane1 += $(libdir)/sane/libsane.*
+PKGFILES_CSWlibsane1 += $(sysconfdir)/sane.d/.*
 SPKG_DESC_CSWlibsane1 += $(DESCRIPTION), libsane.so.1
 RUNTIME_DEP_PKGS_CSWlibsane1 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsane1 += CSWlibtiff5
@@ -48,8 +49,8 @@
 
 EXTRA_LDFLAGS = -lrt
 
-
 CONFIGURE_ARGS = $(DIRPATHS)
+# option from net-snmp-config --cflags prevents comiling with gcc
 CONFIGURE_ARGS += --with-snmp=no
 
 EXTRA_TEST_ENV = PATH=/opt/csw/gnu:$(PATH)

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


From cgrzemba at users.sourceforge.net  Thu Feb  6 09:14:04 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  6 Feb 2014 08:14:04 +0000
Subject: SF.net SVN: gar:[22951] csw/mgar/pkg
Message-ID: <3fKXVM0jLLzjY@mail.opencsw.org>

Revision: 22951
          http://sourceforge.net/p/gar/code/22951
Author:   cgrzemba
Date:     2014-02-06 08:14:03 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
sane-frontends/trunk: Initial commit

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

Added: csw/mgar/pkg/sane-frontends/Makefile
===================================================================
--- csw/mgar/pkg/sane-frontends/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sane-frontends/Makefile	2014-02-06 08:14:03 UTC (rev 22951)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/sane-frontends/trunk
===================================================================
--- csw/mgar/pkg/sane-frontends/trunk	2014-02-06 07:20:37 UTC (rev 22950)
+++ csw/mgar/pkg/sane-frontends/trunk	2014-02-06 08:14:03 UTC (rev 22951)

Property changes on: csw/mgar/pkg/sane-frontends/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/sane-frontends/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sane-frontends/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sane-frontends/trunk/Makefile	2014-02-06 08:14:03 UTC (rev 22951)
@@ -0,0 +1,22 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = sane-frontends
+VERSION = 1.0.14
+GARTYPE = v2
+# CATEGORIES = category
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = ftp://ftp2.sane-project.org/pub/sane/
+DISTFILES  = $(DISTNAME).tar.gz
+
+GARCOMPILER = GCC4
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/sane-frontends/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/sane-frontends/trunk/checksums
===================================================================
--- csw/mgar/pkg/sane-frontends/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/sane-frontends/trunk/checksums	2014-02-06 08:14:03 UTC (rev 22951)
@@ -0,0 +1 @@
+c63bf7b0bb5f530cf3c08715db721cd3  sane-frontends-1.0.14.tar.gz

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


From cgrzemba at users.sourceforge.net  Thu Feb  6 11:45:05 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  6 Feb 2014 10:45:05 +0000
Subject: SF.net SVN: gar:[22952] csw/mgar/pkg/sane-backends/trunk
Message-ID: <3fKbrV4fwNzx7@mail.opencsw.org>

Revision: 22952
          http://sourceforge.net/p/gar/code/22952
Author:   cgrzemba
Date:     2014-02-06 10:45:02 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
sane-backends/trunk: add use posix shell patch

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

Added Paths:
-----------
    csw/mgar/pkg/sane-backends/trunk/files/0001-fix-config-script.patch

Modified: csw/mgar/pkg/sane-backends/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sane-backends/trunk/Makefile	2014-02-06 08:14:03 UTC (rev 22951)
+++ csw/mgar/pkg/sane-backends/trunk/Makefile	2014-02-06 10:45:02 UTC (rev 22952)
@@ -16,6 +16,7 @@
 SF_PROJECT = cupsdriverkodak
 DISTFILES  = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-fix-config-script.patch
 # solaris studio does not like __attribute__ and __pack__
 GARCOMPILER = GCC4
 

Added: csw/mgar/pkg/sane-backends/trunk/files/0001-fix-config-script.patch
===================================================================
--- csw/mgar/pkg/sane-backends/trunk/files/0001-fix-config-script.patch	                        (rev 0)
+++ csw/mgar/pkg/sane-backends/trunk/files/0001-fix-config-script.patch	2014-02-06 10:45:02 UTC (rev 22952)
@@ -0,0 +1,8 @@
+--- a/tools/sane-config.in
++++ b/tools/sane-config.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/xpg4/bin/sh
+ #
+ # This script is part of SANE, <URL:http://www.sane-project.org/>
+ #

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


From cgrzemba at users.sourceforge.net  Thu Feb  6 14:05:04 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu,  6 Feb 2014 13:05:04 +0000
Subject: SF.net SVN: gar:[22953]
	csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
Message-ID: <3fKfy56TbTz1B5@mail.opencsw.org>

Revision: 22953
          http://sourceforge.net/p/gar/code/22953
Author:   cgrzemba
Date:     2014-02-06 13:05:01 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
lang-python/pycairo/trunk: replace waf with autotools build

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

Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-06 10:45:02 UTC (rev 22952)
+++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-06 13:05:01 UTC (rev 22953)
@@ -1,7 +1,7 @@
 NAME      = py2cairo
 VERSION   = 1.10.0
 GARTYPE = v2
-CATEGORIES   = python
+# CATEGORIES   = python
 
 DESCRIPTION  = Python binding for Cairo library for Python2
 define BLURB
@@ -13,43 +13,35 @@
 # DISTFILES     = pycairo-$(VERSION).tar.bz2 
 DISTFILES     = $(DISTNAME).tar.bz2
 
+LICENSE = COPYING
+
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
-# EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc 
+EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc 
 
 PACKAGES = CSWpy-cairo
 SPKG_DESC_CSWpy-cairo = $(DESCRIPTION); main
 OBSOLETED_BY_CSWpy-cairo = CSWpycairo
 RUNTIME_DEP_PKGS_CSWpy-cairo += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-cairo += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWpy-cairo += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWpy-cairo += surplus-dependency|CSWpython
 
+GARCOMPILER = GCC4
+
 CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -lcairo
 CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo
 EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS
 
-CONFIGURE_SCRIPTS = custom
-BUILD_SCRIPTS = custom
+EXTRA_CFLAGS = -D_XPG6
 SKIPTEST = 1
-INSTALL_SCRIPTS = custom
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
 
-configure-custom:
-	cd $(WORKSRC) && ./waf configure --prefix=$(prefix)
+pre-configure:
+	cd $(WORKSRC) && python -c "import sys; print sys.prefix" && \
+	touch ChangeLog && \
+	autoreconf --force --install 
 	$(MAKECOOKIE)
-
-build-custom:
-	cd $(WORKSRC) && ./waf build
-	$(MAKECOOKIE)
-
-install-custom:
-	cd $(WORKSRC) && DESTDIR=$(DESTDIR) ./waf install
-	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
-	ginstall -d $(DESTDIR)$(docdir)/py_cairo
-	ginstall -m 644 $(WORKSRC)/COPYING  $(DESTDIR)$(docdir)/$(NAME)/license
-	ginstall -m 644 $(WORKSRC)/COPYING  $(DESTDIR)$(docdir)/py_cairo/
-	ginstall -m 644 $(WORKSRC)/COPYING-LGPL-2.1  $(DESTDIR)$(docdir)/$(NAME)
-	ginstall -m 644 $(WORKSRC)/COPYING-MPL-1.1  $(DESTDIR)$(docdir)/$(NAME)
-	$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Fri Feb  7 08:18:42 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  7 Feb 2014 07:18:42 +0000
Subject: SF.net SVN: gar:[22954] csw/mgar/pkg
Message-ID: <3fL7D500HQz19d@mail.opencsw.org>

Revision: 22954
          http://sourceforge.net/p/gar/code/22954
Author:   cgrzemba
Date:     2014-02-07 07:18:40 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
xsane/trunk: initail commit

Added Paths:
-----------
    csw/mgar/pkg/xsane/
    csw/mgar/pkg/xsane/Makefile
    csw/mgar/pkg/xsane/branches/
    csw/mgar/pkg/xsane/tags/
    csw/mgar/pkg/xsane/trunk/
    csw/mgar/pkg/xsane/trunk/Makefile
    csw/mgar/pkg/xsane/trunk/checksums
    csw/mgar/pkg/xsane/trunk/files/
    csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch

Added: csw/mgar/pkg/xsane/Makefile
===================================================================
--- csw/mgar/pkg/xsane/Makefile	                        (rev 0)
+++ csw/mgar/pkg/xsane/Makefile	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/xsane/trunk
===================================================================
--- csw/mgar/pkg/xsane/trunk	2014-02-06 13:05:01 UTC (rev 22953)
+++ csw/mgar/pkg/xsane/trunk	2014-02-07 07:18:40 UTC (rev 22954)

Property changes on: csw/mgar/pkg/xsane/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/xsane/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xsane/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/Makefile	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,40 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = xsane
+VERSION = 0.999
+GARTYPE = v2
+# CATEGORIES = category
+
+DESCRIPTION = XSane graphical scanning frontend
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://www.xsane.org/download/
+DISTFILES  = $(DISTNAME).tar.gz
+
+# on libpng15 API changed
+PATCHFILES = 0001-libpng15.patch
+
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibz1
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWxsane += CSWlibsane1
+CHECKPKG_OVERRIDES_CSWxsane += file-with-bad-content|/usr/share|root/opt/csw/bin/xsane
+
+GARCOMPILER = GCC4
+
+EXTRA_LINKER_FLAGS  = -lsocket -lnsl
+SKIPTEST = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/xsane/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/xsane/trunk/checksums
===================================================================
--- csw/mgar/pkg/xsane/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/checksums	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1 @@
+9927f21e1ab6ba96315e7f0e30746deb  xsane-0.999.tar.gz

Added: csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch
===================================================================
--- csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch	                        (rev 0)
+++ csw/mgar/pkg/xsane/trunk/files/0001-libpng15.patch	2014-02-07 07:18:40 UTC (rev 22954)
@@ -0,0 +1,20 @@
+--- a/src/xsane-save.c
++++ b/src/xsane-save.c
+@@ -4910,7 +4910,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info *
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
+@@ -5100,7 +5100,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);

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


From cgrzemba at users.sourceforge.net  Fri Feb  7 08:30:46 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  7 Feb 2014 07:30:46 +0000
Subject: SF.net SVN: gar:[22955]
	csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Message-ID: <3fL7Tr0Vnxz1Fm@mail.opencsw.org>

Revision: 22955
          http://sourceforge.net/p/gar/code/22955
Author:   cgrzemba
Date:     2014-02-07 07:30:46 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: update dependencies

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

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-07 07:18:40 UTC (rev 22954)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-07 07:30:46 UTC (rev 22955)
@@ -30,8 +30,6 @@
 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0
 
 # These are just comments
-CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py
-CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/h2def.py
 CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py26-files
 CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py-files
 
@@ -40,7 +38,7 @@
 SPKG_DESC_CSWpy-gobject = $(DESCRIPTION)
 PKGFILES_CSWpy-gobject = $(libdir)/python.*/site-packages/.*
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibffi4
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibffi5
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgirepository1-0-1
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0

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


From cgrzemba at users.sourceforge.net  Fri Feb  7 10:30:30 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  7 Feb 2014 09:30:30 +0000
Subject: SF.net SVN: gar:[22956]
	csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Message-ID: <3fLB8375Xxz1Qx@mail.opencsw.org>

Revision: 22956
          http://sourceforge.net/p/gar/code/22956
Author:   cgrzemba
Date:     2014-02-07 09:30:29 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: add sparc dependencies (linker problem)

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

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-07 07:30:46 UTC (rev 22955)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-07 09:30:29 UTC (rev 22956)
@@ -3,6 +3,7 @@
 NAME = pygobject
 VERSION = 2.90.4
 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//')
+# CATEGORIES = python
 
 DESCRIPTION = Python bindings for the GObject library
 define BLURB
@@ -24,6 +25,11 @@
 RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibglib2-0-0
 
+RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_$(GARCH))
+
 PACKAGES += CSWpy-gobject-dev
 OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject
 SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library
@@ -34,7 +40,7 @@
 CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py-files
 
 PACKAGES += CSWpy-gobject
-OBSOLETED_BY_CSWpy-gobject += CSWpygobject
+# OBSOLETED_BY_CSWpy-gobject += CSWpygobject
 SPKG_DESC_CSWpy-gobject = $(DESCRIPTION)
 PKGFILES_CSWpy-gobject = $(libdir)/python.*/site-packages/.*
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibcairo2
@@ -44,6 +50,11 @@
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-gi2-0python0
 
+RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWpy-gobject += $(RUNTIME_DEP_PKGS_CSWpy-gobject_$(GARCH))
+
 PYCOMPILE = 1
 STRIP_LIBTOOL = 1
 

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


From cgrzemba at users.sourceforge.net  Fri Feb  7 11:03:26 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  7 Feb 2014 10:03:26 +0000
Subject: SF.net SVN: gar:[22957] csw/mgar/pkg/lang-python/pygtk/trunk
Message-ID: <3fLBsz1pc1z1XY@mail.opencsw.org>

Revision: 22957
          http://sourceforge.net/p/gar/code/22957
Author:   cgrzemba
Date:     2014-02-07 10:03:25 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
lang-python/pygtk/trunk: this package is obsolete since python gobject is python gi

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

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-07 09:30:29 UTC (rev 22956)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-07 10:03:25 UTC (rev 22957)
@@ -1,5 +1,6 @@
+# is obsoleted since CSWgobject 2.90.4 which presents a gtk+3 interface
 NAME = pygtk
-VERSION = 2.17.0
+VERSION = 2.24.0
 GARTYPE = v2
 RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9].*\.[0-9].*\)\.[0-9]*/\1/')
 

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/checksums	2014-02-07 09:30:29 UTC (rev 22956)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/checksums	2014-02-07 10:03:25 UTC (rev 22957)
@@ -1 +1 @@
-43d704343d7ca04a6e4ddd4fa73a3c55  pygtk-2.17.0.tar.bz2
+a1051d5794fd7696d3c1af6422d17a49  pygtk-2.24.0.tar.bz2

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


From dmichelsen at users.sourceforge.net  Fri Feb  7 12:01:19 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 11:01:19 +0000
Subject: SF.net SVN: gar:[22958] csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <3fLD8q3GZtz7S@mail.opencsw.org>

Revision: 22958
          http://sourceforge.net/p/gar/code/22958
Author:   dmichelsen
Date:     2014-02-07 11:01:18 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
apache2/trunk: Remove cyclic dependency

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2014-02-07 10:03:25 UTC (rev 22957)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2014-02-07 11:01:18 UTC (rev 22958)
@@ -105,7 +105,7 @@
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapache2
+#RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2 CSWapache2c
 RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWap2prefork

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 Feb  7 12:46:21 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 11:46:21 +0000
Subject: SF.net SVN: gar:[22959] csw/mgar/pkg
Message-ID: <3fLF8q6kW8zFG@mail.opencsw.org>

Revision: 22959
          http://sourceforge.net/p/gar/code/22959
Author:   dmichelsen
Date:     2014-02-07 11:46:20 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
tlsinterposer/trunk: Initial commit

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

Added: csw/mgar/pkg/tlsinterposer/Makefile
===================================================================
--- csw/mgar/pkg/tlsinterposer/Makefile	                        (rev 0)
+++ csw/mgar/pkg/tlsinterposer/Makefile	2014-02-07 11:46:20 UTC (rev 22959)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/tlsinterposer/trunk
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk	2014-02-07 11:01:18 UTC (rev 22958)
+++ csw/mgar/pkg/tlsinterposer/trunk	2014-02-07 11:46:20 UTC (rev 22959)

Property changes on: csw/mgar/pkg/tlsinterposer/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/tlsinterposer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 11:46:20 UTC (rev 22959)
@@ -0,0 +1,46 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = tlsinterposer
+VERSION = 1.1.0
+GARTYPE = v2
+
+DESCRIPTION = OpenSSL library interposer to make existing binary software use more secure TLS protocol variants
+
+MASTER_SITES = https://github.com/Netfuture/tlsinterposer/archive/
+DISTFILES  = v$(VERSION).tar.gz
+
+LICENSE = LICENSE.txt
+
+BUILD_DEP_PKGS += CSWlibssl-dev
+
+PACKAGES += CSWtlsinterposer
+SPKG_DESC_CSWtlsinterposer = OpenSSL library interposer to make existing binary software use more secure TLS protocol variants
+# PKGFILES is catchall
+# This is an interposing library, hence no SONAME
+CHECKPKG_OVERRIDES_CSWtlsinterposer += soname-equals-filename
+
+BUILD64 = 1
+
+# Make sure to use relocatable code
+EXTRA_CFLAGS += -xcode=pic13
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+build-custom:
+	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G -o tlsinterposer.so tlsinterposer.c -ldl
+	@$(MAKECOOKIE)
+
+install-custom:
+	ginstall -d -m 0755 $(DESTDIR)$(libdir)
+	ginstall -D -m 0755 $(WORKSRC)/tlsinterposer.so $(DESTDIR)$(libdir)/tlsinterposer.so
+	ginstall -d -m 0755 $(DESTDIR)$(docdir)/$(NAME)
+	cd $(WORKSRC) && ginstall -D -m 0644 CHANGES.txt README.md $(DESTDIR)$(docdir)/$(NAME)
+	cd $(WORKSRC) && ginstall -D -m 0644 TLS\ Interposer\ Logo.png $(DESTDIR)$(docdir)/$(NAME)/TLSInterposerLogo.png
+	@$(MAKECOOKIE)
+


Property changes on: csw/mgar/pkg/tlsinterposer/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/tlsinterposer/trunk/checksums
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/tlsinterposer/trunk/checksums	2014-02-07 11:46:20 UTC (rev 22959)
@@ -0,0 +1 @@
+c20a72167ab9dc6a273101167b85df7a  v1.1.0.tar.gz

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


From dmichelsen at users.sourceforge.net  Fri Feb  7 13:14:37 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 12:14:37 +0000
Subject: SF.net SVN: gar:[22960] csw/mgar/pkg/tlsinterposer/trunk/Makefile
Message-ID: <3fLFnK6xz6zLC@mail.opencsw.org>

Revision: 22960
          http://sourceforge.net/p/gar/code/22960
Author:   dmichelsen
Date:     2014-02-07 12:14:36 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
tlsinterposer/trunk: Try slightly different build

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

Modified: csw/mgar/pkg/tlsinterposer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 11:46:20 UTC (rev 22959)
+++ csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 12:14:36 UTC (rev 22960)
@@ -21,6 +21,7 @@
 CHECKPKG_OVERRIDES_CSWtlsinterposer += soname-equals-filename
 
 BUILD64 = 1
+NORUNPATH = 1
 
 # Make sure to use relocatable code
 EXTRA_CFLAGS += -xcode=pic13
@@ -33,7 +34,8 @@
 include gar/category.mk
 
 build-custom:
-	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G -o tlsinterposer.so tlsinterposer.c -ldl
+	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) -c tlsinterposer.c
+	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(LDFLAGS) -G -o tlsinterposer.so tlsinterposer.o -ldl
 	@$(MAKECOOKIE)
 
 install-custom:

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 Feb  7 14:02:20 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 13:02:20 +0000
Subject: SF.net SVN: gar:[22961] csw/mgar/pkg/tlsinterposer/trunk/Makefile
Message-ID: <3fLGrM5JKWzRT@mail.opencsw.org>

Revision: 22961
          http://sourceforge.net/p/gar/code/22961
Author:   dmichelsen
Date:     2014-02-07 13:02:19 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
tlsinterposer/trunk: Disable direct linkage

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

Modified: csw/mgar/pkg/tlsinterposer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 12:14:36 UTC (rev 22960)
+++ csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 13:02:19 UTC (rev 22961)
@@ -26,6 +26,9 @@
 # Make sure to use relocatable code
 EXTRA_CFLAGS += -xcode=pic13
 
+# Do not use direct linking as it goes against lazy load for interposed libs
+LINKER_DIRECT =
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =

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


From cgrzemba at users.sourceforge.net  Fri Feb  7 14:04:57 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri,  7 Feb 2014 13:04:57 +0000
Subject: SF.net SVN: gar:[22962] csw/mgar/pkg/gobject-introspection/trunk
Message-ID: <3fLGvR5LCdzW4@mail.opencsw.org>

Revision: 22962
          http://sourceforge.net/p/gar/code/22962
Author:   cgrzemba
Date:     2014-02-07 13:04:54 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
gobject-introspection/trunk: update to version 1.34.2

Modified Paths:
--------------
    csw/mgar/pkg/gobject-introspection/trunk/Makefile
    csw/mgar/pkg/gobject-introspection/trunk/checksums

Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gobject-introspection/trunk/Makefile	2014-02-07 13:02:19 UTC (rev 22961)
+++ csw/mgar/pkg/gobject-introspection/trunk/Makefile	2014-02-07 13:04:54 UTC (rev 22962)
@@ -1,5 +1,5 @@
 NAME = gobject-introspection
-VERSION = 1.31.22
+VERSION = 1.34.2
 CATEGORIES = gnome
 GARTYPE = v2
 
@@ -13,10 +13,12 @@
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.xz
 
-PATCHFILES += 0001-Use-named-union.patch
+# PATCHFILES += 0001-Use-named-union.patch
 
 VENDOR_URL = http://live.gnome.org/GObjectIntrospection
 
+GARCOMPILER = GCC4
+
 # the warn tests fail, because it reports more warnings than expected
 SKIPTEST ?= 1
 
@@ -24,6 +26,7 @@
 BUILD_DEP_PKGS += CSWlibffi-dev
 BUILD_DEP_PKGS += CSWgtk-doc
 
+
 PACKAGES += CSWlibgirepository1-0-1
 CATALOGNAME_CSWlibgirepository1-0-1 = libgirepository1_0_1
 PKGFILES_CSWlibgirepository1-0-1 += $(call baseisadirs,$(libdir),libgirepository-1\.0\.so\.1\.0\.0)

Modified: csw/mgar/pkg/gobject-introspection/trunk/checksums
===================================================================
--- csw/mgar/pkg/gobject-introspection/trunk/checksums	2014-02-07 13:02:19 UTC (rev 22961)
+++ csw/mgar/pkg/gobject-introspection/trunk/checksums	2014-02-07 13:04:54 UTC (rev 22962)
@@ -1 +1 @@
-4689bb17ee01c657530ab1ed998852e7  gobject-introspection-1.31.22.tar.xz
+9dc9822eb2912e9b73e51ae67fe86145  gobject-introspection-1.34.2.tar.xz

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


From dmichelsen at users.sourceforge.net  Fri Feb  7 14:32:21 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 13:32:21 +0000
Subject: SF.net SVN: gar:[22963] csw/mgar/pkg/tlsinterposer/trunk/Makefile
Message-ID: <3fLHW34CfjzbW@mail.opencsw.org>

Revision: 22963
          http://sourceforge.net/p/gar/code/22963
Author:   dmichelsen
Date:     2014-02-07 13:32:20 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
tlsinterposer/trunk: Use gcc as Sun Studio somehow always throws linker errors for Apache

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

Modified: csw/mgar/pkg/tlsinterposer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 13:04:54 UTC (rev 22962)
+++ csw/mgar/pkg/tlsinterposer/trunk/Makefile	2014-02-07 13:32:20 UTC (rev 22963)
@@ -16,18 +16,24 @@
 
 PACKAGES += CSWtlsinterposer
 SPKG_DESC_CSWtlsinterposer = OpenSSL library interposer to make existing binary software use more secure TLS protocol variants
+RUNTIME_DEP_PKGS_CSWtlsinterposer += CSWlibgcc-s1
 # PKGFILES is catchall
 # This is an interposing library, hence no SONAME
+CHECKPKG_OVERRIDES_CSWtlsinterposer += no-direct-binding
 CHECKPKG_OVERRIDES_CSWtlsinterposer += soname-equals-filename
 
+# With Sun Studio there seems always be an immediate linking happening resulting in SSL_CTX_ctrl being undefined
+GARCOMPILER = GNU
+
 BUILD64 = 1
 NORUNPATH = 1
 
 # Make sure to use relocatable code
-EXTRA_CFLAGS += -xcode=pic13
+#EXTRA_CFLAGS += -xcode=pic13
 
 # Do not use direct linking as it goes against lazy load for interposed libs
 LINKER_DIRECT =
+LINKER_IGNORE =
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
@@ -37,8 +43,9 @@
 include gar/category.mk
 
 build-custom:
-	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) -c tlsinterposer.c
-	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(LDFLAGS) -G -o tlsinterposer.so tlsinterposer.o -ldl
+	#cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) -c tlsinterposer.c
+	#cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(LDFLAGS) -G -o tlsinterposer.so tlsinterposer.o -ldl
+	cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -g -Wall -fPIC -shared -o tlsinterposer.so tlsinterposer.c -ldl
 	@$(MAKECOOKIE)
 
 install-custom:

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 Feb  7 16:45:22 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri,  7 Feb 2014 15:45:22 +0000
Subject: SF.net SVN: gar:[22964] csw/mgar/pkg/tcpflow/trunk
Message-ID: <3fLLSd0lZhzr7@mail.opencsw.org>

Revision: 22964
          http://sourceforge.net/p/gar/code/22964
Author:   dmichelsen
Date:     2014-02-07 15:45:18 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
tcpflow/trunk: Adjust dependencies

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

Property Changed:
----------------
    csw/mgar/pkg/tcpflow/trunk/

Index: csw/mgar/pkg/tcpflow/trunk
===================================================================
--- csw/mgar/pkg/tcpflow/trunk	2014-02-07 13:32:20 UTC (rev 22963)
+++ csw/mgar/pkg/tcpflow/trunk	2014-02-07 15:45:18 UTC (rev 22964)

Property changes on: csw/mgar/pkg/tcpflow/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1 ##
-cookies
-download
 work
-
Modified: csw/mgar/pkg/tcpflow/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpflow/trunk/Makefile	2014-02-07 13:32:20 UTC (rev 22963)
+++ csw/mgar/pkg/tcpflow/trunk/Makefile	2014-02-07 15:45:18 UTC (rev 22964)
@@ -14,17 +14,19 @@
 endef
 
 MASTER_SITES = http://www.circlemud.org/pub/jelson/tcpflow/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
 
 # We define upstream file regex
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-# we require
-RUNTIME_DEP_PKGS = CSWlibpcap
+VENDOR_URL = http://www.circlemud.org/jelson/software/tcpflow/
 
-# no testscript
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES += CSWtcpflow
+SPKG_DESC_CSWtcpflow = A TCP Flow Recorder
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtcpflow += CSWlibpcap1
 
+# There is no testsuite
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/tcpflow/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcpflow/trunk/checksums	2014-02-07 13:32:20 UTC (rev 22963)
+++ csw/mgar/pkg/tcpflow/trunk/checksums	2014-02-07 15:45:18 UTC (rev 22964)
@@ -1 +1 @@
-45a5aef6f043312315b7f342afc4a9c5  download/tcpflow-0.21.tar.gz
+45a5aef6f043312315b7f342afc4a9c5  tcpflow-0.21.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  Fri Feb  7 21:17:08 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri,  7 Feb 2014 20:17:08 +0000
Subject: SF.net SVN: gar:[22965] csw/mgar/pkg/openssl1/trunk
Message-ID: <3fLSV65kfPz1Qt@mail.opencsw.org>

Revision: 22965
          http://sourceforge.net/p/gar/code/22965
Author:   chninkel
Date:     2014-02-07 20:17:05 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: add the manpage and html doc in the packages

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

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 15:45:18 UTC (rev 22964)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 20:17:05 UTC (rev 22965)
@@ -102,7 +102,11 @@
 
 # Update openssl.cnf path in man page to follow opencsw standard
 PATCHFILES += opencsw_paths.patch
-#
+
+# Make sure man pages and html docs are installed in proper locations
+# instead of /opt/csw/ssl/man and /opt/csw/ssl/html
+PATCHFILES += 0010-Move-manpages-and-html-doc-in-standard-locations.patch
+
 # Let's always block some compromised CA, whatever the CA configured
 # (patchs taken from Debian Package)
 PATCHFILES += block_bad_certificates.patch

Added: csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/0010-Move-manpages-and-html-doc-in-standard-locations.patch	2014-02-07 20:17:05 UTC (rev 22965)
@@ -0,0 +1,31 @@
+From e23e288f52c13eb2bde51017107583fa2c8c3ed6 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 7 Feb 2014 20:28:56 +0100
+Subject: [PATCH] Move manpages and html doc in standard locations
+
+---
+ Makefile.org | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index 41ed9bd..c52129a 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -160,12 +160,12 @@ TESTS = alltests
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=$(INSTALLTOP)/share/man
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
+ HTMLSUFFIX=html
+-HTMLDIR=$(OPENSSLDIR)/html
++HTMLDIR=$(INSTALLTOP)/share/doc/html
+ SHELL=/bin/sh
+ 
+ TOP=    .
+-- 
+1.8.4.1
+

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 15:45:18 UTC (rev 22964)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 20:17:05 UTC (rev 22965)
@@ -1,3 +1,9 @@
+openssl (1.0.1f,rev=2014.02.07) unstable
+
+  * Manpages and html doc are back in the package !
+
+   -- yann rouillard <yann at opencsw.org>  Fri, 07 Feb 2014 20:48:46 +0100
+
 openssl (1.0.1f,rev=2014.01.19) unstable
 
   * Update pkcs11 engine patch from Oracle userland sources.

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 Feb  7 21:26:08 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri,  7 Feb 2014 20:26:08 +0000
Subject: SF.net SVN: gar:[22966]
	csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0
	.1b.patch.2012-04-30
Message-ID: <3fLSjh1j76z1Vn@mail.opencsw.org>

Revision: 22966
          http://sourceforge.net/p/gar/code/22966
Author:   chninkel
Date:     2014-02-07 20:26:05 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: removed previous pkcs11 engine patch

Removed Paths:
-------------
    csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30

Deleted: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30	2014-02-07 20:17:05 UTC (rev 22965)
+++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-1.0.1b.patch.2012-04-30	2014-02-07 20:26:05 UTC (rev 22966)
@@ -1,12113 +0,0 @@
-diff -uNr openssl-0.9.8o.orig//Configure openssl-0.9.8o//Configure
---- openssl-0.9.8o.orig//Configure	2010-09-04 00:11:46.000000000 +0200
-+++ openssl-0.9.8o//Configure	2010-09-04 00:21:50.864850050 +0200
-@@ -10,7 +10,7 @@
- 
- # see INSTALL for instructions.
- 
--my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
-+my $usage="Usage: Configure --pk11-libname=PK11_LIB_LOCATION [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
- 
- # Options:
- #
-@@ -21,6 +21,9 @@
- # --prefix      prefix for the OpenSSL include, lib and bin directories
- #               (Default: the OPENSSLDIR directory)
- #
-+# --pk11-libname  PKCS#11 library name.
-+#               (Default: none)
-+#
- # --install_prefix  Additional prefix for package builders (empty by
- #               default).  This needn't be set in advance, you can
- #               just as well use "make INSTALL_PREFIX=/whatever install".
-@@ -591,6 +594,9 @@
- my $idx_ranlib = $idx++;
- my $idx_arflags = $idx++;
- 
-+# PKCS#11 engine patch
-+my $pk11_libname="";
-+
- my $prefix="";
- my $libdir="";
- my $openssldir="";
-@@ -829,6 +835,10 @@
- 				{
- 				$flags.=$_." ";
- 				}
-+                        elsif (/^--pk11-libname=(.*)$/)
-+                                {
-+                                $pk11_libname=$1;
-+                                }
- 			elsif (/^--prefix=(.*)$/)
- 				{
- 				$prefix=$1;
-@@ -964,6 +974,13 @@
- 	exit 0;
- }
- 
-+if (! $pk11_libname)
-+        {
-+        print STDERR "You must set --pk11-libname for PKCS#11 library.\n";
-+        print STDERR "See README.pkcs11 for more information.\n";
-+        exit 1;
-+        }
-+
- if ($target =~ m/^CygWin32(-.*)$/) {
- 	$target = "Cygwin".$1;
- }
-@@ -1130,6 +1147,8 @@
- if ($flags ne "")	{ $cflags="$flags$cflags"; }
- else			{ $no_user_cflags=1;       }
- 
-+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags";
-+
- # Kerberos settings.  The flavor must be provided from outside, either through
- # the script "config" or manually.
- if (!$no_krb5)
-@@ -1493,6 +1512,7 @@
- 	s/^VERSION=.*/VERSION=$version/;
- 	s/^MAJOR=.*/MAJOR=$major/;
- 	s/^MINOR=.*/MINOR=$minor/;
-+	s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/;
- 	s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/;
- 	s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
- 	s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
-diff -uNr openssl-0.9.8o.orig//Makefile.org openssl-0.9.8o//Makefile.org
---- openssl-0.9.8o.orig//Makefile.org	2010-01-27 17:06:36.000000000 +0100
-+++ openssl-0.9.8o//Makefile.org	2010-09-04 00:22:02.057767099 +0200
-@@ -26,6 +26,9 @@
- INSTALL_PREFIX=
- INSTALLTOP=/usr/local/ssl
- 
-+# You must set this through --pk11-libname configure option.
-+PK11_LIB_LOCATION=
-+
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
- OPENSSLDIR=/usr/local/ssl
- 
-diff -uNr openssl-0.9.8o.orig//crypto/engine/Makefile openssl-0.9.8o//crypto/engine/Makefile
---- openssl-0.9.8o.orig//crypto/engine/Makefile	2009-09-27 16:04:32.000000000 +0200
-+++ openssl-0.9.8o//crypto/engine/Makefile	2010-09-04 00:22:06.443813644 +0200
-@@ -22,13 +22,13 @@
- 	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
- 	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \
- 	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
--	eng_rsax.c eng_rdrand.c
-+	eng_rsax.c eng_rdrand.c hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c
- LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
- 	eng_table.o eng_pkey.o eng_fat.o eng_all.o \
- 	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
- 	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \
- 	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \
--	eng_rsax.o eng_rdrand.o
-+	eng_rsax.o eng_rdrand.o hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o
- 
- SRC= $(LIBSRC)
- 
-@@ -294,6 +296,59 @@
- eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
- eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h
- eng_table.o: eng_table.c
-+hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-+hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h
-+hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h
-+hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-+hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h
-+hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h
-+hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h
-+hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h
-+hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h
-+hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h
-+hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h
-+hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h
-+hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h
-+hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h
-+hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h
-+hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h
-+hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h
-+hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h
-+hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h
-+hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h
-+hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h
-+hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h
-+hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c
-+hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-+hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h
-+hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h
-+hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-+hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h
-+hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h
-+hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h
-+hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h
-+hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h
-+hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h
-+hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h
-+hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h
-+hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h
-+hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h
-+hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h
-+hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h
-+hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h
-+hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h
-+hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h
-+hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h
-+hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h
-+hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h
-+hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c
-+hw_pk11_uri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-+hw_pk11_uri.o: ../../include/openssl/opensslconf.h
-+hw_pk11_uri.o: ../../include/openssl/opensslv.h
-+hw_pk11_uri.o: ../../include/openssl/ossl_typ.h
-+hw_pk11_uri.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-+hw_pk11_uri.o: ../../include/openssl/symhacks.h hw_pk11.h hw_pk11_err.h
-+hw_pk11_uri.o: hw_pk11_uri.c hw_pk11_uri.h pkcs11f.h pkcs11t.h
- tb_asnmth.o: ../../e_os.h ../../include/openssl/asn1.h
- tb_asnmth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
- tb_asnmth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-diff -uNr openssl-0.9.8o.orig//crypto/engine/cryptoki.h openssl-0.9.8o//crypto/engine/cryptoki.h
---- openssl-0.9.8o.orig//crypto/engine/cryptoki.h	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-0.9.8o//crypto/engine/cryptoki.h	2010-09-04 00:22:06.460757086 +0200
-@@ -0,0 +1,103 @@
-+/*
-+ * CDDL HEADER START
-+ *
-+ * The contents of this file are subject to the terms of the
-+ * Common Development and Distribution License, Version 1.0 only
-+ * (the "License").  You may not use this file except in compliance
-+ * with the License.
-+ *
-+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-+ * or http://www.opensolaris.org/os/licensing.
-+ * See the License for the specific language governing permissions
-+ * and limitations under the License.
-+ *
-+ * When distributing Covered Code, include this CDDL HEADER in each
-+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-+ * If applicable, add the following below this CDDL HEADER, with the
-+ * fields enclosed by brackets "[]" replaced with your own identifying
-+ * information: Portions Copyright [yyyy] [name of copyright owner]
-+ *
-+ * CDDL HEADER END
-+ */
-+/*
-+ * Copyright 2003 Sun Microsystems, Inc.   All rights reserved.
-+ * Use is subject to license terms.
-+ */
-+
-+#ifndef	_CRYPTOKI_H
-+#define	_CRYPTOKI_H
-+
-+#pragma ident	"@(#)cryptoki.h	1.2	05/06/08 SMI"
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef	CK_PTR
-+#define	CK_PTR *
-+#endif
-+
-+#ifndef CK_DEFINE_FUNCTION
-+#define	CK_DEFINE_FUNCTION(returnType, name) returnType name
-+#endif
-+
-+#ifndef CK_DECLARE_FUNCTION
-+#define	CK_DECLARE_FUNCTION(returnType, name) returnType name
-+#endif
-+
-+#ifndef CK_DECLARE_FUNCTION_POINTER
-+#define	CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name)
-+#endif
-+
-+#ifndef CK_CALLBACK_FUNCTION
-+#define	CK_CALLBACK_FUNCTION(returnType, name) returnType (* name)
-+#endif
-+
-+#ifndef NULL_PTR
-+#include <unistd.h>	/* For NULL */
-+#define	NULL_PTR NULL
-+#endif
-+
-+/*
-+ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint
-+ */
-+#ifndef	CK_DISABLE_TRUE_FALSE
-+#define	CK_DISABLE_TRUE_FALSE
-+#ifndef	TRUE
-+#define	TRUE	1
-+#endif /* TRUE */
-+#ifndef	FALSE
-+#define	FALSE	0
-+#endif /* FALSE */
-+#endif /* CK_DISABLE_TRUE_FALSE */
-+
-+#undef CK_PKCS11_FUNCTION_INFO
-+
-+#include "pkcs11.h"
-+
-+/* Solaris specific functions */
-+
-+#include <stdlib.h>
-+
-+/*
-+ * SUNW_C_GetMechSession will initialize the framework and do all
-+ * the necessary PKCS#11 calls to create a session capable of
-+ * providing operations on the requested mechanism
-+ */
-+CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech,
-+    CK_SESSION_HANDLE_PTR hSession);
-+
-+/*
-+ * SUNW_C_KeyToObject will create a secret key object for the given
-+ * mechanism from the rawkey data.
-+ */
-+CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession,
-+    CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len,
-+    CK_OBJECT_HANDLE_PTR obj);
-+
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+
-+#endif	/* _CRYPTOKI_H */
-diff -uNr openssl-0.9.8o.orig//crypto/engine/eng_all.c openssl-0.9.8o//crypto/engine/eng_all.c
---- openssl-0.9.8o.orig//crypto/engine/eng_all.c	2010-03-01 01:30:11.000000000 +0100
-+++ openssl-0.9.8o//crypto/engine/eng_all.c	2010-09-04 00:22:06.503582943 +0200
-@@ -80,6 +80,9 @@
- 	ENGINE_load_rdrand();
- #endif
- 	ENGINE_load_dynamic();
-+#ifndef OPENSSL_NO_HW_PKCS11
-+	ENGINE_load_pk11();
-+#endif
- #ifndef OPENSSL_NO_STATIC_ENGINE
- #ifndef OPENSSL_NO_HW
- #ifndef OPENSSL_NO_HW_4758_CCA
-diff -uNr openssl-0.9.8o.orig//crypto/engine/engine.h openssl-0.9.8o//crypto/engine/engine.h
---- openssl-0.9.8o.orig//crypto/engine/engine.h	2010-02-09 15:18:15.000000000 +0100
-+++ openssl-0.9.8o//crypto/engine/engine.h	2010-09-04 00:22:06.528927372 +0200
-@@ -351,6 +351,7 @@
- #endif
- #endif
- void ENGINE_load_cryptodev(void);
-+void ENGINE_load_pk11(void);
- void ENGINE_load_rsax(void);
- void ENGINE_load_rdrand(void);
- void ENGINE_load_builtin_engines(void);
-diff -uNr openssl-0.9.8o.orig//crypto/engine/hw_pk11.c openssl-0.9.8o//crypto/engine/hw_pk11.c
---- openssl-0.9.8o.orig//crypto/engine/hw_pk11.c	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-0.9.8o//crypto/engine/hw_pk11.c	2010-09-04 00:22:06.552558696 +0200
-@@ -0,0 +1,3708 @@
-+/*
-+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-+ * Use is subject to license terms.
-+ */
-+
-+/* crypto/engine/hw_pk11.c */
-+/*
-+ * This product includes software developed by the OpenSSL Project for
-+ * use in the OpenSSL Toolkit (http://www.openssl.org/).
-+ *
-+ * This project also referenced hw_pkcs11-0.9.7b.patch written by
-+ * Afchine Madjlessi.
-+ */
-+/*
-+ * ====================================================================
-+ * Copyright (c) 2000-2001 The OpenSSL Project.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. All advertising materials mentioning features or use of this
-+ *    software must display the following acknowledgment:
-+ *    "This product includes software developed by the OpenSSL Project
-+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-+ *
-+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For written permission, please contact
-+ *    licensing at OpenSSL.org.
-+ *
-+ * 5. Products derived from this software may not be called "OpenSSL"
-+ *    nor may "OpenSSL" appear in their names without prior written
-+ *    permission of the OpenSSL Project.
-+ *
-+ * 6. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by the OpenSSL Project
-+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ * OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * ====================================================================
-+ *
-+ * This product includes cryptographic software written by Eric Young
-+ * (eay at cryptsoft.com).  This product includes software written by Tim
-+ * Hudson (tjh at cryptsoft.com).
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <strings.h>
-+
-+#include <openssl/e_os2.h>
-+#include <openssl/crypto.h>
-+#include <openssl/engine.h>
-+#include <openssl/dso.h>
-+#include <openssl/err.h>
-+#include <openssl/bn.h>
-+#include <openssl/md5.h>
-+#include <openssl/pem.h>
-+#ifndef OPENSSL_NO_RSA
-+#include <openssl/rsa.h>
-+#endif
-+#ifndef OPENSSL_NO_DSA
-+#include <openssl/dsa.h>
-+#endif
-+#ifndef OPENSSL_NO_DH
-+#include <openssl/dh.h>
-+#endif
-+#include <openssl/rand.h>
-+#include <openssl/objects.h>
-+#include <openssl/x509.h>
-+#include <openssl/aes.h>
-+#include <cryptlib.h>
-+#include <dlfcn.h>
-+#include <pthread.h>
-+
-+#ifndef OPENSSL_NO_HW
-+#ifndef OPENSSL_NO_HW_PK11
-+
-+/* label for debug messages printed on stderr */
-+#define	PK11_DBG	"PKCS#11 ENGINE DEBUG"
-+/* prints a lot of debug messages on stderr about slot selection process */
-+#undef	DEBUG_SLOT_SELECTION
-+/*
-+ * Solaris specific code. See comment at check_hw_mechanisms() for more
-+ * information.
-+ */
-+#if defined(__SVR4) && defined(__sun)
-+#define	SOLARIS_HW_SLOT_SELECTION
-+#endif
-+
-+#include "cryptoki.h"
-+#include "pkcs11.h"
-+#include "hw_pk11.h"
-+#include "hw_pk11_uri.h"
-+#include "hw_pk11_err.c"
-+
-+/*
-+ * We use this lock to prevent multiple C_Login()s, guard getpassphrase(),
-+ * uri_struct manipulation, and static token info. All of that is used by the
-+ * RSA keys by reference feature.
-+ */
-+pthread_mutex_t *uri_lock;
-+
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+/*
-+ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel
-+ * library. See comment at check_hw_mechanisms() for more information.
-+ */
-+int *hw_cnids;
-+int *hw_dnids;
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+
-+/* PKCS#11 session caches and their locks for all operation types */
-+static PK11_CACHE session_cache[OP_MAX];
-+
-+/*
-+ * We cache the flags so that we do not have to run C_GetTokenInfo() again when
-+ * logging into the token.
-+ */
-+CK_FLAGS pubkey_token_flags;
-+
-+/*
-+ * As stated in v2.20, 11.7 Object Management Function, in section for
-+ * C_FindObjectsInit(), at most one search operation may be active at a given
-+ * time in a given session. Therefore, C_Find{,Init,Final}Objects() should be
-+ * grouped together to form one atomic search operation. This is already
-+ * ensured by the property of unique PKCS#11 session handle used for each
-+ * PK11_SESSION object.
-+ *
-+ * This is however not the biggest concern - maintaining consistency of the
-+ * underlying object store is more important. The same section of the spec also
-+ * says that one thread can be in the middle of a search operation while another
-+ * thread destroys the object matching the search template which would result in
-+ * invalid handle returned from the search operation.
-+ *
-+ * Hence, the following locks are used for both protection of the object stores.
-+ * They are also used for active list protection.
-+ */
-+pthread_mutex_t *find_lock[OP_MAX] = { NULL };
-+
-+/*
-+ * lists of asymmetric key handles which are active (referenced by at least one
-+ * PK11_SESSION structure, either held by a thread or present in free_session
-+ * list) for given algorithm type
-+ */
-+PK11_active *active_list[OP_MAX] = { NULL };
-+
-+/*
-+ * Create all secret key objects in a global session so that they are available
-+ * to use for other sessions. These other sessions may be opened or closed
-+ * without losing the secret key objects.
-+ */
-+static CK_SESSION_HANDLE	global_session = CK_INVALID_HANDLE;
-+
-+/* ENGINE level stuff */
-+static int pk11_init(ENGINE *e);
-+static int pk11_library_init(ENGINE *e);
-+static int pk11_finish(ENGINE *e);
-+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
-+static int pk11_destroy(ENGINE *e);
-+
-+/* RAND stuff */
-+static void pk11_rand_seed(const void *buf, int num);
-+static void pk11_rand_add(const void *buf, int num, double add_entropy);
-+static void pk11_rand_cleanup(void);
-+static int pk11_rand_bytes(unsigned char *buf, int num);
-+static int pk11_rand_status(void);
-+
-+/* These functions are also used in other files */
-+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype);
-+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype);
-+
-+/* active list manipulation functions used in this file */
-+extern int pk11_active_delete(CK_OBJECT_HANDLE h, PK11_OPTYPE type);
-+extern void pk11_free_active_list(PK11_OPTYPE type);
-+
-+#ifndef OPENSSL_NO_RSA
-+int pk11_destroy_rsa_key_objects(PK11_SESSION *session);
-+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock);
-+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock);
-+#endif
-+#ifndef OPENSSL_NO_DSA
-+int pk11_destroy_dsa_key_objects(PK11_SESSION *session);
-+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock);
-+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock);
-+#endif
-+#ifndef OPENSSL_NO_DH
-+int pk11_destroy_dh_key_objects(PK11_SESSION *session);
-+int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock);
-+#endif
-+
-+/* Local helper functions */
-+static int pk11_free_all_sessions(void);
-+static int pk11_free_session_list(PK11_OPTYPE optype);
-+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype);
-+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session);
-+static int pk11_destroy_object(CK_SESSION_HANDLE handle, CK_OBJECT_HANDLE oh,
-+    CK_BBOOL persistent);
-+static const char *get_PK11_LIBNAME(void);
-+static void free_PK11_LIBNAME(void);
-+static long set_PK11_LIBNAME(const char *name);
-+
-+/* Symmetric cipher and digest support functions */
-+static int cipher_nid_to_pk11(int nid);
-+static int pk11_usable_ciphers(const int **nids);
-+static int pk11_usable_digests(const int **nids);
-+static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+	const unsigned char *iv, int enc);
-+static int pk11_cipher_final(PK11_SESSION *sp);
-+static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+	const unsigned char *in, unsigned int inl);
-+static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx);
-+static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-+	const int **nids, int nid);
-+static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest,
-+	const int **nids, int nid);
-+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx,
-+	const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp);
-+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key,
-+	int key_len);
-+static int md_nid_to_pk11(int nid);
-+static int pk11_digest_init(EVP_MD_CTX *ctx);
-+static int pk11_digest_update(EVP_MD_CTX *ctx, const void *data,
-+	size_t count);
-+static int pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md);
-+static int pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from);
-+static int pk11_digest_cleanup(EVP_MD_CTX *ctx);
-+
-+static int pk11_choose_slots(int *any_slot_found);
-+static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist,
-+    CK_SLOT_ID current_slot, int *current_slot_n_cipher,
-+    int *local_cipher_nids);
-+static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist,
-+    CK_SLOT_ID current_slot, int *current_slot_n_digest,
-+    int *local_digest_nids);
-+static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id,
-+    CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids,
-+    int id);
-+static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id,
-+    CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids,
-+    int id);
-+
-+static int pk11_init_all_locks(void);
-+static void pk11_free_all_locks(void);
-+
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+static int check_hw_mechanisms(void);
-+static int nid_in_table(int nid, int *nid_table);
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+
-+/* Index for the supported ciphers */
-+enum pk11_cipher_id {
-+	PK11_DES_CBC,
-+	PK11_DES3_CBC,
-+	PK11_DES_ECB,
-+	PK11_DES3_ECB,
-+	PK11_RC4,
-+	PK11_AES_128_CBC,
-+	PK11_AES_192_CBC,
-+	PK11_AES_256_CBC,
-+	PK11_AES_128_ECB,
-+	PK11_AES_192_ECB,
-+	PK11_AES_256_ECB,
-+	PK11_BLOWFISH_CBC,
-+	PK11_AES_128_CTR,
-+	PK11_AES_192_CTR,
-+	PK11_AES_256_CTR,
-+	PK11_CIPHER_MAX
-+};
-+
-+/* Index for the supported digests */
-+enum pk11_digest_id {
-+	PK11_MD5,
-+	PK11_SHA1,
-+	PK11_SHA224,
-+	PK11_SHA256,
-+	PK11_SHA384,
-+	PK11_SHA512,
-+	PK11_DIGEST_MAX
-+};
-+
-+#define	TRY_OBJ_DESTROY(sp, obj_hdl, retval, uselock, alg_type)	\
-+	{								\
-+	if (uselock)							\
-+		LOCK_OBJSTORE(alg_type);				\
-+	if (pk11_active_delete(obj_hdl, alg_type) == 1)			\
-+		{							\
-+		retval = pk11_destroy_object(sp->session, obj_hdl,	\
-+		    sp->persistent);					\
-+		}							\
-+	if (uselock)							\
-+		UNLOCK_OBJSTORE(alg_type);				\
-+	}
-+
-+static int cipher_nids[PK11_CIPHER_MAX];
-+static int digest_nids[PK11_DIGEST_MAX];
-+static int cipher_count		= 0;
-+static int digest_count		= 0;
-+static CK_BBOOL pk11_have_rsa	= CK_FALSE;
-+static CK_BBOOL pk11_have_dsa	= CK_FALSE;
-+static CK_BBOOL pk11_have_dh	= CK_FALSE;
-+static CK_BBOOL pk11_have_random = CK_FALSE;
-+
-+typedef struct PK11_CIPHER_st
-+	{
-+	enum pk11_cipher_id	id;
-+	int			nid;
-+	int			iv_len;
-+	int			min_key_len;
-+	int			max_key_len;
-+	CK_KEY_TYPE		key_type;
-+	CK_MECHANISM_TYPE	mech_type;
-+	} PK11_CIPHER;
-+
-+static PK11_CIPHER ciphers[] =
-+	{
-+	{ PK11_DES_CBC,		NID_des_cbc,		8,	 8,   8,
-+		CKK_DES,	CKM_DES_CBC, },
-+	{ PK11_DES3_CBC,	NID_des_ede3_cbc,	8,	24,  24,
-+		CKK_DES3,	CKM_DES3_CBC, },
-+	{ PK11_DES_ECB,		NID_des_ecb,		0,	 8,   8,
-+		CKK_DES,	CKM_DES_ECB, },
-+	{ PK11_DES3_ECB,	NID_des_ede3_ecb,	0,	24,  24,
-+		CKK_DES3,	CKM_DES3_ECB, },
-+	{ PK11_RC4,		NID_rc4,		0,	16, 256,
-+		CKK_RC4,	CKM_RC4, },
-+	{ PK11_AES_128_CBC,	NID_aes_128_cbc,	16,	16,  16,
-+		CKK_AES,	CKM_AES_CBC, },
-+	{ PK11_AES_192_CBC,	NID_aes_192_cbc,	16,	24,  24,
-+		CKK_AES,	CKM_AES_CBC, },
-+	{ PK11_AES_256_CBC,	NID_aes_256_cbc,	16,	32,  32,
-+		CKK_AES,	CKM_AES_CBC, },
-+	{ PK11_AES_128_ECB,	NID_aes_128_ecb,	0,	16,  16,
-+		CKK_AES,	CKM_AES_ECB, },
-+	{ PK11_AES_192_ECB,	NID_aes_192_ecb,	0,	24,  24,
-+		CKK_AES,	CKM_AES_ECB, },
-+	{ PK11_AES_256_ECB,	NID_aes_256_ecb,	0,	32,  32,
-+		CKK_AES,	CKM_AES_ECB, },
-+	{ PK11_BLOWFISH_CBC,	NID_bf_cbc,		8,	16,  16,
-+		CKK_BLOWFISH,	CKM_BLOWFISH_CBC, },
-+	/* we don't know the correct NIDs until the engine is initialized */
-+	{ PK11_AES_128_CTR,	NID_aes_128_ctr,	16,	16,  16,
-+		CKK_AES,	CKM_AES_CTR, },
-+	{ PK11_AES_192_CTR,	NID_aes_192_ctr,	16,	24,  24,
-+		CKK_AES,	CKM_AES_CTR, },
-+	{ PK11_AES_256_CTR,	NID_aes_256_ctr,	16,	32,  32,
-+		CKK_AES,	CKM_AES_CTR, },
-+	};
-+
-+typedef struct PK11_DIGEST_st
-+	{
-+	enum pk11_digest_id	id;
-+	int			nid;
-+	CK_MECHANISM_TYPE	mech_type;
-+	} PK11_DIGEST;
-+
-+static PK11_DIGEST digests[] =
-+	{
-+	{PK11_MD5,	NID_md5,	CKM_MD5, },
-+	{PK11_SHA1,	NID_sha1,	CKM_SHA_1, },
-+	{PK11_SHA224,	NID_sha224,	CKM_SHA224, },
-+	{PK11_SHA256,	NID_sha256,	CKM_SHA256, },
-+	{PK11_SHA384,	NID_sha384,	CKM_SHA384, },
-+	{PK11_SHA512,	NID_sha512,	CKM_SHA512, },
-+	{0,		NID_undef,	0xFFFF, },
-+	};
-+
-+/*
-+ * Structure to be used for the cipher_data/md_data in
-+ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same pk11
-+ * session in multiple cipher_update calls
-+ */
-+typedef struct PK11_CIPHER_STATE_st
-+	{
-+	PK11_SESSION	*sp;
-+	} PK11_CIPHER_STATE;
-+
-+
-+/*
-+ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets
-+ * called when libcrypto requests a cipher NID.
-+ *
-+ * Note how the PK11_CIPHER_STATE is used here.
-+ */
-+
-+/* DES CBC EVP */
-+static const EVP_CIPHER pk11_des_cbc =
-+	{
-+	NID_des_cbc,
-+	8, 8, 8,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+/* 3DES CBC EVP */
-+static const EVP_CIPHER pk11_3des_cbc =
-+	{
-+	NID_des_ede3_cbc,
-+	8, 24, 8,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+/*
-+ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and
-+ * get_asn1_parameters fields are set to NULL.
-+ */
-+static const EVP_CIPHER pk11_des_ecb =
-+	{
-+	NID_des_ecb,
-+	8, 8, 8,
-+	EVP_CIPH_ECB_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_3des_ecb =
-+	{
-+	NID_des_ede3_ecb,
-+	8, 24, 8,
-+	EVP_CIPH_ECB_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+
-+static const EVP_CIPHER pk11_aes_128_cbc =
-+	{
-+	NID_aes_128_cbc,
-+	16, 16, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_192_cbc =
-+	{
-+	NID_aes_192_cbc,
-+	16, 24, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_256_cbc =
-+	{
-+	NID_aes_256_cbc,
-+	16, 32, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+/*
-+ * ECB modes don't use IV so that's why set_asn1_parameters and
-+ * get_asn1_parameters are set to NULL.
-+ */
-+static const EVP_CIPHER pk11_aes_128_ecb =
-+	{
-+	NID_aes_128_ecb,
-+	16, 16, 0,
-+	EVP_CIPH_ECB_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_192_ecb =
-+	{
-+	NID_aes_192_ecb,
-+	16, 24, 0,
-+	EVP_CIPH_ECB_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_256_ecb =
-+	{
-+	NID_aes_256_ecb,
-+	16, 32, 0,
-+	EVP_CIPH_ECB_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_128_ctr =
-+	{
-+	NID_aes_128_ctr,
-+	16, 16, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_192_ctr =
-+	{
-+	NID_aes_192_ctr,
-+	16, 24, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_aes_256_ctr =
-+	{
-+	NID_aes_256_ctr,
-+	16, 32, 16,
-+	EVP_CIPH_CBC_MODE,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_bf_cbc =
-+	{
-+	NID_bf_cbc,
-+	8, 16, 8,
-+	EVP_CIPH_VARIABLE_LENGTH,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	EVP_CIPHER_set_asn1_iv,
-+	EVP_CIPHER_get_asn1_iv,
-+	NULL
-+	};
-+
-+static const EVP_CIPHER pk11_rc4 =
-+	{
-+	NID_rc4,
-+	1, 16, 0,
-+	EVP_CIPH_VARIABLE_LENGTH,
-+	pk11_cipher_init,
-+	pk11_cipher_do_cipher,
-+	pk11_cipher_cleanup,
-+	sizeof (PK11_CIPHER_STATE),
-+	NULL,
-+	NULL,
-+	NULL
-+	};
-+
-+static const EVP_MD pk11_md5 =
-+	{
-+	NID_md5,
-+	NID_md5WithRSAEncryption,
-+	MD5_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	MD5_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+static const EVP_MD pk11_sha1 =
-+	{
-+	NID_sha1,
-+	NID_sha1WithRSAEncryption,
-+	SHA_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	SHA_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+static const EVP_MD pk11_sha224 =
-+	{
-+	NID_sha224,
-+	NID_sha224WithRSAEncryption,
-+	SHA224_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	/* SHA-224 uses the same cblock size as SHA-256 */
-+	SHA256_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+static const EVP_MD pk11_sha256 =
-+	{
-+	NID_sha256,
-+	NID_sha256WithRSAEncryption,
-+	SHA256_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	SHA256_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+static const EVP_MD pk11_sha384 =
-+	{
-+	NID_sha384,
-+	NID_sha384WithRSAEncryption,
-+	SHA384_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	/* SHA-384 uses the same cblock size as SHA-512 */
-+	SHA512_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+static const EVP_MD pk11_sha512 =
-+	{
-+	NID_sha512,
-+	NID_sha512WithRSAEncryption,
-+	SHA512_DIGEST_LENGTH,
-+	0,
-+	pk11_digest_init,
-+	pk11_digest_update,
-+	pk11_digest_final,
-+	pk11_digest_copy,
-+	pk11_digest_cleanup,
-+	EVP_PKEY_RSA_method,
-+	SHA512_CBLOCK,
-+	sizeof (PK11_CIPHER_STATE),
-+	};
-+
-+/*
-+ * Initialization function. Sets up various PKCS#11 library components.
-+ * The definitions for control commands specific to this engine
-+ */
-+#define	PK11_CMD_SO_PATH		ENGINE_CMD_BASE
-+static const ENGINE_CMD_DEFN pk11_cmd_defns[] =
-+	{
-+		{
-+		PK11_CMD_SO_PATH,
-+		"SO_PATH",
-+		"Specifies the path to the 'pkcs#11' shared library",
-+		ENGINE_CMD_FLAG_STRING
-+		},
-+		{0, NULL, NULL, 0}
-+	};
-+
-+
-+static RAND_METHOD pk11_random =
-+	{
-+	pk11_rand_seed,
-+	pk11_rand_bytes,
-+	pk11_rand_cleanup,
-+	pk11_rand_add,
-+	pk11_rand_bytes,
-+	pk11_rand_status
-+	};
-+
-+
-+/* Constants used when creating the ENGINE */
-+static const char *engine_pk11_id = "pkcs11";
-+static const char *engine_pk11_name = "PKCS #11 engine support";
-+
-+CK_FUNCTION_LIST_PTR pFuncList = NULL;
-+static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList";
-+
-+/*
-+ * This is a static string constant for the DSO file name and the function
-+ * symbol names to bind to. We set it in the Configure script based on whether
-+ * this is 32 or 64 bit build.
-+ */
-+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION;
-+
-+static CK_BBOOL true = TRUE;
-+static CK_BBOOL false = FALSE;
-+/* Needed in hw_pk11_pub.c as well so that's why it is not static. */
-+CK_SLOT_ID pubkey_SLOTID = 0;
-+static CK_SLOT_ID rand_SLOTID = 0;
-+static CK_SLOT_ID SLOTID = 0;
-+static CK_BBOOL pk11_library_initialized = FALSE;
-+static CK_BBOOL pk11_atfork_initialized = FALSE;
-+static int pk11_pid = 0;
-+
-+static DSO *pk11_dso = NULL;
-+
-+/* allocate and initialize all locks used by the engine itself */
-+static int pk11_init_all_locks(void)
-+	{
-+	int type;
-+
-+#ifndef OPENSSL_NO_RSA
-+	find_lock[OP_RSA] = OPENSSL_malloc(sizeof (pthread_mutex_t));
-+	if (find_lock[OP_RSA] == NULL)
-+		goto malloc_err;
-+	(void) pthread_mutex_init(find_lock[OP_RSA], NULL);
-+#endif /* OPENSSL_NO_RSA */
-+
-+	if ((uri_lock = OPENSSL_malloc(sizeof (pthread_mutex_t))) == NULL)
-+		goto malloc_err;
-+	(void) pthread_mutex_init(uri_lock, NULL);
-+
-+#ifndef OPENSSL_NO_DSA
-+	find_lock[OP_DSA] = OPENSSL_malloc(sizeof (pthread_mutex_t));
-+	if (find_lock[OP_DSA] == NULL)
-+		goto malloc_err;
-+	(void) pthread_mutex_init(find_lock[OP_DSA], NULL);
-+#endif /* OPENSSL_NO_DSA */
-+
-+#ifndef OPENSSL_NO_DH
-+	find_lock[OP_DH] = OPENSSL_malloc(sizeof (pthread_mutex_t));
-+	if (find_lock[OP_DH] == NULL)
-+		goto malloc_err;
-+	(void) pthread_mutex_init(find_lock[OP_DH], NULL);
-+#endif /* OPENSSL_NO_DH */
-+
-+	for (type = 0; type < OP_MAX; type++)
-+		{
-+		session_cache[type].lock =
-+		    OPENSSL_malloc(sizeof (pthread_mutex_t));
-+		if (session_cache[type].lock == NULL)
-+			goto malloc_err;
-+		(void) pthread_mutex_init(session_cache[type].lock, NULL);
-+		}
-+
-+	return (1);
-+
-+malloc_err:
-+	pk11_free_all_locks();
-+	PK11err(PK11_F_INIT_ALL_LOCKS, PK11_R_MALLOC_FAILURE);
-+	return (0);
-+	}
-+
-+static void pk11_free_all_locks(void)
-+	{
-+	int type;
-+
-+#ifndef OPENSSL_NO_RSA
-+	if (find_lock[OP_RSA] != NULL)
-+		{
-+		(void) pthread_mutex_destroy(find_lock[OP_RSA]);
-+		OPENSSL_free(find_lock[OP_RSA]);
-+		find_lock[OP_RSA] = NULL;
-+		}
-+#endif /* OPENSSL_NO_RSA */
-+#ifndef OPENSSL_NO_DSA
-+	if (find_lock[OP_DSA] != NULL)
-+		{
-+		(void) pthread_mutex_destroy(find_lock[OP_DSA]);
-+		OPENSSL_free(find_lock[OP_DSA]);
-+		find_lock[OP_DSA] = NULL;
-+		}
-+#endif /* OPENSSL_NO_DSA */
-+#ifndef OPENSSL_NO_DH
-+	if (find_lock[OP_DH] != NULL)
-+		{
-+		(void) pthread_mutex_destroy(find_lock[OP_DH]);
-+		OPENSSL_free(find_lock[OP_DH]);
-+		find_lock[OP_DH] = NULL;
-+		}
-+#endif /* OPENSSL_NO_DH */
-+
-+	for (type = 0; type < OP_MAX; type++)
-+		{
-+		if (session_cache[type].lock != NULL)
-+			{
-+			(void) pthread_mutex_destroy(session_cache[type].lock);
-+			OPENSSL_free(session_cache[type].lock);
-+			session_cache[type].lock = NULL;
-+			}
-+		}
-+	}
-+
-+/*
-+ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support.
-+ */
-+static int bind_pk11(ENGINE *e)
-+	{
-+#ifndef OPENSSL_NO_RSA
-+	const RSA_METHOD *rsa = NULL;
-+	RSA_METHOD *pk11_rsa = PK11_RSA();
-+#endif	/* OPENSSL_NO_RSA */
-+	if (!pk11_library_initialized)
-+		if (!pk11_library_init(e))
-+			return (0);
-+
-+	if (!ENGINE_set_id(e, engine_pk11_id) ||
-+	    !ENGINE_set_name(e, engine_pk11_name) ||
-+	    !ENGINE_set_ciphers(e, pk11_engine_ciphers) ||
-+	    !ENGINE_set_digests(e, pk11_engine_digests))
-+		return (0);
-+#ifndef OPENSSL_NO_RSA
-+	if (pk11_have_rsa == CK_TRUE)
-+		{
-+		if (!ENGINE_set_RSA(e, PK11_RSA()) ||
-+		    !ENGINE_set_load_privkey_function(e, pk11_load_privkey) ||
-+		    !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey))
-+			return (0);
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: registered RSA\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		}
-+#endif	/* OPENSSL_NO_RSA */
-+#ifndef OPENSSL_NO_DSA
-+	if (pk11_have_dsa == CK_TRUE)
-+		{
-+		if (!ENGINE_set_DSA(e, PK11_DSA()))
-+			return (0);
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: registered DSA\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		}
-+#endif	/* OPENSSL_NO_DSA */
-+#ifndef OPENSSL_NO_DH
-+	if (pk11_have_dh == CK_TRUE)
-+		{
-+		if (!ENGINE_set_DH(e, PK11_DH()))
-+			return (0);
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: registered DH\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		}
-+#endif	/* OPENSSL_NO_DH */
-+	if (pk11_have_random)
-+		{
-+		if (!ENGINE_set_RAND(e, &pk11_random))
-+			return (0);
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: registered random\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		}
-+	if (!ENGINE_set_init_function(e, pk11_init) ||
-+	    !ENGINE_set_destroy_function(e, pk11_destroy) ||
-+	    !ENGINE_set_finish_function(e, pk11_finish) ||
-+	    !ENGINE_set_ctrl_function(e, pk11_ctrl) ||
-+	    !ENGINE_set_cmd_defns(e, pk11_cmd_defns))
-+		return (0);
-+
-+/*
-+ * Apache calls OpenSSL function RSA_blinding_on() once during startup
-+ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp
-+ * here, we wire it back to the OpenSSL software implementation.
-+ * Since it is used only once, performance is not a concern.
-+ */
-+#ifndef OPENSSL_NO_RSA
-+	rsa = RSA_PKCS1_SSLeay();
-+	pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp;
-+	pk11_rsa->bn_mod_exp = rsa->bn_mod_exp;
-+#endif	/* OPENSSL_NO_RSA */
-+
-+	/* Ensure the pk11 error handling is set up */
-+	ERR_load_pk11_strings();
-+
-+	return (1);
-+	}
-+
-+/* Dynamic engine support is disabled at a higher level for Solaris */
-+#ifdef	ENGINE_DYNAMIC_SUPPORT
-+static int bind_helper(ENGINE *e, const char *id)
-+	{
-+	if (id && (strcmp(id, engine_pk11_id) != 0))
-+		return (0);
-+
-+	if (!bind_pk11(e))
-+		return (0);
-+
-+	return (1);
-+	}
-+
-+IMPLEMENT_DYNAMIC_CHECK_FN()
-+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-+
-+#else
-+static ENGINE *engine_pk11(void)
-+	{
-+	ENGINE *ret = ENGINE_new();
-+
-+	if (!ret)
-+		return (NULL);
-+
-+	if (!bind_pk11(ret))
-+		{
-+		ENGINE_free(ret);
-+		return (NULL);
-+		}
-+
-+	return (ret);
-+	}
-+
-+void
-+ENGINE_load_pk11(void)
-+	{
-+	ENGINE *e_pk11 = NULL;
-+
-+	/*
-+	 * Do not use dynamic PKCS#11 library on Solaris due to
-+	 * security reasons. We will link it in statically.
-+	 */
-+	/* Attempt to load PKCS#11 library */
-+	if (!pk11_dso)
-+		pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0);
-+
-+	if (pk11_dso == NULL)
-+		{
-+		PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE);
-+		return;
-+		}
-+
-+	e_pk11 = engine_pk11();
-+	if (!e_pk11)
-+		{
-+		DSO_free(pk11_dso);
-+		pk11_dso = NULL;
-+		return;
-+		}
-+
-+	/*
-+	 * At this point, the pk11 shared library is either dynamically
-+	 * loaded or statically linked in. So, initialize the pk11
-+	 * library before calling ENGINE_set_default since the latter
-+	 * needs cipher and digest algorithm information
-+	 */
-+	if (!pk11_library_init(e_pk11))
-+		{
-+		DSO_free(pk11_dso);
-+		pk11_dso = NULL;
-+		ENGINE_free(e_pk11);
-+		return;
-+		}
-+
-+	ENGINE_add(e_pk11);
-+
-+	ENGINE_free(e_pk11);
-+	ERR_clear_error();
-+	}
-+#endif	/* ENGINE_DYNAMIC_SUPPORT */
-+
-+/*
-+ * These are the static string constants for the DSO file name and
-+ * the function symbol names to bind to.
-+ */
-+static const char *PK11_LIBNAME = NULL;
-+
-+static const char *get_PK11_LIBNAME(void)
-+	{
-+	if (PK11_LIBNAME)
-+		return (PK11_LIBNAME);
-+
-+	return (def_PK11_LIBNAME);
-+	}
-+
-+static void free_PK11_LIBNAME(void)
-+	{
-+	if (PK11_LIBNAME)
-+		OPENSSL_free((void*)PK11_LIBNAME);
-+
-+	PK11_LIBNAME = NULL;
-+	}
-+
-+static long set_PK11_LIBNAME(const char *name)
-+	{
-+	free_PK11_LIBNAME();
-+
-+	return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0);
-+	}
-+
-+/* acquire all engine specific mutexes before fork */
-+static void pk11_fork_prepare(void)
-+	{
-+	int i;
-+
-+	if (!pk11_library_initialized)
-+		return;
-+
-+	LOCK_OBJSTORE(OP_RSA);
-+	LOCK_OBJSTORE(OP_DSA);
-+	LOCK_OBJSTORE(OP_DH);
-+	(void) pthread_mutex_lock(uri_lock);
-+	for (i = 0; i < OP_MAX; i++)
-+		{
-+		(void) pthread_mutex_lock(session_cache[i].lock);
-+		}
-+	}
-+
-+/* release all engine specific mutexes */
-+static void pk11_fork_parent(void)
-+	{
-+	int i;
-+
-+	if (!pk11_library_initialized)
-+		return;
-+
-+	for (i = OP_MAX - 1; i >= 0; i--)
-+		{
-+		(void) pthread_mutex_unlock(session_cache[i].lock);
-+		}
-+	UNLOCK_OBJSTORE(OP_DH);
-+	UNLOCK_OBJSTORE(OP_DSA);
-+	UNLOCK_OBJSTORE(OP_RSA);
-+	(void) pthread_mutex_unlock(uri_lock);
-+	}
-+
-+/*
-+ * same situation as in parent - we need to unlock all locks to make them
-+ * accessible to all threads.
-+ */
-+static void pk11_fork_child(void)
-+	{
-+	int i;
-+
-+	if (!pk11_library_initialized)
-+		return;
-+
-+	for (i = OP_MAX - 1; i >= 0; i--)
-+		{
-+		(void) pthread_mutex_unlock(session_cache[i].lock);
-+		}
-+	UNLOCK_OBJSTORE(OP_DH);
-+	UNLOCK_OBJSTORE(OP_DSA);
-+	UNLOCK_OBJSTORE(OP_RSA);
-+	(void) pthread_mutex_unlock(uri_lock);
-+	}
-+
-+/* Initialization function for the pk11 engine */
-+static int pk11_init(ENGINE *e)
-+{
-+	return (pk11_library_init(e));
-+}
-+
-+/*
-+ * Initialization function. Sets up various PKCS#11 library components.
-+ * It selects a slot based on predefined critiera. In the process, it also
-+ * count how many ciphers and digests to support. Since the cipher and
-+ * digest information is needed when setting default engine, this function
-+ * needs to be called before calling ENGINE_set_default.
-+ */
-+/* ARGSUSED */
-+static int pk11_library_init(ENGINE *e)
-+	{
-+	CK_C_GetFunctionList p;
-+	CK_RV rv = CKR_OK;
-+	CK_INFO info;
-+	CK_ULONG ul_state_len;
-+	int any_slot_found;
-+	int i;
-+
-+	/*
-+	 * pk11_library_initialized is set to 0 in pk11_finish() which is called
-+	 * from ENGINE_finish(). However, if there is still at least one
-+	 * existing functional reference to the engine (see engine(3) for more
-+	 * information), pk11_finish() is skipped. For example, this can happen
-+	 * if an application forgets to clear one cipher context. In case of a
-+	 * fork() when the application is finishing the engine so that it can be
-+	 * reinitialized in the child, forgotten functional reference causes
-+	 * pk11_library_initialized to stay 1. In that case we need the PID
-+	 * check so that we properly initialize the engine again.
-+	 */
-+	if (pk11_library_initialized)
-+		{
-+		if (pk11_pid == getpid())
-+			{
-+			return (1);
-+			}
-+		else
-+			{
-+			global_session = CK_INVALID_HANDLE;
-+			/*
-+			 * free the locks first to prevent memory leak in case
-+			 * the application calls fork() without finishing the
-+			 * engine first.
-+			 */
-+			pk11_free_all_locks();
-+			}
-+		}
-+
-+	if (pk11_dso == NULL)
-+		{
-+		PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE);
-+		goto err;
-+		}
-+
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+	if (check_hw_mechanisms() == 0)
-+		goto err;
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+
-+	/* get the C_GetFunctionList function from the loaded library */
-+	p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso,
-+		PK11_GET_FUNCTION_LIST);
-+	if (!p)
-+		{
-+		PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE);
-+		goto err;
-+		}
-+
-+	/* get the full function list from the loaded library */
-+	rv = p(&pFuncList);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv);
-+		goto err;
-+		}
-+
-+	rv = pFuncList->C_Initialize(NULL_PTR);
-+	if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED))
-+		{
-+		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv);
-+		goto err;
-+		}
-+
-+	rv = pFuncList->C_GetInfo(&info);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv);
-+		goto err;
-+		}
-+
-+	if (pk11_choose_slots(&any_slot_found) == 0)
-+		goto err;
-+
-+	/*
-+	 * The library we use, set in def_PK11_LIBNAME, may not offer any
-+	 * slot(s). In that case, we must not proceed but we must not return an
-+	 * error. The reason is that applications that try to set up the PKCS#11
-+	 * engine don't exit on error during the engine initialization just
-+	 * because no slot was present.
-+	 */
-+	if (any_slot_found == 0)
-+		return (1);
-+
-+	if (global_session == CK_INVALID_HANDLE)
-+		{
-+		/* Open the global_session for the new process */
-+		rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
-+			NULL_PTR, NULL_PTR, &global_session);
-+		if (rv != CKR_OK)
-+			{
-+			PK11err_add_data(PK11_F_LIBRARY_INIT,
-+			    PK11_R_OPENSESSION, rv);
-+			goto err;
-+			}
-+		}
-+
-+	/*
-+	 * Disable digest if C_GetOperationState is not supported since
-+	 * this function is required by OpenSSL digest copy function
-+	 */
-+	if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len)
-+			== CKR_FUNCTION_NOT_SUPPORTED) {
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: C_GetOperationState() not supported, "
-+		    "setting digest_count to 0\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		digest_count = 0;
-+	}
-+
-+	pk11_library_initialized = TRUE;
-+	pk11_pid = getpid();
-+	/*
-+	 * if initialization of the locks fails pk11_init_all_locks()
-+	 * will do the cleanup.
-+	 */
-+	if (!pk11_init_all_locks())
-+		goto err;
-+	for (i = 0; i < OP_MAX; i++)
-+		session_cache[i].head = NULL;
-+	/*
-+	 * initialize active lists. We only use active lists
-+	 * for asymmetric ciphers.
-+	 */
-+	for (i = 0; i < OP_MAX; i++)
-+		active_list[i] = NULL;
-+
-+	if (!pk11_atfork_initialized)
-+		{
-+		if (pthread_atfork(pk11_fork_prepare, pk11_fork_parent,
-+		    pk11_fork_child) != 0)
-+			{
-+			PK11err(PK11_F_LIBRARY_INIT, PK11_R_ATFORK_FAILED);
-+			goto err;
-+			}
-+		pk11_atfork_initialized = TRUE;
-+		}
-+
-+	return (1);
-+
-+err:
-+	return (0);
-+	}
-+
-+/* Destructor (complements the "ENGINE_pk11()" constructor) */
-+/* ARGSUSED */
-+static int pk11_destroy(ENGINE *e)
-+	{
-+	free_PK11_LIBNAME();
-+	ERR_unload_pk11_strings();
-+	return (1);
-+	}
-+
-+/*
-+ * Termination function to clean up the session, the token, and the pk11
-+ * library.
-+ */
-+/* ARGSUSED */
-+static int pk11_finish(ENGINE *e)
-+	{
-+	int i;
-+
-+	if (pk11_dso == NULL)
-+		{
-+		PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED);
-+		goto err;
-+		}
-+
-+	OPENSSL_assert(pFuncList != NULL);
-+
-+	if (pk11_free_all_sessions() == 0)
-+		goto err;
-+
-+	/* free all active lists */
-+	for (i = 0; i < OP_MAX; i++)
-+		pk11_free_active_list(i);
-+
-+	pFuncList->C_CloseSession(global_session);
-+	global_session = CK_INVALID_HANDLE;
-+
-+	/*
-+	 * Since we are part of a library (libcrypto.so), calling this function
-+	 * may have side-effects.
-+	 */
-+#if 0
-+	pFuncList->C_Finalize(NULL);
-+#endif
-+
-+	if (!DSO_free(pk11_dso))
-+		{
-+		PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE);
-+		goto err;
-+		}
-+	pk11_dso = NULL;
-+	pFuncList = NULL;
-+	pk11_library_initialized = FALSE;
-+	pk11_pid = 0;
-+	/*
-+	 * There is no way how to unregister atfork handlers (other than
-+	 * unloading the library) so we just free the locks. For this reason
-+	 * the atfork handlers check if the engine is initialized and bail out
-+	 * immediately if not. This is necessary in case a process finishes
-+	 * the engine before calling fork().
-+	 */
-+	pk11_free_all_locks();
-+
-+	return (1);
-+
-+err:
-+	return (0);
-+	}
-+
-+/* Standard engine interface function to set the dynamic library path */
-+/* ARGSUSED */
-+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-+	{
-+	int initialized = ((pk11_dso == NULL) ? 0 : 1);
-+
-+	switch (cmd)
-+		{
-+	case PK11_CMD_SO_PATH:
-+		if (p == NULL)
-+			{
-+			PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER);
-+			return (0);
-+			}
-+
-+		if (initialized)
-+			{
-+			PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED);
-+			return (0);
-+			}
-+
-+		return (set_PK11_LIBNAME((const char *)p));
-+	default:
-+		break;
-+		}
-+
-+	PK11err(PK11_F_CTRL, PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-+
-+	return (0);
-+	}
-+
-+
-+/* Required function by the engine random interface. It does nothing here */
-+static void pk11_rand_cleanup(void)
-+	{
-+	return;
-+	}
-+
-+/* ARGSUSED */
-+static void pk11_rand_add(const void *buf, int num, double add)
-+	{
-+	PK11_SESSION *sp;
-+
-+	if ((sp = pk11_get_session(OP_RAND)) == NULL)
-+		return;
-+
-+	/*
-+	 * Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since
-+	 * the calling functions do not care anyway
-+	 */
-+	pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num);
-+	pk11_return_session(sp, OP_RAND);
-+
-+	return;
-+	}
-+
-+static void pk11_rand_seed(const void *buf, int num)
-+	{
-+	pk11_rand_add(buf, num, 0);
-+	}
-+
-+static int pk11_rand_bytes(unsigned char *buf, int num)
-+	{
-+	CK_RV rv;
-+	PK11_SESSION *sp;
-+
-+	if ((sp = pk11_get_session(OP_RAND)) == NULL)
-+		return (0);
-+
-+	rv = pFuncList->C_GenerateRandom(sp->session, buf, num);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv);
-+		pk11_return_session(sp, OP_RAND);
-+		return (0);
-+		}
-+
-+	pk11_return_session(sp, OP_RAND);
-+	return (1);
-+	}
-+
-+/* Required function by the engine random interface. It does nothing here */
-+static int pk11_rand_status(void)
-+	{
-+	return (1);
-+	}
-+
-+/* Free all BIGNUM structures from PK11_SESSION. */
-+static void pk11_free_nums(PK11_SESSION *sp, PK11_OPTYPE optype)
-+	{
-+	switch (optype)
-+		{
-+#ifndef	OPENSSL_NO_RSA
-+		case OP_RSA:
-+			if (sp->opdata_rsa_n_num != NULL)
-+				{
-+				BN_free(sp->opdata_rsa_n_num);
-+				sp->opdata_rsa_n_num = NULL;
-+				}
-+			if (sp->opdata_rsa_e_num != NULL)
-+				{
-+				BN_free(sp->opdata_rsa_e_num);
-+				sp->opdata_rsa_e_num = NULL;
-+				}
-+			if (sp->opdata_rsa_d_num != NULL)
-+				{
-+				BN_free(sp->opdata_rsa_d_num);
-+				sp->opdata_rsa_d_num = NULL;
-+				}
-+			break;
-+#endif
-+#ifndef	OPENSSL_NO_DSA
-+		case OP_DSA:
-+			if (sp->opdata_dsa_pub_num != NULL)
-+				{
-+				BN_free(sp->opdata_dsa_pub_num);
-+				sp->opdata_dsa_pub_num = NULL;
-+				}
-+			if (sp->opdata_dsa_priv_num != NULL)
-+				{
-+				BN_free(sp->opdata_dsa_priv_num);
-+				sp->opdata_dsa_priv_num = NULL;
-+				}
-+			break;
-+#endif
-+#ifndef	OPENSSL_NO_DH
-+		case OP_DH:
-+			if (sp->opdata_dh_priv_num != NULL)
-+				{
-+				BN_free(sp->opdata_dh_priv_num);
-+				sp->opdata_dh_priv_num = NULL;
-+				}
-+			break;
-+#endif
-+		default:
-+			break;
-+		}
-+	}
-+
-+/*
-+ * Get new PK11_SESSION structure ready for use. Every process must have
-+ * its own freelist of PK11_SESSION structures so handle fork() here
-+ * by destroying the old and creating new freelist.
-+ * The returned PK11_SESSION structure is disconnected from the freelist.
-+ */
-+PK11_SESSION *
-+pk11_get_session(PK11_OPTYPE optype)
-+	{
-+	PK11_SESSION *sp = NULL, *sp1, *freelist;
-+	pthread_mutex_t *freelist_lock;
-+	static pid_t pid = 0;
-+	pid_t new_pid;
-+	CK_RV rv;
-+
-+	switch (optype)
-+		{
-+		case OP_RSA:
-+		case OP_DSA:
-+		case OP_DH:
-+		case OP_RAND:
-+		case OP_DIGEST:
-+		case OP_CIPHER:
-+			freelist_lock = session_cache[optype].lock;
-+			break;
-+		default:
-+			PK11err(PK11_F_GET_SESSION,
-+				PK11_R_INVALID_OPERATION_TYPE);
-+			return (NULL);
-+		}
-+	(void) pthread_mutex_lock(freelist_lock);
-+
-+	/*
-+	 * Will use it to find out if we forked. We cannot use the PID field in
-+	 * the session structure because we could get a newly allocated session
-+	 * here, with no PID information.
-+	 */
-+	if (pid == 0)
-+		pid = getpid();
-+
-+	freelist = session_cache[optype].head;
-+	sp = freelist;
-+
-+	/*
-+	 * If the free list is empty, allocate new unitialized (filled
-+	 * with zeroes) PK11_SESSION structure otherwise return first
-+	 * structure from the freelist.
-+	 */
-+	if (sp == NULL)
-+		{
-+		if ((sp = OPENSSL_malloc(sizeof (PK11_SESSION))) == NULL)
-+			{
-+			PK11err(PK11_F_GET_SESSION,
-+				PK11_R_MALLOC_FAILURE);
-+			goto err;
-+			}
-+		(void) memset(sp, 0, sizeof (PK11_SESSION));
-+
-+		/*
-+		 * It is a new session so it will look like a cache miss to the
-+		 * code below. So, we must not try to to destroy its members so
-+		 * mark them as unused.
-+		 */
-+		sp->opdata_rsa_priv_key = CK_INVALID_HANDLE;
-+		sp->opdata_rsa_pub_key = CK_INVALID_HANDLE;
-+		}
-+	else
-+		freelist = sp->next;
-+
-+	/*
-+	 * Check whether we have forked. In that case, we must get rid of all
-+	 * inherited sessions and start allocating new ones.
-+	 */
-+	if (pid != (new_pid = getpid()))
-+		{
-+		pid = new_pid;
-+
-+		/*
-+		 * We are a new process and thus need to free any inherited
-+		 * PK11_SESSION objects aside from the first session (sp) which
-+		 * is the only PK11_SESSION structure we will reuse (for the
-+		 * head of the list).
-+		 */
-+		while ((sp1 = freelist) != NULL)
-+			{
-+			freelist = sp1->next;
-+			/*
-+			 * NOTE: we do not want to call pk11_free_all_sessions()
-+			 * here because it would close underlying PKCS#11
-+			 * sessions and destroy all objects.
-+			 */
-+			pk11_free_nums(sp1, optype);
-+			OPENSSL_free(sp1);
-+			}
-+
-+		/* we have to free the active list as well. */
-+		pk11_free_active_list(optype);
-+
-+		/* Initialize the process */
-+		rv = pFuncList->C_Initialize(NULL_PTR);
-+		if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED))
-+			{
-+			PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE,
-+			    rv);
-+			OPENSSL_free(sp);
-+			sp = NULL;
-+			goto err;
-+			}
-+
-+		/*
-+		 * Choose slot here since the slot table is different on this
-+		 * process. If we are here then we must have found at least one
-+		 * usable slot before so we don't need to check any_slot_found.
-+		 * See pk11_library_init()'s usage of this function for more
-+		 * information.
-+		 */
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+		if (check_hw_mechanisms() == 0)
-+			goto err;
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+		if (pk11_choose_slots(NULL) == 0)
-+			goto err;
-+
-+		/* Open the global_session for the new process */
-+		rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
-+			NULL_PTR, NULL_PTR, &global_session);
-+		if (rv != CKR_OK)
-+			{
-+			PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION,
-+			    rv);
-+			OPENSSL_free(sp);
-+			sp = NULL;
-+			goto err;
-+			}
-+
-+		/*
-+		 * It is an inherited session from our parent so it needs
-+		 * re-initialization.
-+		 */
-+		if (pk11_setup_session(sp, optype) == 0)
-+			{
-+			OPENSSL_free(sp);
-+			sp = NULL;
-+			goto err;
-+			}
-+		if (pk11_token_relogin(sp->session) == 0) 
-+			{
-+			/*
-+			 * We will keep the session in the cache list and let
-+			 * the caller cope with the situation.
-+			 */
-+			freelist = sp;
-+			sp = NULL;
-+			goto err;
-+			}
-+		}
-+
-+	if (sp->pid == 0)
-+		{
-+		/* It is a new session and needs initialization. */
-+		if (pk11_setup_session(sp, optype) == 0)
-+			{
-+			OPENSSL_free(sp);
-+			sp = NULL;
-+			}
-+		}
-+
-+	/* set new head for the list of PK11_SESSION objects */
-+	session_cache[optype].head = freelist;
-+
-+err:
-+	if (sp != NULL)
-+		sp->next = NULL;
-+
-+	(void) pthread_mutex_unlock(freelist_lock);
-+
-+	return (sp);
-+	}
-+
-+
-+void
-+pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype)
-+	{
-+	pthread_mutex_t *freelist_lock;
-+	PK11_SESSION *freelist;
-+
-+	/*
-+	 * If this is a session from the parent it will be taken care of and
-+	 * freed in pk11_get_session() as part of the post-fork clean up the
-+	 * next time we will ask for a new session.
-+	 */
-+	if (sp == NULL || sp->pid != getpid())
-+		return;
-+
-+	switch (optype)
-+		{
-+		case OP_RSA:
-+		case OP_DSA:
-+		case OP_DH:
-+		case OP_RAND:
-+		case OP_DIGEST:
-+		case OP_CIPHER:
-+			freelist_lock = session_cache[optype].lock;
-+			break;
-+		default:
-+			PK11err(PK11_F_RETURN_SESSION,
-+				PK11_R_INVALID_OPERATION_TYPE);
-+			return;
-+		}
-+
-+	(void) pthread_mutex_lock(freelist_lock);
-+	freelist = session_cache[optype].head;
-+	sp->next = freelist;
-+	session_cache[optype].head = sp;
-+	(void) pthread_mutex_unlock(freelist_lock);
-+	}
-+
-+
-+/* Destroy all objects. This function is called when the engine is finished */
-+static int pk11_free_all_sessions()
-+	{
-+	int ret = 1;
-+	int type;
-+
-+#ifndef OPENSSL_NO_RSA
-+	(void) pk11_destroy_rsa_key_objects(NULL);
-+#endif	/* OPENSSL_NO_RSA */
-+#ifndef OPENSSL_NO_DSA
-+	(void) pk11_destroy_dsa_key_objects(NULL);
-+#endif	/* OPENSSL_NO_DSA */
-+#ifndef OPENSSL_NO_DH
-+	(void) pk11_destroy_dh_key_objects(NULL);
-+#endif	/* OPENSSL_NO_DH */
-+	(void) pk11_destroy_cipher_key_objects(NULL);
-+
-+	/*
-+	 * We try to release as much as we can but any error means that we will
-+	 * return 0 on exit.
-+	 */
-+	for (type = 0; type < OP_MAX; type++)
-+		{
-+		if (pk11_free_session_list(type) == 0)
-+			ret = 0;
-+		}
-+
-+	return (ret);
-+	}
-+
-+/*
-+ * Destroy session structures from the linked list specified. Free as many
-+ * sessions as possible but any failure in C_CloseSession() means that we
-+ * return an error on return.
-+ */
-+static int pk11_free_session_list(PK11_OPTYPE optype)
-+	{
-+	CK_RV rv;
-+	PK11_SESSION *sp = NULL;
-+	PK11_SESSION *freelist = NULL;
-+	pid_t mypid = getpid();
-+	pthread_mutex_t *freelist_lock;
-+	int ret = 1;
-+
-+	switch (optype)
-+		{
-+		case OP_RSA:
-+		case OP_DSA:
-+		case OP_DH:
-+		case OP_RAND:
-+		case OP_DIGEST:
-+		case OP_CIPHER:
-+			freelist_lock = session_cache[optype].lock;
-+			break;
-+		default:
-+			PK11err(PK11_F_FREE_ALL_SESSIONS,
-+				PK11_R_INVALID_OPERATION_TYPE);
-+			return (0);
-+		}
-+
-+	(void) pthread_mutex_lock(freelist_lock);
-+	freelist = session_cache[optype].head;
-+	while ((sp = freelist) != NULL)
-+		{
-+		if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid)
-+			{
-+			rv = pFuncList->C_CloseSession(sp->session);
-+			if (rv != CKR_OK)
-+				{
-+				PK11err_add_data(PK11_F_FREE_ALL_SESSIONS,
-+					PK11_R_CLOSESESSION, rv);
-+				ret = 0;
-+				}
-+			}
-+		freelist = sp->next;
-+		pk11_free_nums(sp, optype);
-+		OPENSSL_free(sp);
-+		}
-+
-+	(void) pthread_mutex_unlock(freelist_lock);
-+	return (ret);
-+	}
-+
-+
-+static int
-+pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype)
-+	{
-+	CK_RV rv;
-+	CK_SLOT_ID myslot;
-+
-+	switch (optype)
-+		{
-+		case OP_RSA:
-+		case OP_DSA:
-+		case OP_DH:
-+			myslot = pubkey_SLOTID;
-+			break;
-+		case OP_RAND:
-+			myslot = rand_SLOTID;
-+			break;
-+		case OP_DIGEST:
-+		case OP_CIPHER:
-+			myslot = SLOTID;
-+			break;
-+		default:
-+			PK11err(PK11_F_SETUP_SESSION,
-+			    PK11_R_INVALID_OPERATION_TYPE);
-+			return (0);
-+		}
-+
-+	sp->session = CK_INVALID_HANDLE;
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+	rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
-+		NULL_PTR, NULL_PTR, &sp->session);
-+	if (rv == CKR_CRYPTOKI_NOT_INITIALIZED)
-+		{
-+		/*
-+		 * We are probably a child process so force the
-+		 * reinitialize of the session
-+		 */
-+		pk11_library_initialized = FALSE;
-+		if (!pk11_library_init(NULL))
-+			return (0);
-+		rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
-+			NULL_PTR, NULL_PTR, &sp->session);
-+		}
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv);
-+		return (0);
-+		}
-+
-+	sp->pid = getpid();
-+
-+	switch (optype)
-+		{
-+#ifndef OPENSSL_NO_RSA
-+		case OP_RSA:
-+			sp->opdata_rsa_pub_key = CK_INVALID_HANDLE;
-+			sp->opdata_rsa_priv_key = CK_INVALID_HANDLE;
-+			sp->opdata_rsa_pub = NULL;
-+			sp->opdata_rsa_n_num = NULL;
-+			sp->opdata_rsa_e_num = NULL;
-+			sp->opdata_rsa_priv = NULL;
-+			sp->opdata_rsa_d_num = NULL;
-+			break;
-+#endif	/* OPENSSL_NO_RSA */
-+#ifndef OPENSSL_NO_DSA
-+		case OP_DSA:
-+			sp->opdata_dsa_pub_key = CK_INVALID_HANDLE;
-+			sp->opdata_dsa_priv_key = CK_INVALID_HANDLE;
-+			sp->opdata_dsa_pub = NULL;
-+			sp->opdata_dsa_pub_num = NULL;
-+			sp->opdata_dsa_priv = NULL;
-+			sp->opdata_dsa_priv_num = NULL;
-+			break;
-+#endif	/* OPENSSL_NO_DSA */
-+#ifndef OPENSSL_NO_DH
-+		case OP_DH:
-+			sp->opdata_dh_key = CK_INVALID_HANDLE;
-+			sp->opdata_dh = NULL;
-+			sp->opdata_dh_priv_num = NULL;
-+			break;
-+#endif	/* OPENSSL_NO_DH */
-+		case OP_CIPHER:
-+			sp->opdata_cipher_key = CK_INVALID_HANDLE;
-+			sp->opdata_encrypt = -1;
-+			break;
-+		}
-+
-+	/*
-+	 * We always initialize the session as containing a non-persistent
-+	 * object. The key load functions set it to persistent if that is so.
-+	 */
-+	sp->persistent = CK_FALSE;
-+	return (1);
-+	}
-+
-+#ifndef OPENSSL_NO_RSA
-+/* Destroy RSA public key from single session. */
-+int
-+pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock)
-+	{
-+	int ret = 0;
-+
-+	if (sp->opdata_rsa_pub_key != CK_INVALID_HANDLE)
-+		{
-+		TRY_OBJ_DESTROY(sp, sp->opdata_rsa_pub_key,
-+		    ret, uselock, OP_RSA);
-+		sp->opdata_rsa_pub_key = CK_INVALID_HANDLE;
-+		sp->opdata_rsa_pub = NULL;
-+		if (sp->opdata_rsa_n_num != NULL)
-+			{
-+			BN_free(sp->opdata_rsa_n_num);
-+			sp->opdata_rsa_n_num = NULL;
-+			}
-+		if (sp->opdata_rsa_e_num != NULL)
-+			{
-+			BN_free(sp->opdata_rsa_e_num);
-+			sp->opdata_rsa_e_num = NULL;
-+			}
-+		}
-+
-+	return (ret);
-+	}
-+
-+/* Destroy RSA private key from single session. */
-+int
-+pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock)
-+	{
-+	int ret = 0;
-+
-+	if (sp->opdata_rsa_priv_key != CK_INVALID_HANDLE)
-+		{
-+		TRY_OBJ_DESTROY(sp, sp->opdata_rsa_priv_key,
-+		    ret, uselock, OP_RSA);
-+		sp->opdata_rsa_priv_key = CK_INVALID_HANDLE;
-+		sp->opdata_rsa_priv = NULL;
-+		if (sp->opdata_rsa_d_num != NULL)
-+			{
-+			BN_free(sp->opdata_rsa_d_num);
-+			sp->opdata_rsa_d_num = NULL;
-+			}
-+
-+		/*
-+		 * For the RSA key by reference code, public components 'n'/'e'
-+		 * are the key components we use to check for the cache hit. We
-+		 * must free those as well.
-+		 */
-+		if (sp->opdata_rsa_n_num != NULL)
-+			{
-+			BN_free(sp->opdata_rsa_n_num);
-+			sp->opdata_rsa_n_num = NULL;
-+			}
-+		if (sp->opdata_rsa_e_num != NULL)
-+			{
-+			BN_free(sp->opdata_rsa_e_num);
-+			sp->opdata_rsa_e_num = NULL;
-+			}
-+		}
-+
-+	return (ret);
-+	}
-+
-+/*
-+ * Destroy RSA key object wrapper. If session is NULL, try to destroy all
-+ * objects in the free list.
-+ */
-+int
-+pk11_destroy_rsa_key_objects(PK11_SESSION *session)
-+	{
-+	int ret = 1;
-+	PK11_SESSION *sp = NULL;
-+	PK11_SESSION *local_free_session;
-+	CK_BBOOL uselock = TRUE;
-+
-+	if (session != NULL)
-+		local_free_session = session;
-+	else
-+		{
-+		(void) pthread_mutex_lock(session_cache[OP_RSA].lock);
-+		local_free_session = session_cache[OP_RSA].head;
-+		uselock = FALSE;
-+		}
-+
-+	/*
-+	 * go through the list of sessions and delete key objects
-+	 */
-+	while ((sp = local_free_session) != NULL)
-+		{
-+		local_free_session = sp->next;
-+
-+		/*
-+		 * Do not terminate list traversal if one of the
-+		 * destroy operations fails.
-+		 */
-+		if (pk11_destroy_rsa_object_pub(sp, uselock) == 0)
-+			{
-+			ret = 0;
-+			continue;
-+			}
-+		if (pk11_destroy_rsa_object_priv(sp, uselock) == 0)
-+			{
-+			ret = 0;
-+			continue;
-+			}
-+		}
-+
-+	if (session == NULL)
-+		(void) pthread_mutex_unlock(session_cache[OP_RSA].lock);
-+
-+	return (ret);
-+	}
-+#endif	/* OPENSSL_NO_RSA */
-+
-+#ifndef OPENSSL_NO_DSA
-+/* Destroy DSA public key from single session. */
-+int
-+pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock)
-+	{
-+	int ret = 0;
-+
-+	if (sp->opdata_dsa_pub_key != CK_INVALID_HANDLE)
-+		{
-+		TRY_OBJ_DESTROY(sp, sp->opdata_dsa_pub_key,
-+		    ret, uselock, OP_DSA);
-+		sp->opdata_dsa_pub_key = CK_INVALID_HANDLE;
-+		sp->opdata_dsa_pub = NULL;
-+		if (sp->opdata_dsa_pub_num != NULL)
-+			{
-+			BN_free(sp->opdata_dsa_pub_num);
-+			sp->opdata_dsa_pub_num = NULL;
-+			}
-+		}
-+
-+	return (ret);
-+	}
-+
-+/* Destroy DSA private key from single session. */
-+int
-+pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock)
-+	{
-+	int ret = 0;
-+
-+	if (sp->opdata_dsa_priv_key != CK_INVALID_HANDLE)
-+		{
-+		TRY_OBJ_DESTROY(sp, sp->opdata_dsa_priv_key,
-+		    ret, uselock, OP_DSA);
-+		sp->opdata_dsa_priv_key = CK_INVALID_HANDLE;
-+		sp->opdata_dsa_priv = NULL;
-+		if (sp->opdata_dsa_priv_num != NULL)
-+			{
-+			BN_free(sp->opdata_dsa_priv_num);
-+			sp->opdata_dsa_priv_num = NULL;
-+			}
-+		}
-+
-+	return (ret);
-+	}
-+
-+/*
-+ * Destroy DSA key object wrapper. If session is NULL, try to destroy all
-+ * objects in the free list.
-+ */
-+int
-+pk11_destroy_dsa_key_objects(PK11_SESSION *session)
-+	{
-+	int ret = 1;
-+	PK11_SESSION *sp = NULL;
-+	PK11_SESSION *local_free_session;
-+	CK_BBOOL uselock = TRUE;
-+
-+	if (session != NULL)
-+		local_free_session = session;
-+	else
-+		{
-+		(void) pthread_mutex_lock(session_cache[OP_DSA].lock);
-+		local_free_session = session_cache[OP_DSA].head;
-+		uselock = FALSE;
-+		}
-+
-+	/*
-+	 * go through the list of sessions and delete key objects
-+	 */
-+	while ((sp = local_free_session) != NULL)
-+		{
-+		local_free_session = sp->next;
-+
-+		/*
-+		 * Do not terminate list traversal if one of the
-+		 * destroy operations fails.
-+		 */
-+		if (pk11_destroy_dsa_object_pub(sp, uselock) == 0)
-+			{
-+			ret = 0;
-+			continue;
-+			}
-+		if (pk11_destroy_dsa_object_priv(sp, uselock) == 0)
-+			{
-+			ret = 0;
-+			continue;
-+			}
-+		}
-+
-+	if (session == NULL)
-+		(void) pthread_mutex_unlock(session_cache[OP_DSA].lock);
-+
-+	return (ret);
-+	}
-+#endif	/* OPENSSL_NO_DSA */
-+
-+#ifndef OPENSSL_NO_DH
-+/* Destroy DH key from single session. */
-+int
-+pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock)
-+	{
-+	int ret = 0;
-+
-+	if (sp->opdata_dh_key != CK_INVALID_HANDLE)
-+		{
-+		TRY_OBJ_DESTROY(sp, sp->opdata_dh_key,
-+		    ret, uselock, OP_DH);
-+		sp->opdata_dh_key = CK_INVALID_HANDLE;
-+		sp->opdata_dh = NULL;
-+		if (sp->opdata_dh_priv_num != NULL)
-+			{
-+			BN_free(sp->opdata_dh_priv_num);
-+			sp->opdata_dh_priv_num = NULL;
-+			}
-+		}
-+
-+	return (ret);
-+	}
-+
-+/*
-+ * Destroy DH key object wrapper.
-+ *
-+ * arg0: pointer to PKCS#11 engine session structure
-+ *       if session is NULL, try to destroy all objects in the free list
-+ */
-+int
-+pk11_destroy_dh_key_objects(PK11_SESSION *session)
-+	{
-+	int ret = 1;
-+	PK11_SESSION *sp = NULL;
-+	PK11_SESSION *local_free_session;
-+	CK_BBOOL uselock = TRUE;
-+
-+	if (session != NULL)
-+		local_free_session = session;
-+	else
-+		{
-+		(void) pthread_mutex_lock(session_cache[OP_DH].lock);
-+		local_free_session = session_cache[OP_DH].head;
-+		uselock = FALSE;
-+		}
-+
-+	while ((sp = local_free_session) != NULL)
-+		{
-+		local_free_session = sp->next;
-+
-+		/*
-+		 * Do not terminate list traversal if one of the
-+		 * destroy operations fails.
-+		 */
-+		if (pk11_destroy_dh_object(sp, uselock) == 0)
-+			{
-+			ret = 0;
-+			continue;
-+			}
-+		}
-+err:
-+	if (session == NULL)
-+		(void) pthread_mutex_unlock(session_cache[OP_DH].lock);
-+
-+	return (ret);
-+	}
-+#endif	/* OPENSSL_NO_DH */
-+
-+static int
-+pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh,
-+    CK_BBOOL persistent)
-+	{
-+	CK_RV rv;
-+
-+	/*
-+	 * We never try to destroy persistent objects which are the objects
-+	 * stored in the keystore. Also, we always use read-only sessions so
-+	 * C_DestroyObject() would be returning CKR_SESSION_READ_ONLY here.
-+	 */
-+	if (persistent == CK_TRUE)
-+		return (1);
-+
-+	rv = pFuncList->C_DestroyObject(session, oh);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT,
-+		    rv);
-+		return (0);
-+		}
-+
-+	return (1);
-+	}
-+
-+
-+/* Symmetric ciphers and digests support functions */
-+
-+static int
-+cipher_nid_to_pk11(int nid)
-+	{
-+	int i;
-+
-+	for (i = 0; i < PK11_CIPHER_MAX; i++)
-+		if (ciphers[i].nid == nid)
-+			return (ciphers[i].id);
-+	return (-1);
-+	}
-+
-+static int
-+pk11_usable_ciphers(const int **nids)
-+	{
-+	if (cipher_count > 0)
-+		*nids = cipher_nids;
-+	else
-+		*nids = NULL;
-+	return (cipher_count);
-+	}
-+
-+static int
-+pk11_usable_digests(const int **nids)
-+	{
-+	if (digest_count > 0)
-+		*nids = digest_nids;
-+	else
-+		*nids = NULL;
-+	return (digest_count);
-+	}
-+
-+/*
-+ * Init context for encryption or decryption using a symmetric key.
-+ */
-+static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher,
-+	PK11_SESSION *sp, CK_MECHANISM_PTR pmech)
-+	{
-+	CK_RV rv;
-+	CK_AES_CTR_PARAMS ctr_params;
-+
-+	/*
-+	 * We expect pmech->mechanism to be already set and
-+	 * pParameter/ulParameterLen initialized to NULL/0 before
-+	 * pk11_init_symetric() is called.
-+	 */
-+	OPENSSL_assert(pmech->mechanism != NULL);
-+	OPENSSL_assert(pmech->pParameter == NULL);
-+	OPENSSL_assert(pmech->ulParameterLen == 0);
-+
-+	if (ctx->cipher->nid == NID_aes_128_ctr ||
-+	    ctx->cipher->nid == NID_aes_192_ctr ||
-+	    ctx->cipher->nid == NID_aes_256_ctr)
-+		{
-+		pmech->pParameter = (void *)(&ctr_params);
-+		pmech->ulParameterLen = sizeof (ctr_params);
-+		/*
-+		 * For now, we are limited to the fixed length of the counter,
-+		 * it covers the whole counter block. That's what RFC 4344
-+		 * needs. For more information on internal structure of the
-+		 * counter block, see RFC 3686. If needed in the future, we can
-+		 * add code so that the counter length can be set via
-+		 * ENGINE_ctrl() function.
-+		 */
-+		ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8;
-+		OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE);
-+		(void) memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE);
-+		}
-+	else
-+		{
-+		if (pcipher->iv_len > 0)
-+			{
-+			pmech->pParameter = (void *)ctx->iv;
-+			pmech->ulParameterLen = pcipher->iv_len;
-+			}
-+		}
-+
-+	/* if we get here, the encryption needs to be reinitialized */
-+	if (ctx->encrypt)
-+		rv = pFuncList->C_EncryptInit(sp->session, pmech,
-+			sp->opdata_cipher_key);
-+	else
-+		rv = pFuncList->C_DecryptInit(sp->session, pmech,
-+			sp->opdata_cipher_key);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ?
-+		    PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv);
-+		pk11_return_session(sp, OP_CIPHER);
-+		return (0);
-+		}
-+
-+	return (1);
-+	}
-+
-+/* ARGSUSED */
-+static int
-+pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-+    const unsigned char *iv, int enc)
-+	{
-+	CK_MECHANISM mech;
-+	int index;
-+	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data;
-+	PK11_SESSION *sp;
-+	PK11_CIPHER *p_ciph_table_row;
-+
-+	state->sp = NULL;
-+
-+	index = cipher_nid_to_pk11(ctx->cipher->nid);
-+	if (index < 0 || index >= PK11_CIPHER_MAX)
-+		return (0);
-+
-+	p_ciph_table_row = &ciphers[index];
-+	/*
-+	 * iv_len in the ctx->cipher structure is the maximum IV length for the
-+	 * current cipher and it must be less or equal to the IV length in our
-+	 * ciphers table. The key length must be in the allowed interval. From
-+	 * all cipher modes that the PKCS#11 engine supports only RC4 allows a
-+	 * key length to be in some range, all other NIDs have a precise key
-+	 * length. Every application can define its own EVP functions so this
-+	 * code serves as a sanity check.
-+	 *
-+	 * Note that the reason why the IV length in ctx->cipher might be
-+	 * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs
-+	 * macro to define functions that return EVP structures for all DES
-+	 * modes. So, even ECB modes get 8 byte IV.
-+	 */
-+	if (ctx->cipher->iv_len < p_ciph_table_row->iv_len ||
-+	    ctx->key_len < p_ciph_table_row->min_key_len ||
-+	    ctx->key_len > p_ciph_table_row->max_key_len) {
-+		PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM);
-+		return (0);
-+	}
-+
-+	if ((sp = pk11_get_session(OP_CIPHER)) == NULL)
-+		return (0);
-+
-+	/* if applicable, the mechanism parameter is used for IV */
-+	mech.mechanism = p_ciph_table_row->mech_type;
-+	mech.pParameter = NULL;
-+	mech.ulParameterLen = 0;
-+
-+	/* The key object is destroyed here if it is not the current key. */
-+	(void) check_new_cipher_key(sp, key, ctx->key_len);
-+
-+	/*
-+	 * If the key is the same and the encryption is also the same, then
-+	 * just reuse it. However, we must not forget to reinitialize the
-+	 * context that was finalized in pk11_cipher_cleanup().
-+	 */
-+	if (sp->opdata_cipher_key != CK_INVALID_HANDLE &&
-+	    sp->opdata_encrypt == ctx->encrypt)
-+		{
-+		state->sp = sp;
-+		if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0)
-+			return (0);
-+
-+		return (1);
-+		}
-+
-+	/*
-+	 * Check if the key has been invalidated. If so, a new key object
-+	 * needs to be created.
-+	 */
-+	if (sp->opdata_cipher_key == CK_INVALID_HANDLE)
-+		{
-+		sp->opdata_cipher_key = pk11_get_cipher_key(
-+			ctx, key, p_ciph_table_row->key_type, sp);
-+		}
-+
-+	if (sp->opdata_encrypt != ctx->encrypt && sp->opdata_encrypt != -1)
-+		{
-+		/*
-+		 * The previous encryption/decryption is different. Need to
-+		 * terminate the previous * active encryption/decryption here.
-+		 */
-+		if (!pk11_cipher_final(sp))
-+			{
-+			pk11_return_session(sp, OP_CIPHER);
-+			return (0);
-+			}
-+		}
-+
-+	if (sp->opdata_cipher_key == CK_INVALID_HANDLE)
-+		{
-+		pk11_return_session(sp, OP_CIPHER);
-+		return (0);
-+		}
-+
-+	/* now initialize the context with a new key */
-+	if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0)
-+		return (0);
-+
-+	sp->opdata_encrypt = ctx->encrypt;
-+	state->sp = sp;
-+
-+	return (1);
-+	}
-+
-+/*
-+ * When reusing the same key in an encryption/decryption session for a
-+ * decryption/encryption session, we need to close the active session
-+ * and recreate a new one. Note that the key is in the global session so
-+ * that it needs not be recreated.
-+ *
-+ * It is more appropriate to use C_En/DecryptFinish here. At the time of this
-+ * development, these two functions in the PKCS#11 libraries used return
-+ * unexpected errors when passing in 0 length output. It may be a good
-+ * idea to try them again if performance is a problem here and fix
-+ * C_En/DecryptFinial if there are bugs there causing the problem.
-+ */
-+static int
-+pk11_cipher_final(PK11_SESSION *sp)
-+	{
-+	CK_RV rv;
-+
-+	rv = pFuncList->C_CloseSession(sp->session);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv);
-+		return (0);
-+		}
-+
-+	rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
-+		NULL_PTR, NULL_PTR, &sp->session);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv);
-+		return (0);
-+		}
-+
-+	return (1);
-+	}
-+
-+/*
-+ * An engine interface function. The calling function allocates sufficient
-+ * memory for the output buffer "out" to hold the results.
-+ */
-+static int
-+pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-+	const unsigned char *in, unsigned int inl)
-+	{
-+	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data;
-+	PK11_SESSION *sp;
-+	CK_RV rv;
-+	unsigned long outl = inl;
-+
-+	if (state == NULL || state->sp == NULL)
-+		return (0);
-+
-+	sp = (PK11_SESSION *) state->sp;
-+
-+	if (!inl)
-+		return (1);
-+
-+	/* RC4 is the only stream cipher we support */
-+	if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0)
-+		return (0);
-+
-+	if (ctx->encrypt)
-+		{
-+		rv = pFuncList->C_EncryptUpdate(sp->session,
-+			(unsigned char *)in, inl, out, &outl);
-+
-+		if (rv != CKR_OK)
-+			{
-+			PK11err_add_data(PK11_F_CIPHER_DO_CIPHER,
-+			    PK11_R_ENCRYPTUPDATE, rv);
-+			return (0);
-+			}
-+		}
-+	else
-+		{
-+		rv = pFuncList->C_DecryptUpdate(sp->session,
-+			(unsigned char *)in, inl, out, &outl);
-+
-+		if (rv != CKR_OK)
-+			{
-+			PK11err_add_data(PK11_F_CIPHER_DO_CIPHER,
-+			    PK11_R_DECRYPTUPDATE, rv);
-+			return (0);
-+			}
-+		}
-+
-+	/*
-+	 * For DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always
-+	 * the same size of input.
-+	 * The application has guaranteed to call the block ciphers with
-+	 * correctly aligned buffers.
-+	 */
-+	if (inl != outl)
-+		return (0);
-+
-+	return (1);
-+	}
-+
-+/*
-+ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal()
-+ * here is the right thing because in EVP_DecryptFinal_ex(), engine's
-+ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but
-+ * the engine can't find out that it's the finalizing call. We wouldn't
-+ * necessarily have to finalize the context here since reinitializing it with
-+ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness,
-+ * let's do it. Some implementations might leak memory if the previously used
-+ * context is initialized without finalizing it first.
-+ */
-+static int
-+pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx)
-+	{
-+	CK_RV rv;
-+	CK_ULONG len = EVP_MAX_BLOCK_LENGTH;
-+	CK_BYTE buf[EVP_MAX_BLOCK_LENGTH];
-+	PK11_CIPHER_STATE *state = ctx->cipher_data;
-+
-+	if (state != NULL && state->sp != NULL)
-+		{
-+		/*
-+		 * We are not interested in the data here, we just need to get
-+		 * rid of the context.
-+		 */
-+		if (ctx->encrypt)
-+			rv = pFuncList->C_EncryptFinal(
-+			    state->sp->session, buf, &len);
-+		else
-+			rv = pFuncList->C_DecryptFinal(
-+			    state->sp->session, buf, &len);
-+
-+		if (rv != CKR_OK)
-+			{
-+			PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ?
-+			    PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv);
-+			pk11_return_session(state->sp, OP_CIPHER);
-+			return (0);
-+			}
-+
-+		pk11_return_session(state->sp, OP_CIPHER);
-+		state->sp = NULL;
-+		}
-+
-+	return (1);
-+	}
-+
-+/*
-+ * Registered by the ENGINE when used to find out how to deal with
-+ * a particular NID in the ENGINE. This says what we'll do at the
-+ * top level - note, that list is restricted by what we answer with
-+ */
-+/* ARGSUSED */
-+static int
-+pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-+	const int **nids, int nid)
-+	{
-+	if (!cipher)
-+		return (pk11_usable_ciphers(nids));
-+
-+	switch (nid)
-+		{
-+		case NID_des_ede3_cbc:
-+			*cipher = &pk11_3des_cbc;
-+			break;
-+		case NID_des_cbc:
-+			*cipher = &pk11_des_cbc;
-+			break;
-+		case NID_des_ede3_ecb:
-+			*cipher = &pk11_3des_ecb;
-+			break;
-+		case NID_des_ecb:
-+			*cipher = &pk11_des_ecb;
-+			break;
-+		case NID_aes_128_cbc:
-+			*cipher = &pk11_aes_128_cbc;
-+			break;
-+		case NID_aes_192_cbc:
-+			*cipher = &pk11_aes_192_cbc;
-+			break;
-+		case NID_aes_256_cbc:
-+			*cipher = &pk11_aes_256_cbc;
-+			break;
-+		case NID_aes_128_ecb:
-+			*cipher = &pk11_aes_128_ecb;
-+			break;
-+		case NID_aes_192_ecb:
-+			*cipher = &pk11_aes_192_ecb;
-+			break;
-+		case NID_aes_256_ecb:
-+			*cipher = &pk11_aes_256_ecb;
-+			break;
-+		case NID_bf_cbc:
-+			*cipher = &pk11_bf_cbc;
-+			break;
-+		case NID_rc4:
-+			*cipher = &pk11_rc4;
-+			break;
-+		case NID_aes_128_ctr:
-+			*cipher = &pk11_aes_128_ctr;
-+			break;
-+		case NID_aes_192_ctr:
-+			*cipher = &pk11_aes_192_ctr;
-+			break;
-+		case NID_aes_256_ctr:
-+			*cipher = &pk11_aes_256_ctr;
-+			break;
-+		default:
-+			*cipher = NULL;
-+			break;
-+		}
-+	return (*cipher != NULL);
-+	}
-+
-+/* ARGSUSED */
-+static int
-+pk11_engine_digests(ENGINE *e, const EVP_MD **digest,
-+	const int **nids, int nid)
-+	{
-+	if (!digest)
-+		return (pk11_usable_digests(nids));
-+
-+	switch (nid)
-+		{
-+		case NID_md5:
-+			*digest = &pk11_md5;
-+			break;
-+		case NID_sha1:
-+			*digest = &pk11_sha1;
-+			break;
-+		case NID_sha224:
-+			*digest = &pk11_sha224;
-+			break;
-+		case NID_sha256:
-+			*digest = &pk11_sha256;
-+			break;
-+		case NID_sha384:
-+			*digest = &pk11_sha384;
-+			break;
-+		case NID_sha512:
-+			*digest = &pk11_sha512;
-+			break;
-+		default:
-+			*digest = NULL;
-+			break;
-+		}
-+	return (*digest != NULL);
-+	}
-+
-+
-+/* Create a secret key object in a PKCS#11 session */
-+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx,
-+	const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp)
-+	{
-+	CK_RV rv;
-+	CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE;
-+	CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY;
-+	CK_ULONG ul_key_attr_count = 6;
-+
-+	CK_ATTRIBUTE  a_key_template[] =
-+		{
-+		{CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)},
-+		{CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)},
-+		{CKA_TOKEN, &false, sizeof (false)},
-+		{CKA_ENCRYPT, &true, sizeof (true)},
-+		{CKA_DECRYPT, &true, sizeof (true)},
-+		{CKA_VALUE, (void*) NULL, 0},
-+		};
-+
-+	/*
-+	 * Create secret key object in global_session. All other sessions
-+	 * can use the key handles. Here is why:
-+	 * OpenSSL will call EncryptInit and EncryptUpdate using a secret key.
-+	 * It may then call DecryptInit and DecryptUpdate using the same key.
-+	 * To use the same key object, we need to call EncryptFinal with
-+	 * a 0 length message. Currently, this does not work for 3DES
-+	 * mechanism. To get around this problem, we close the session and
-+	 * then create a new session to use the same key object. When a session
-+	 * is closed, all the object handles will be invalid. Thus, create key
-+	 * objects in a global session, an individual session may be closed to
-+	 * terminate the active operation.
-+	 */
-+	CK_SESSION_HANDLE session = global_session;
-+	a_key_template[0].pValue = &obj_key;
-+	a_key_template[1].pValue = &key_type;
-+	a_key_template[5].pValue = (void *) key;
-+	a_key_template[5].ulValueLen = (unsigned long) ctx->key_len;
-+
-+	rv = pFuncList->C_CreateObject(session,
-+		a_key_template, ul_key_attr_count, &h_key);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT,
-+		    rv);
-+		goto err;
-+		}
-+
-+	/*
-+	 * Save the key information used in this session.
-+	 * The max can be saved is PK11_KEY_LEN_MAX.
-+	 */
-+	sp->opdata_key_len = ctx->key_len > PK11_KEY_LEN_MAX ?
-+		PK11_KEY_LEN_MAX : ctx->key_len;
-+	(void) memcpy(sp->opdata_key, key, sp->opdata_key_len);
-+err:
-+
-+	return (h_key);
-+	}
-+
-+static int
-+md_nid_to_pk11(int nid)
-+	{
-+	int i;
-+
-+	for (i = 0; i < PK11_DIGEST_MAX; i++)
-+		if (digests[i].nid == nid)
-+			return (digests[i].id);
-+	return (-1);
-+	}
-+
-+static int
-+pk11_digest_init(EVP_MD_CTX *ctx)
-+	{
-+	CK_RV rv;
-+	CK_MECHANISM mech;
-+	int index;
-+	PK11_SESSION *sp;
-+	PK11_DIGEST *pdp;
-+	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
-+
-+	state->sp = NULL;
-+
-+	index = md_nid_to_pk11(ctx->digest->type);
-+	if (index < 0 || index >= PK11_DIGEST_MAX)
-+		return (0);
-+
-+	pdp = &digests[index];
-+	if ((sp = pk11_get_session(OP_DIGEST)) == NULL)
-+		return (0);
-+
-+	/* at present, no parameter is needed for supported digests */
-+	mech.mechanism = pdp->mech_type;
-+	mech.pParameter = NULL;
-+	mech.ulParameterLen = 0;
-+
-+	rv = pFuncList->C_DigestInit(sp->session, &mech);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv);
-+		pk11_return_session(sp, OP_DIGEST);
-+		return (0);
-+		}
-+
-+	state->sp = sp;
-+
-+	return (1);
-+	}
-+
-+static int
-+pk11_digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
-+	{
-+	CK_RV rv;
-+	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
-+
-+	/* 0 length message will cause a failure in C_DigestFinal */
-+	if (count == 0)
-+		return (1);
-+
-+	if (state == NULL || state->sp == NULL)
-+		return (0);
-+
-+	rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data,
-+		count);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv);
-+		pk11_return_session(state->sp, OP_DIGEST);
-+		state->sp = NULL;
-+		return (0);
-+		}
-+
-+	return (1);
-+	}
-+
-+static int
-+pk11_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
-+	{
-+	CK_RV rv;
-+	unsigned long len;
-+	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
-+	len = ctx->digest->md_size;
-+
-+	if (state == NULL || state->sp == NULL)
-+		return (0);
-+
-+	rv = pFuncList->C_DigestFinal(state->sp->session, md, &len);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv);
-+		pk11_return_session(state->sp, OP_DIGEST);
-+		state->sp = NULL;
-+		return (0);
-+		}
-+
-+	if (ctx->digest->md_size != len)
-+		return (0);
-+
-+	/*
-+	 * Final is called and digest is returned, so return the session
-+	 * to the pool
-+	 */
-+	pk11_return_session(state->sp, OP_DIGEST);
-+	state->sp = NULL;
-+
-+	return (1);
-+	}
-+
-+static int
-+pk11_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
-+	{
-+	CK_RV rv;
-+	int ret = 0;
-+	PK11_CIPHER_STATE *state, *state_to;
-+	CK_BYTE_PTR pstate = NULL;
-+	CK_ULONG ul_state_len;
-+
-+	/* The copy-from state */
-+	state = (PK11_CIPHER_STATE *) from->md_data;
-+	if (state == NULL || state->sp == NULL)
-+		goto err;
-+
-+	/* Initialize the copy-to state */
-+	if (!pk11_digest_init(to))
-+		goto err;
-+	state_to = (PK11_CIPHER_STATE *) to->md_data;
-+
-+	/* Get the size of the operation state of the copy-from session */
-+	rv = pFuncList->C_GetOperationState(state->sp->session, NULL,
-+		&ul_state_len);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE,
-+		    rv);
-+		goto err;
-+		}
-+	if (ul_state_len == 0)
-+		{
-+		goto err;
-+		}
-+
-+	pstate = OPENSSL_malloc(ul_state_len);
-+	if (pstate == NULL)
-+		{
-+		PK11err(PK11_F_DIGEST_COPY, PK11_R_MALLOC_FAILURE);
-+		goto err;
-+		}
-+
-+	/* Get the operation state of the copy-from session */
-+	rv = pFuncList->C_GetOperationState(state->sp->session, pstate,
-+		&ul_state_len);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE,
-+		    rv);
-+		goto err;
-+		}
-+
-+	/* Set the operation state of the copy-to session */
-+	rv = pFuncList->C_SetOperationState(state_to->sp->session, pstate,
-+		ul_state_len, 0, 0);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_DIGEST_COPY,
-+		    PK11_R_SET_OPERATION_STATE, rv);
-+		goto err;
-+		}
-+
-+	ret = 1;
-+err:
-+	if (pstate != NULL)
-+		OPENSSL_free(pstate);
-+
-+	return (ret);
-+	}
-+
-+/* Return any pending session state to the pool */
-+static int
-+pk11_digest_cleanup(EVP_MD_CTX *ctx)
-+	{
-+	PK11_CIPHER_STATE *state = ctx->md_data;
-+	unsigned char buf[EVP_MAX_MD_SIZE];
-+
-+	if (state != NULL && state->sp != NULL)
-+		{
-+		/*
-+		 * If state->sp is not NULL then pk11_digest_final() has not
-+		 * been called yet. We must call it now to free any memory
-+		 * that might have been allocated in the token when
-+		 * pk11_digest_init() was called. pk11_digest_final()
-+		 * will return the session to the cache.
-+		 */
-+		if (!pk11_digest_final(ctx, buf))
-+			return (0);
-+		}
-+
-+	return (1);
-+	}
-+
-+/*
-+ * Check if the new key is the same as the key object in the session. If the key
-+ * is the same, no need to create a new key object. Otherwise, the old key
-+ * object needs to be destroyed and a new one will be created. Return 1 for
-+ * cache hit, 0 for cache miss. Note that we must check the key length first
-+ * otherwise we could end up reusing a different, longer key with the same
-+ * prefix.
-+ */
-+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key,
-+	int key_len)
-+	{
-+	if (sp->opdata_key_len != key_len ||
-+	    memcmp(sp->opdata_key, key, key_len) != 0)
-+		{
-+		(void) pk11_destroy_cipher_key_objects(sp);
-+		return (0);
-+		}
-+	return (1);
-+	}
-+
-+/* Destroy one or more secret key objects. */
-+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session)
-+	{
-+	int ret = 0;
-+	PK11_SESSION *sp = NULL;
-+	PK11_SESSION *local_free_session;
-+
-+	if (session != NULL)
-+		local_free_session = session;
-+	else
-+		{
-+		(void) pthread_mutex_lock(session_cache[OP_CIPHER].lock);
-+		local_free_session = session_cache[OP_CIPHER].head;
-+		}
-+
-+	while ((sp = local_free_session) != NULL)
-+		{
-+		local_free_session = sp->next;
-+
-+		if (sp->opdata_cipher_key != CK_INVALID_HANDLE)
-+			{
-+			/*
-+			 * The secret key object is created in the
-+			 * global_session. See pk11_get_cipher_key().
-+			 */
-+			if (pk11_destroy_object(global_session,
-+				sp->opdata_cipher_key, CK_FALSE) == 0)
-+				goto err;
-+			sp->opdata_cipher_key = CK_INVALID_HANDLE;
-+			}
-+		}
-+	ret = 1;
-+err:
-+
-+	if (session == NULL)
-+		(void) pthread_mutex_unlock(session_cache[OP_CIPHER].lock);
-+
-+	return (ret);
-+	}
-+
-+
-+/*
-+ * Public key mechanisms optionally supported
-+ *
-+ * CKM_RSA_X_509
-+ * CKM_RSA_PKCS
-+ * CKM_DSA
-+ *
-+ * The first slot that supports at least one of those mechanisms is chosen as a
-+ * public key slot.
-+ *
-+ * Symmetric ciphers optionally supported
-+ *
-+ * CKM_DES3_CBC
-+ * CKM_DES_CBC
-+ * CKM_AES_CBC
-+ * CKM_DES3_ECB
-+ * CKM_DES_ECB
-+ * CKM_AES_ECB
-+ * CKM_AES_CTR
-+ * CKM_RC4
-+ * CKM_BLOWFISH_CBC
-+ *
-+ * Digests optionally supported
-+ *
-+ * CKM_MD5
-+ * CKM_SHA_1
-+ * CKM_SHA224
-+ * CKM_SHA256
-+ * CKM_SHA384
-+ * CKM_SHA512
-+ *
-+ * The output of this function is a set of global variables indicating which
-+ * mechanisms from RSA, DSA, DH and RAND are present, and also two arrays of
-+ * mechanisms, one for symmetric ciphers and one for digests. Also, 3 global
-+ * variables carry information about which slot was chosen for (a) public key
-+ * mechanisms, (b) random operations, and (c) symmetric ciphers and digests.
-+ */
-+static int
-+pk11_choose_slots(int *any_slot_found)
-+	{
-+	CK_SLOT_ID_PTR pSlotList = NULL_PTR;
-+	CK_ULONG ulSlotCount = 0;
-+	CK_MECHANISM_INFO mech_info;
-+	CK_TOKEN_INFO token_info;
-+	int i;
-+	CK_RV rv;
-+	CK_SLOT_ID best_slot_sofar;
-+	CK_BBOOL found_candidate_slot = CK_FALSE;
-+	int slot_n_cipher = 0;
-+	int slot_n_digest = 0;
-+	CK_SLOT_ID current_slot = 0;
-+	int current_slot_n_cipher = 0;
-+	int current_slot_n_digest = 0;
-+
-+	int local_cipher_nids[PK11_CIPHER_MAX];
-+	int local_digest_nids[PK11_DIGEST_MAX];
-+
-+	/* let's initialize the output parameter */
-+	if (any_slot_found != NULL)
-+		*any_slot_found = 0;
-+
-+	/* Get slot list for memory allocation */
-+	rv = pFuncList->C_GetSlotList(CK_FALSE, NULL_PTR, &ulSlotCount);
-+
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv);
-+		return (0);
-+		}
-+
-+	/* it's not an error if we didn't find any providers */
-+	if (ulSlotCount == 0)
-+		{
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: no crypto providers found\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		return (1);
-+		}
-+
-+	pSlotList = OPENSSL_malloc(ulSlotCount * sizeof (CK_SLOT_ID));
-+
-+	if (pSlotList == NULL)
-+		{
-+		PK11err(PK11_F_CHOOSE_SLOT, PK11_R_MALLOC_FAILURE);
-+		return (0);
-+		}
-+
-+	/* Get the slot list for processing */
-+	rv = pFuncList->C_GetSlotList(CK_FALSE, pSlotList, &ulSlotCount);
-+	if (rv != CKR_OK)
-+		{
-+		PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv);
-+		OPENSSL_free(pSlotList);
-+		return (0);
-+		}
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME);
-+	fprintf(stderr, "%s: number of slots: %d\n", PK11_DBG, ulSlotCount);
-+
-+	fprintf(stderr, "%s: == checking rand slots ==\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+	for (i = 0; i < ulSlotCount; i++)
-+		{
-+		current_slot = pSlotList[i];
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		/* Check if slot has random support. */
-+		rv = pFuncList->C_GetTokenInfo(current_slot, &token_info);
-+		if (rv != CKR_OK)
-+			continue;
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+		if (token_info.flags & CKF_RNG)
-+			{
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+			pk11_have_random = CK_TRUE;
-+			rand_SLOTID = current_slot;
-+			break;
-+			}
-+		}
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+	pubkey_SLOTID = pSlotList[0];
-+	for (i = 0; i < ulSlotCount; i++)
-+		{
-+		CK_BBOOL slot_has_rsa = CK_FALSE;
-+		CK_BBOOL slot_has_dsa = CK_FALSE;
-+		CK_BBOOL slot_has_dh = CK_FALSE;
-+		current_slot = pSlotList[i];
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		rv = pFuncList->C_GetTokenInfo(current_slot, &token_info);
-+		if (rv != CKR_OK)
-+			continue;
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+#ifndef OPENSSL_NO_RSA
-+		/*
-+		 * Check if this slot is capable of signing and
-+		 * verifying with CKM_RSA_PKCS.
-+		 */
-+		rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_RSA_PKCS,
-+			&mech_info);
-+
-+		if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) &&
-+				(mech_info.flags & CKF_VERIFY)))
-+			{
-+			/*
-+			 * Check if this slot is capable of encryption,
-+			 * decryption, sign, and verify with CKM_RSA_X_509.
-+			 */
-+			rv = pFuncList->C_GetMechanismInfo(current_slot,
-+			    CKM_RSA_X_509, &mech_info);
-+
-+			if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) &&
-+			    (mech_info.flags & CKF_VERIFY) &&
-+			    (mech_info.flags & CKF_ENCRYPT) &&
-+			    (mech_info.flags & CKF_VERIFY_RECOVER) &&
-+			    (mech_info.flags & CKF_DECRYPT)))
-+				{
-+				slot_has_rsa = CK_TRUE;
-+				}
-+			}
-+#endif	/* OPENSSL_NO_RSA */
-+
-+#ifndef OPENSSL_NO_DSA
-+		/*
-+		 * Check if this slot is capable of signing and
-+		 * verifying with CKM_DSA.
-+		 */
-+		rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_DSA,
-+			&mech_info);
-+		if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) &&
-+		    (mech_info.flags & CKF_VERIFY)))
-+			{
-+			slot_has_dsa = CK_TRUE;
-+			}
-+
-+#endif	/* OPENSSL_NO_DSA */
-+
-+#ifndef OPENSSL_NO_DH
-+		/*
-+		 * Check if this slot is capable of DH key generataion and
-+		 * derivation.
-+		 */
-+		rv = pFuncList->C_GetMechanismInfo(current_slot,
-+		    CKM_DH_PKCS_KEY_PAIR_GEN, &mech_info);
-+
-+		if (rv == CKR_OK && (mech_info.flags & CKF_GENERATE_KEY_PAIR))
-+			{
-+			rv = pFuncList->C_GetMechanismInfo(current_slot,
-+				CKM_DH_PKCS_DERIVE, &mech_info);
-+			if (rv == CKR_OK && (mech_info.flags & CKF_DERIVE))
-+				{
-+				slot_has_dh = CK_TRUE;
-+				}
-+			}
-+#endif	/* OPENSSL_NO_DH */
-+
-+		if (!found_candidate_slot &&
-+		    (slot_has_rsa || slot_has_dsa || slot_has_dh))
-+			{
-+#ifdef	DEBUG_SLOT_SELECTION
-+			fprintf(stderr,
-+			    "%s: potential slot: %d\n", PK11_DBG, current_slot);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+			best_slot_sofar = current_slot;
-+			pk11_have_rsa = slot_has_rsa;
-+			pk11_have_dsa = slot_has_dsa;
-+			pk11_have_dh = slot_has_dh;
-+			found_candidate_slot = CK_TRUE;
-+			/*
-+			 * Cache the flags for later use. We might need those if
-+			 * RSA keys by reference feature is used.
-+			 */
-+			pubkey_token_flags = token_info.flags;
-+#ifdef	DEBUG_SLOT_SELECTION
-+			fprintf(stderr,
-+			    "%s: setting found_candidate_slot to CK_TRUE\n",
-+			    PK11_DBG);
-+			fprintf(stderr,
-+			    "%s: best so far slot: %d\n", PK11_DBG,
-+			    best_slot_sofar);
-+			fprintf(stderr, "%s: pubkey flags changed to "
-+			    "%lu.\n", PK11_DBG, pubkey_token_flags);
-+			}
-+		else
-+			{
-+			fprintf(stderr,
-+			    "%s: no rsa/dsa/dh\n", PK11_DBG);
-+			}
-+#else
-+			} /* if */
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		} /* for */
-+
-+	if (found_candidate_slot == CK_TRUE)
-+		{
-+		pubkey_SLOTID = best_slot_sofar;
-+		}
-+
-+	found_candidate_slot = CK_FALSE;
-+	best_slot_sofar = 0;
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+	SLOTID = pSlotList[0];
-+	for (i = 0; i < ulSlotCount; i++)
-+		{
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+		current_slot = pSlotList[i];
-+		current_slot_n_cipher = 0;
-+		current_slot_n_digest = 0;
-+		(void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids));
-+		(void) memset(local_digest_nids, 0, sizeof (local_digest_nids));
-+
-+		pk11_find_symmetric_ciphers(pFuncList, current_slot,
-+		    &current_slot_n_cipher, local_cipher_nids);
-+
-+		pk11_find_digests(pFuncList, current_slot,
-+		    &current_slot_n_digest, local_digest_nids);
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, "%s: current_slot_n_cipher %d\n", PK11_DBG,
-+			current_slot_n_cipher);
-+		fprintf(stderr, "%s: current_slot_n_digest %d\n", PK11_DBG,
-+			current_slot_n_digest);
-+		fprintf(stderr, "%s: best so far cipher/digest slot: %d\n",
-+			PK11_DBG, best_slot_sofar);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+		/*
-+		 * If the current slot supports more ciphers/digests than
-+		 * the previous best one we change the current best to this one,
-+		 * otherwise leave it where it is.
-+		 */
-+		if ((current_slot_n_cipher + current_slot_n_digest) >
-+		    (slot_n_cipher + slot_n_digest))
-+			{
-+#ifdef	DEBUG_SLOT_SELECTION
-+			fprintf(stderr,
-+				"%s: changing best so far slot to %d\n",
-+				PK11_DBG, current_slot);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+			best_slot_sofar = SLOTID = current_slot;
-+			cipher_count = slot_n_cipher = current_slot_n_cipher;
-+			digest_count = slot_n_digest = current_slot_n_digest;
-+			(void) memcpy(cipher_nids, local_cipher_nids,
-+			    sizeof (local_cipher_nids));
-+			(void) memcpy(digest_nids, local_digest_nids,
-+			    sizeof (local_digest_nids));
-+			}
-+		}
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr,
-+	    "%s: chosen pubkey slot: %d\n", PK11_DBG, pubkey_SLOTID);
-+	fprintf(stderr,
-+	    "%s: chosen rand slot: %d\n", PK11_DBG, rand_SLOTID);
-+	fprintf(stderr,
-+	    "%s: chosen cipher/digest slot: %d\n", PK11_DBG, SLOTID);
-+	fprintf(stderr,
-+	    "%s: pk11_have_rsa %d\n", PK11_DBG, pk11_have_rsa);
-+	fprintf(stderr,
-+	    "%s: pk11_have_dsa %d\n", PK11_DBG, pk11_have_dsa);
-+	fprintf(stderr,
-+	    "%s: pk11_have_dh %d\n", PK11_DBG, pk11_have_dh);
-+	fprintf(stderr,
-+	    "%s: pk11_have_random %d\n", PK11_DBG, pk11_have_random);
-+	fprintf(stderr,
-+	    "%s: cipher_count %d\n", PK11_DBG, cipher_count);
-+	fprintf(stderr,
-+	    "%s: digest_count %d\n", PK11_DBG, digest_count);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+	if (pSlotList != NULL)
-+		OPENSSL_free(pSlotList);
-+
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+	OPENSSL_free(hw_cnids);
-+	OPENSSL_free(hw_dnids);
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+
-+	if (any_slot_found != NULL)
-+		*any_slot_found = 1;
-+	return (1);
-+	}
-+
-+static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR pflist,
-+    int slot_id, CK_MECHANISM_TYPE mech, int *current_slot_n_cipher,
-+    int *local_cipher_nids, int id)
-+	{
-+	CK_MECHANISM_INFO mech_info;
-+	CK_RV rv;
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: checking mech: %x", PK11_DBG, mech);
-+#endif	/* DEBUG_SLOT_SELECTION */
-+	rv = pflist->C_GetMechanismInfo(slot_id, mech, &mech_info);
-+
-+	if (rv != CKR_OK)
-+		{
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, " not found\n");
-+#endif	/* DEBUG_SLOT_SELECTION */
-+		return;
-+		}
-+
-+	if ((mech_info.flags & CKF_ENCRYPT) &&
-+	    (mech_info.flags & CKF_DECRYPT))
-+		{
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+		if (nid_in_table(ciphers[id].nid, hw_cnids))
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+			{
-+#ifdef	DEBUG_SLOT_SELECTION
-+		fprintf(stderr, " usable\n");
-+#endif	/* DEBUG_SLOT_SELECTION */
-+			local_cipher_nids[(*current_slot_n_cipher)++] =
-+			    ciphers[id].nid;
-+			}
-+#ifdef	SOLARIS_HW_SLOT_SELECTION
-+#ifdef	DEBUG_SLOT_SELECTION
-+		else
-+			{
-+		fprintf(stderr, " rejected, software implementation only\n");
-+			}
-+#endif	/* DEBUG_SLOT_SELECTION */
-+#endif	/* SOLARIS_HW_SLOT_SELECTION */
-+		}
-+#ifdef	DEBUG_SLOT_SELECTION
-+	else
-+		{
-+		fprintf(stderr, " unusable\n");
-+		}
-+#endif	/* DEBUG_SLOT_SELECTION */
-+
-+	return;
-+	}
-+
-+static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id,
-+    CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids,
-+    int id)
-+	{
-+	CK_MECHANISM_INFO mech_info;
-+	CK_RV rv;
-+
-+#ifdef	DEBUG_SLOT_SELECTION
-+	fprintf(stderr, "%s: checking mech: %x", PK11_DBG, mech);
-+#endif	/* DEBUG_SLOT_SELECTION */

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


From chninkel at users.sourceforge.net  Fri Feb  7 21:34:34 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri,  7 Feb 2014 20:34:34 +0000
Subject: SF.net SVN: gar:[22967] csw/mgar/pkg/openssl1/trunk
Message-ID: <3fLStS5G3Fz2P@mail.opencsw.org>

Revision: 22967
          http://sourceforge.net/p/gar/code/22967
Author:   chninkel
Date:     2014-02-07 20:34:33 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: add the wanboot patch even if we don't enable it as the pkcs11 engine patch depends on it

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

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

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 20:26:05 UTC (rev 22966)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-07 20:34:33 UTC (rev 22967)
@@ -129,6 +129,9 @@
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifneq ($(shell /usr/bin/uname -r),5.9)
+       # The upstream pkcs11 engine patch depends on the wanboot one
+       # so we will apply the wanboot patch even if we will not enable wanboot
+       PATCHFILES += openssl-1.0.1f-wanboot.patch
        PATCHFILES += openssl-1.0.1f-pkcs11-engine.patch
        ENGINES += pk11
 endif

Added: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch	2014-02-07 20:34:33 UTC (rev 22967)
@@ -0,0 +1,497 @@
+--- openssl-1.0.0g/Makefile.org	2010-01-27 08:06:58.000000000 -0800
++++ openssl-1.0.0g-1/Makefile.org	2012-03-26 03:04:08.440194448 -0700
+@@ -138,7 +138,13 @@
+
+ BASEADDR=
+
++# For wanboot, we only need crypto and ssl.
++# 'apps' are not patched to work in stand-alone environment anyway.
++ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot)
++DIRS=   crypto ssl
++else
+ DIRS=   crypto ssl engines apps test tools
++endif
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+
+--- openssl-1.0.0g/Makefile	2012-01-18 05:42:28.000000000 -0800
++++ openssl-1.0.0g-1/Makefile	2012-03-26 03:03:59.170540344 -0700
+@@ -137,7 +137,13 @@
+
+ BASEADDR=0xFB00000
+
++# For wanboot, we only need crypto and ssl.
++# 'apps' are not patched to work in stand-alone environment anyway.
++ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot)
++DIRS=   crypto ssl
++else
+ DIRS=   crypto ssl engines apps test tools
++endif
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+
+--- openssl-1.0.0e/crypto/cryptlib.c	2011-06-22 08:39:00.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/cryptlib.c	2011-12-12 06:17:45.422476900 -0800
+@@ -900,6 +900,10 @@
+ 	MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP);
+ }
+ #else
++/* Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since
++ *  * OPENSSL_showfatal() is not used anywhere else then here we can safely use
++ *   * the code from 0.9.7d version. */
++#ifndef	_BOOT
+ void OPENSSL_showfatal (const char *fmta,...)
+ { va_list ap;
+ 
+@@ -907,14 +911,21 @@
+     vfprintf (stderr,fmta,ap);
+     va_end (ap);
+ }
++#endif	/* _BOOT */
+ int OPENSSL_isservice (void) { return 0; }
+ #endif
+ 
+ void OpenSSLDie(const char *file,int line,const char *assertion)
+ 	{
++#ifndef	_BOOT		
+ 	OPENSSL_showfatal(
+ 		"%s(%d): OpenSSL internal error, assertion failed: %s\n",
+ 		file,line,assertion);
++#else
++	fprintf(stderr,
++		"%s(%d): OpenSSL internal error, assertion failed: %s\n",
++		file,line,assertion);
++#endif	
+ #if !defined(_WIN32) || defined(__CYGWIN__)
+ 	abort();
+ #else
+--- openssl-1.0.0e/crypto/err/err_all.c	2009-08-09 07:58:05.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/err/err_all.c	2011-12-13 05:22:01.205351400 -0800
+@@ -148,7 +148,9 @@
+ 	ERR_load_X509V3_strings();
+ 	ERR_load_PKCS12_strings();
+ 	ERR_load_RAND_strings();
++#ifndef _BOOT
+ 	ERR_load_DSO_strings();
++#endif /* _BOOT */
+ 	ERR_load_TS_strings();
+ #ifndef OPENSSL_NO_ENGINE
+ 	ERR_load_ENGINE_strings();
+--- openssl-1.0.0e/crypto/evp/evp_key.c	2010-03-27 12:27:50.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/evp/evp_key.c	2011-12-13 05:19:32.956908600 -0800
+@@ -84,7 +84,7 @@
+ 	else
+ 		return(prompt_string);
+ 	}
+-
++#ifndef	_BOOT
+ /* For historical reasons, the standard function for reading passwords is
+  * in the DES library -- if someone ever wants to disable DES,
+  * this function will fail */
+@@ -111,6 +111,7 @@
+ 	OPENSSL_cleanse(buff,BUFSIZ);
+ 	return ret;
+ 	}
++#endif	/* !_BOOT */
+ 
+ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
+ 	     const unsigned char *salt, const unsigned char *data, int datal,
+--- openssl-1.0.0e/crypto/rand/rand_unix.c	2009-04-06 07:31:36.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/rand/rand_unix.c	2011-12-19 07:28:39.988944800 -0800
+@@ -122,7 +122,11 @@
+ #include <sys/time.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#ifdef	_BOOT
++#include <sys/fcntl.h>
++#else
+ #include <fcntl.h>
++#endif
+ #include <unistd.h>
+ #include <time.h>
+ #if defined(OPENSSL_SYS_LINUX) /* should actually be available virtually everywhere */
+@@ -253,6 +257,11 @@
+ 	const char **egdsocket = NULL;
+ #endif
+ 
++#ifdef _BOOT
++/* open() is provided by standalone libsa not visible from here */
++extern int open(const char *, int);
++#endif
++
+ #ifdef DEVRANDOM
+ 	memset(randomstats,0,sizeof(randomstats));
+ 	/* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
+@@ -295,9 +304,13 @@
+ 				{
+ 				int try_read = 0;
+ 
+-#if defined(OPENSSL_SYS_BEOS_R5)
++#if defined(OPENSSL_SYS_BEOS_R5) || defined(_BOOT)
+ 				/* select() is broken in BeOS R5, so we simply
+ 				 *  try to read something and snooze if we couldn't */
++				/* 
++				 * select() is not available when linking stand-alone
++				 * library for wanboot 
++				 */
+ 				try_read = 1;
+ 
+ #elif defined(OPENSSL_SYS_LINUX)
+@@ -355,6 +368,7 @@
+ 				else
+ 					r = -1;
+ 				
++#ifndef	_BOOT				
+ 				/* Some Unixen will update t in select(), some
+ 				   won't.  For those who won't, or if we
+ 				   didn't use select() in the first place,
+@@ -366,13 +380,17 @@
+ 				}
+ 			while ((r > 0 ||
+ 			       (errno == EINTR || errno == EAGAIN)) && usec != 0 && n < ENTROPY_NEEDED);
++#else	/* _BOOT */
++				}
++			while (r > 0 && n < ENTROPY_NEEDED);
++#endif	/* _BOOT */			
+ 
+ 			close(fd);
+ 			}
+ 		}
+ #endif /* defined(DEVRANDOM) */
+ 
+-#ifdef DEVRANDOM_EGD
++#if defined(DEVRANDOM_EGD) && !defined(_BOOT)
+ 	/* Use an EGD socket to read entropy from an EGD or PRNGD entropy
+ 	 * collecting daemon. */
+ 
+@@ -395,6 +413,7 @@
+ 		}
+ #endif
+ 
++#ifndef	_BOOT
+ 	/* put in some default random data, we need more than just this */
+ 	l=curr_pid;
+ 	RAND_add(&l,sizeof(l),0.0);
+@@ -403,6 +422,7 @@
+ 
+ 	l=time(NULL);
+ 	RAND_add(&l,sizeof(l),0.0);
++#endif /* !_BOOT */	
+ 
+ #if defined(OPENSSL_SYS_BEOS)
+ 	{
+
+--- openssl-1.0.0e/crypto/rand/randfile.c	2011-03-19 02:44:37.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/rand/randfile.c	2011-12-13 05:26:51.884824200 -0800
+@@ -57,9 +57,11 @@
+  */
+ 
+ /* We need to define this to get macros like S_IFBLK and S_IFCHR */
++#ifndef	_BOOT
+ #if !defined(OPENSSL_SYS_VXWORKS)
+ #define _XOPEN_SOURCE 500
+ #endif
++#endif	/* _BOOT */
+ 
+ #include <errno.h>
+ #include <stdio.h>
+--- openssl-1.0.0e/crypto/x509v3/v3_utl.c	2009-07-27 14:08:53.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/x509v3/v3_utl.c	2011-12-13 05:10:08.844191400 -0800
+@@ -659,9 +659,52 @@
+ 		}
+ 	}
+ 
++#if	defined(_BOOT)
++/* This function was copied from bio/b_sock.c */
++static int get_ip(const char *str, unsigned char ip[4])
++	{
++	unsigned int tmp[4];
++	int num=0,c,ok=0;
++
++	tmp[0]=tmp[1]=tmp[2]=tmp[3]=0;
++
++	for (;;)
++		{
++		c= *(str++);
++		if ((c >= '0') && (c <= '9'))
++			{
++			ok=1;
++			tmp[num]=tmp[num]*10+c-'0';
++			if (tmp[num] > 255) return(0);
++			}
++		else if (c == '.')
++			{
++			if (!ok) return(-1);
++			if (num == 3) return(0);
++			num++;
++			ok=0;
++			}
++		else if (c == '\0' && (num == 3) && ok)
++			break;
++		else
++			return(0);
++		}
++	ip[0]=tmp[0];
++	ip[1]=tmp[1];
++	ip[2]=tmp[2];
++	ip[3]=tmp[3];
++	return(1);
++	}
++#endif /* _BOOT */
++
+ static int ipv4_from_asc(unsigned char *v4, const char *in)
+ 	{
+ 	int a0, a1, a2, a3;
++
++#if	defined(_BOOT)
++	if (get_ip(in, v4) != 1)
++		return 0;
++#else	/* _BOOT */
+ 	if (sscanf(in, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) != 4)
+ 		return 0;
+ 	if ((a0 < 0) || (a0 > 255) || (a1 < 0) || (a1 > 255)
+@@ -671,6 +716,7 @@
+ 	v4[1] = a1;
+ 	v4[2] = a2;
+ 	v4[3] = a3;
++#endif	/* _BOOT */
+ 	return 1;
+ 	}
+ 
+--- openssl-1.0.0e/e_os.h	2011-12-19 04:17:51.631087400 -0800
++++ openssl-1.0.0e_patched/e_os.h	2011-12-19 04:15:15.776668900 -0800
+@@ -206,10 +206,19 @@
+ #define get_last_socket_error()	errno
+ #define clear_socket_error()	errno=0
+ #define ioctlsocket(a,b,c)	ioctl(a,b,c)
++#ifdef	_BOOT
++#include <netinet/in.h>
++extern int socket_read(int, void *, size_t, int);
++extern int socket_close(int);
++#define	closesocket(s)		socket_close(s)
++#define	readsocket(s,b,n)	socket_read((s),(b),(n), 200)
++#define	writesocket(s,b,n)	send((s),(b),(n), 0)
++#else  /* !_BOOT */
+ #define closesocket(s)		close(s)
+ #define readsocket(s,b,n)	read((s),(b),(n))
+ #define writesocket(s,b,n)	write((s),(b),(n))
+ #endif
++#endif
+ 
+ #ifdef WIN16 /* never the case */
+ #  define MS_CALLBACK	_far _loadds
+--- openssl-1.0.0e/crypto/sparcv9cap.c	2010-09-05 12:48:01.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/sparcv9cap.c	2011-12-23 05:24:02.011607700 -0800
+@@ -12,7 +12,11 @@
+ #define SPARCV9_VIS2		(1<<3)	/* reserved */
+ #define SPARCV9_FMADD		(1<<4)	/* reserved for SPARC64 V */
+ 
++#ifndef	_BOOT
+ static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
++#else
++static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++#endif
+ 
+ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
+ 	{
+@@ -33,6 +37,7 @@
+ void		_sparcv9_vis2_probe(void);
+ void		_sparcv9_fmadd_probe(void);
+ 
++#ifndef _BOOT
+ unsigned long OPENSSL_rdtsc(void)
+ 	{
+ 	if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
+@@ -44,8 +49,19 @@
+ 	else
+ 		return _sparcv9_rdtick();
+ 	}
++#endif
++
++#if defined(_BOOT)
++/*
++ * Hardcoding sparc capabilities for wanboot.
++ * Older CPUs are EOLed anyway.
++ */
++void OPENSSL_cpuid_setup(void)
++	{
++	OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++	}
+ 
+-#if 0 && defined(__sun) && defined(__SVR4)
++#elif 0 && defined(__sun) && defined(__SVR4)
+ /* This code path is disabled, because of incompatibility of
+  * libdevinfo.so.1 and libmalloc.so.1 (see below for details)
+  */
+--- openssl-1.0.0e/crypto/sparccpuid.S	2010-09-05 12:48:01.000000000 -0700
++++ openssl-1.0.0e_patched/crypto/sparccpuid.S	2012-02-13 07:42:58.259478325 -0800
+@@ -397,6 +397,11 @@
+ .type	OPENSSL_cleanse,#function
+ .size	OPENSSL_cleanse,.-OPENSSL_cleanse
+ 
++#ifndef _BOOT
+ .section	".init",#alloc,#execinstr
+	call	OPENSSL_cpuid_setup
+	nop
++#else
++	nop
++	nop
++#endif
+--- openssl-1.0.1c/crypto/Makefile      Thu Aug  2 12:56:38 2012
++++ openssl-1.0.1c/crypto/Makefile.new  Thu Aug  2 12:59:43 2012
+@@ -35,9 +35,9 @@
+ LIB= $(TOP)/libcrypto.a
+ SHARED_LIB= libcrypto$(SHLIB_EXT)
+ LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
+-	ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
++	ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c wanboot-stubs.c
+ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
+-	uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ)
++	uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o wanboot-stubs.o $(CPUID_OBJ)
+
+ SRC= $(LIBSRC)
+
+--- openssl-1.0.1f/ssl/s3_clnt.c    Thu Jan 30 02:53:33 2014
++++ openssl-1.0.1f/ssl/s3_clnt.c.new   Thu Jan 30 02:57:51 2014
+@@ -681,8 +681,13 @@
+ 
+ 		p=s->s3->client_random;
+ 
++#ifndef	_BOOT
+ 		if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
+ 			goto err;
++#else
++		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE) <= 0)
++			goto err;
++#endif
+ 
+ 		/* Do the message type and length last */
+ 		d=p= &(buf[4]);
+Index: crypto//wanboot-stubs.c
+===================================================================
+diff -uNr openssl-1.0.1f/engines/wanboot-stubs.c openssl-1.0.1f/engines/wanboot-stubs.c
+--- openssl-1.0.1f/engines/wanboot-stubs.c 1970-01-01 01:00:00.000000000 +0100
++++ openssl-1.0.1f/engines/wanboot-stubs.c 2014-02-07 21:31:24.%N +0100
+@@ -0,0 +1,122 @@
++/*
++ * CDDL HEADER START
++ *
++ * The contents of this file are subject to the terms of the
++ * Common Development and Distribution License (the "License").
++ * You may not use this file except in compliance with the License.
++ *
++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
++ * or http://www.opensolaris.org/os/licensing.
++ * See the License for the specific language governing permissions
++ * and limitations under the License.
++ *
++ * When distributing Covered Code, include this CDDL HEADER in each
++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
++ * If applicable, add the following below this CDDL HEADER, with the
++ * fields enclosed by brackets "[]" replaced with your own identifying
++ * information: Portions Copyright [yyyy] [name of copyright owner]
++ *
++ * CDDL HEADER END
++ */
++/*
++ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
++ */
++
++/* Content of this file is only needed for wanboot. */
++#ifdef	_BOOT
++
++#include <sys/types.h>
++#include <dirent.h>
++#include <errno.h>
++#include <stddef.h>
++
++/*
++ * In OpenSSL 0.9.7 the EVP_read_pw_string now calls into the new "ui"
++ * routines of 0.9.7, which is not compiled in the standalone, so it is
++ * stubbed out here to avoid having to add a bunch of #ifndef's elsewhere.
++ */
++/* ARGSUSED */
++int
++EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, int
++    verify)
++{
++	return (-1); /* failure */
++}
++
++/*
++ * In standalone issetugid() is always false.
++ */
++int
++OPENSSL_issetugid(void)
++{
++	return (1);
++}
++
++/*
++ * Directory routines -- currently, the only consumer of these interfaces
++ * is $SRC/common/openssl/ssl/ssl_cert.c, and it has fallback code in the
++ * case of failure, so we just fail opendir() and stub out the rest.  At
++ * some point, we may need to provide a real implementation.
++ */
++/* ARGSUSED */
++DIR *
++opendir(const char *dirname)
++{
++	errno = EACCES;
++	return (NULL);
++}
++
++/* ARGSUSED */
++struct dirent *
++readdir(DIR *dirp)
++{
++	return (NULL);
++}
++
++/* ARGSUSED */
++int
++closedir(DIR *dirp)
++{
++	return (0);
++}
++
++/*
++ * Atoi is used on multiple places in libcrypto.
++ * This implementation is taken from stand-alone libsock library:
++ * usr/src/stand/lib/sock/sock_test.c
++ * Alternative solution: just extern it here, wanboot has -lsock anyway.
++ */
++#ifndef	isdigit
++#define	isdigit(c) ((c) >= '0' && (c) <= '9')
++#endif
++
++#ifndef	isspace
++#define	isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || \
++		    (c) == '\r' || (c) == '\f' || (c) == '\013')
++#endif
++int
++atoi(const char *p)
++{
++	int n;
++	int c = *p++, neg = 0;
++
++	while (isspace(c)) {
++		c = *p++;
++	}
++	if (!isdigit(c)) {
++		switch (c) {
++		case '-':
++			neg++;
++			/* FALLTHROUGH */
++		case '+':
++			c = *p++;
++		}
++	}
++	for (n = 0; isdigit(c); c = *p++) {
++		n *= 10; /* two steps to avoid unnecessary overflow */
++		n += '0' - c; /* accum neg to avoid surprises at MAX */
++	}
++	return (neg ? n : -n);
++}
++
++#endif	/* _BOOT */

Added: csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh	2014-02-07 20:34:33 UTC (rev 22967)
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# update-wanboot-patch - retrieve the last wanboot patch from
+#                        hg.openindiana.org repository 
+#           
+
+WANBOOT_FILES="wanboot-stubs.c"
+SOURCE_URL="http://buildfarm.opencsw.org/source/raw/solaris-userland/components/openssl/openssl-1.0.1/"
+WGET_OPTIONS="--quiet"
+
+
+if [[ -z "$1" ]]; then
+	echo "Usage: update-wanboot-patch.sh OPENSSL_VERSION"
+	exit 1
+fi
+
+VERSION="$1"
+PATCH_FILE="openssl-${VERSION}-wanboot.patch"
+PATCH_DATE=$(date +"%Y-%m-%d %H:%M:%S.%N %z")
+
+echo "Updating wanboot engine patch from ${SOURCE_URL}..."
+(
+	# ar in in /usr/ccs/bin under Solaris 9 and 10 so we change the path
+	wget $WGET_OPTIONS --output-document=- ${SOURCE_URL}/patches/30_wanboot.patch | \
+
+		gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' 
+
+	# in the repository, the new files are not part of the patch, but we merge them
+	# in a single patch
+	for FILE in $WANBOOT_FILES; do \
+
+		wget $WGET_OPTIONS --output-document="${PATCH_FILE}.tmp" "${SOURCE_URL}/wanboot-openssl/$FILE"
+		NB_LINES=$(wc -l "${PATCH_FILE}.tmp" | awk '{ print $1 }')
+
+		echo "Index: crypto/$DIR/$FILE"
+		echo "==================================================================="
+		echo "diff -uNr openssl-${VERSION}/engines/$FILE openssl-${VERSION}/engines/$FILE"
+		echo "--- openssl-${VERSION}/engines/$FILE 1970-01-01 01:00:00.000000000 +0100"
+		echo "+++ openssl-${VERSION}/engines/$FILE ${PATCH_DATE}"
+		echo "@@ -0,0 +1,${NB_LINES} @@"
+		sed -e 's/^/+/' "${PATCH_FILE}.tmp"
+	done
+) > "${PATCH_FILE}"
+
+rm -f "${PATCH_FILE}.tmp"
+echo "Updated patch in ${PATCH_FILE}"
+
+
+

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 Feb  7 21:38:12 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri,  7 Feb 2014 20:38:12 +0000
Subject: SF.net SVN: gar:[22968] csw/mgar/pkg/openssl1/trunk/files
Message-ID: <3fLSyR6zhcz5x@mail.opencsw.org>

Revision: 22968
          http://sourceforge.net/p/gar/code/22968
Author:   chninkel
Date:     2014-02-07 20:38:11 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: updated pkcs11 engine patch

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

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 20:34:33 UTC (rev 22967)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2014-02-07 20:38:11 UTC (rev 22968)
@@ -1,6 +1,7 @@
 openssl (1.0.1f,rev=2014.02.07) unstable
 
   * Manpages and html doc are back in the package !
+  * Updated pkcs11 engine patch.
 
    -- yann rouillard <yann at opencsw.org>  Fri, 07 Feb 2014 20:48:46 +0100
 

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-02-07 20:34:33 UTC (rev 22967)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch	2014-02-07 20:38:11 UTC (rev 22968)
@@ -196,10 +196,10 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
 --- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:25:24.018899108 +0100
-@@ -0,0 +1,3710 @@
++++ openssl-1.0.1f/engines/e_pk11.c 2014-02-07 21:35:52.%N +0100
+@@ -0,0 +1,3713 @@
 +/*
-+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 + */
 +
 +/* crypto/engine/e_pk11.c */
@@ -3299,8 +3299,10 @@
 +		pk11_choose_pubkey_slot(mech_info, token_info, current_slot,
 +			rv, best_number_of_mechs, best_pubkey_slot_sofar);
 +
-+		pk11_choose_cipher_digest(&local_cipher_nids,
-+			&local_digest_nids, pFuncList, current_slot);
++		(void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids));
++		(void) memset(local_digest_nids, 0, sizeof (local_digest_nids));
++		pk11_choose_cipher_digest(local_cipher_nids,
++			local_digest_nids, pFuncList, current_slot);
 +		}
 +
 +	if (best_number_of_mechs == 0)
@@ -3449,9 +3451,6 @@
 +
 +	DEBUG_SLOT_SEL("%s: checking cipher/digest\n", PK11_DBG);
 +
-+	(void) memset(local_cipher_nids, 0, sizeof (local_cipher_nids));
-+	(void) memset(local_digest_nids, 0, sizeof (local_digest_nids));
-+
 +	pk11_find_symmetric_ciphers(pFuncList, current_slot,
 +	    &current_slot_n_cipher, local_cipher_nids);
 +
@@ -3475,10 +3474,12 @@
 +		SLOTID = current_slot;
 +		cipher_count = current_slot_n_cipher;
 +		digest_count = current_slot_n_digest;
++		OPENSSL_assert(cipher_count <= PK11_CIPHER_MAX);
++		OPENSSL_assert(digest_count <= PK11_DIGEST_MAX);
 +		(void) memcpy(cipher_nids, local_cipher_nids,
-+			sizeof (local_cipher_nids));
++			sizeof (int) * cipher_count);
 +		(void) memcpy(digest_nids, local_digest_nids,
-+			sizeof (local_digest_nids));
++			sizeof (int) * digest_count);
 +		}
 +	}
 +
@@ -3490,6 +3491,8 @@
 +	static CK_RV rv;
 +	static CK_MECHANISM_TYPE last_checked_mech = (CK_MECHANISM_TYPE)-1;
 +
++	OPENSSL_assert(cipher->mech_type != (CK_MECHANISM_TYPE)-1);
++
 +	DEBUG_SLOT_SEL("%s: checking mech: %x", PK11_DBG, cipher->mech_type);
 +	if (cipher->mech_type != last_checked_mech)
 +		{
@@ -3912,7 +3915,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
 --- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4175,7 +4178,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.c openssl-1.0.1f/engines/e_pk11_err.c
 --- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,306 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4487,7 +4490,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_err.h openssl-1.0.1f/engines/e_pk11_err.h
 --- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -4735,7 +4738,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c openssl-1.0.1f/engines/e_pk11_pub.c
 --- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,3273 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8014,7 +8017,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c openssl-1.0.1f/engines/e_pk11_uri.c
 --- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,869 @@
 +/*
 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8889,7 +8892,7 @@
 ===================================================================
 diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h openssl-1.0.1f/engines/e_pk11_uri.h
 --- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:25:24.018899108 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-02-07 21:35:52.%N +0100
 @@ -0,0 +1,114 @@
 +/*
 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.

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


From chninkel at users.sourceforge.net  Sat Feb  8 00:02:35 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri,  7 Feb 2014 23:02:35 +0000
Subject: SF.net SVN: gar:[22969] csw/mgar/pkg/openssl1/trunk/files
Message-ID: <3fLX961SjlzLF@mail.opencsw.org>

Revision: 22969
          http://sourceforge.net/p/gar/code/22969
Author:   chninkel
Date:     2014-02-07 23:02:30 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
openssl1/trunk: strip down the wanboot patch to avoid compilation issue as we don't care about wanboot itself

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

Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch	2014-02-07 20:38:11 UTC (rev 22968)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-wanboot.patch	2014-02-07 23:02:30 UTC (rev 22969)
@@ -1,35 +1,3 @@
---- openssl-1.0.0g/Makefile.org	2010-01-27 08:06:58.000000000 -0800
-+++ openssl-1.0.0g-1/Makefile.org	2012-03-26 03:04:08.440194448 -0700
-@@ -138,7 +138,13 @@
-
- BASEADDR=
-
-+# For wanboot, we only need crypto and ssl.
-+# 'apps' are not patched to work in stand-alone environment anyway.
-+ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot)
-+DIRS=   crypto ssl
-+else
- DIRS=   crypto ssl engines apps test tools
-+endif
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
-
---- openssl-1.0.0g/Makefile	2012-01-18 05:42:28.000000000 -0800
-+++ openssl-1.0.0g-1/Makefile	2012-03-26 03:03:59.170540344 -0700
-@@ -137,7 +137,13 @@
-
- BASEADDR=0xFB00000
-
-+# For wanboot, we only need crypto and ssl.
-+# 'apps' are not patched to work in stand-alone environment anyway.
-+ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot)
-+DIRS=   crypto ssl
-+else
- DIRS=   crypto ssl engines apps test tools
-+endif
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
-
 --- openssl-1.0.0e/crypto/cryptlib.c	2011-06-22 08:39:00.000000000 -0700
 +++ openssl-1.0.0e_patched/crypto/cryptlib.c	2011-12-12 06:17:45.422476900 -0800
 @@ -900,6 +900,10 @@
@@ -337,20 +305,6 @@
 +	nop
 +	nop
 +#endif
---- openssl-1.0.1c/crypto/Makefile      Thu Aug  2 12:56:38 2012
-+++ openssl-1.0.1c/crypto/Makefile.new  Thu Aug  2 12:59:43 2012
-@@ -35,9 +35,9 @@
- LIB= $(TOP)/libcrypto.a
- SHARED_LIB= libcrypto$(SHLIB_EXT)
- LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
--	ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
-+	ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c wanboot-stubs.c
- LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
--	uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ)
-+	uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o wanboot-stubs.o $(CPUID_OBJ)
-
- SRC= $(LIBSRC)
-
 --- openssl-1.0.1f/ssl/s3_clnt.c    Thu Jan 30 02:53:33 2014
 +++ openssl-1.0.1f/ssl/s3_clnt.c.new   Thu Jan 30 02:57:51 2014
 @@ -681,8 +681,13 @@
@@ -367,131 +321,3 @@
  
  		/* Do the message type and length last */
  		d=p= &(buf[4]);
-Index: crypto//wanboot-stubs.c
-===================================================================
-diff -uNr openssl-1.0.1f/engines/wanboot-stubs.c openssl-1.0.1f/engines/wanboot-stubs.c
---- openssl-1.0.1f/engines/wanboot-stubs.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/wanboot-stubs.c 2014-02-07 21:31:24.%N +0100
-@@ -0,0 +1,122 @@
-+/*
-+ * CDDL HEADER START
-+ *
-+ * The contents of this file are subject to the terms of the
-+ * Common Development and Distribution License (the "License").
-+ * You may not use this file except in compliance with the License.
-+ *
-+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-+ * or http://www.opensolaris.org/os/licensing.
-+ * See the License for the specific language governing permissions
-+ * and limitations under the License.
-+ *
-+ * When distributing Covered Code, include this CDDL HEADER in each
-+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-+ * If applicable, add the following below this CDDL HEADER, with the
-+ * fields enclosed by brackets "[]" replaced with your own identifying
-+ * information: Portions Copyright [yyyy] [name of copyright owner]
-+ *
-+ * CDDL HEADER END
-+ */
-+/*
-+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-+ */
-+
-+/* Content of this file is only needed for wanboot. */
-+#ifdef	_BOOT
-+
-+#include <sys/types.h>
-+#include <dirent.h>
-+#include <errno.h>
-+#include <stddef.h>
-+
-+/*
-+ * In OpenSSL 0.9.7 the EVP_read_pw_string now calls into the new "ui"
-+ * routines of 0.9.7, which is not compiled in the standalone, so it is
-+ * stubbed out here to avoid having to add a bunch of #ifndef's elsewhere.
-+ */
-+/* ARGSUSED */
-+int
-+EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt, int
-+    verify)
-+{
-+	return (-1); /* failure */
-+}
-+
-+/*
-+ * In standalone issetugid() is always false.
-+ */
-+int
-+OPENSSL_issetugid(void)
-+{
-+	return (1);
-+}
-+
-+/*
-+ * Directory routines -- currently, the only consumer of these interfaces
-+ * is $SRC/common/openssl/ssl/ssl_cert.c, and it has fallback code in the
-+ * case of failure, so we just fail opendir() and stub out the rest.  At
-+ * some point, we may need to provide a real implementation.
-+ */
-+/* ARGSUSED */
-+DIR *
-+opendir(const char *dirname)
-+{
-+	errno = EACCES;
-+	return (NULL);
-+}
-+
-+/* ARGSUSED */
-+struct dirent *
-+readdir(DIR *dirp)
-+{
-+	return (NULL);
-+}
-+
-+/* ARGSUSED */
-+int
-+closedir(DIR *dirp)
-+{
-+	return (0);
-+}
-+
-+/*
-+ * Atoi is used on multiple places in libcrypto.
-+ * This implementation is taken from stand-alone libsock library:
-+ * usr/src/stand/lib/sock/sock_test.c
-+ * Alternative solution: just extern it here, wanboot has -lsock anyway.
-+ */
-+#ifndef	isdigit
-+#define	isdigit(c) ((c) >= '0' && (c) <= '9')
-+#endif
-+
-+#ifndef	isspace
-+#define	isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || \
-+		    (c) == '\r' || (c) == '\f' || (c) == '\013')
-+#endif
-+int
-+atoi(const char *p)
-+{
-+	int n;
-+	int c = *p++, neg = 0;
-+
-+	while (isspace(c)) {
-+		c = *p++;
-+	}
-+	if (!isdigit(c)) {
-+		switch (c) {
-+		case '-':
-+			neg++;
-+			/* FALLTHROUGH */
-+		case '+':
-+			c = *p++;
-+		}
-+	}
-+	for (n = 0; isdigit(c); c = *p++) {
-+		n *= 10; /* two steps to avoid unnecessary overflow */
-+		n += '0' - c; /* accum neg to avoid surprises at MAX */
-+	}
-+	return (neg ? n : -n);
-+}
-+
-+#endif	/* _BOOT */

Modified: csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh	2014-02-07 20:38:11 UTC (rev 22968)
+++ csw/mgar/pkg/openssl1/trunk/files/update-wanboot-patch.sh	2014-02-07 23:02:30 UTC (rev 22969)
@@ -4,7 +4,7 @@
 #                        hg.openindiana.org repository 
 #           
 
-WANBOOT_FILES="wanboot-stubs.c"
+WANBOOT_FILES=""
 SOURCE_URL="http://buildfarm.opencsw.org/source/raw/solaris-userland/components/openssl/openssl-1.0.1/"
 WGET_OPTIONS="--quiet"
 
@@ -21,9 +21,11 @@
 echo "Updating wanboot engine patch from ${SOURCE_URL}..."
 (
 	# ar in in /usr/ccs/bin under Solaris 9 and 10 so we change the path
+	# we also remove the makefile part as we will not really compile wanboot
 	wget $WGET_OPTIONS --output-document=- ${SOURCE_URL}/patches/30_wanboot.patch | \
 
-		gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' 
+		gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g'  | \
+		perl -ne 'if (/^--- .*Makefile/) { $makefile=1 } else { $makefile=0 if /^---/; }; print $_ if not $makefile'
 
 	# in the repository, the new files are not part of the patch, but we merge them
 	# in a single patch

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


From dmichelsen at users.sourceforge.net  Sat Feb  8 11:20:52 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat,  8 Feb 2014 10:20:52 +0000
Subject: SF.net SVN: gar:[22970] csw/mgar/pkg/mirrorbrain/trunk
Message-ID: <3fLqCr3BFtzdr@mail.opencsw.org>

Revision: 22970
          http://sourceforge.net/p/gar/code/22970
Author:   dmichelsen
Date:     2014-02-08 10:20:49 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Update to 2.19.0

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

Removed Paths:
-------------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-08 10:20:49 UTC (rev 22970)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mirrorbrain
-VERSION = 2.18.0
+VERSION = 2.19.0
 GARTYPE = v2
 
 DESCRIPTION = Content distribution tool
@@ -14,14 +14,6 @@
 DISTFILES += CSWap2-mod-mirrorbrain.postinstall
 DISTFILES += CSWap2-mod-mirrorbrain.preremove
 
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue139
-PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
-
-# Use patch until this is fixed:
-#   
-PATCHFILES += 0001-realpath-must-get-preallocated-memory-on-Solaris.patch
-
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths
@@ -34,7 +26,7 @@
 BUILD_DEP_PKGS += CSWapache2-dev
 BUILD_DEP_PKGS += CSWap2-mod-form
 
-PACKAGES = CSWap2-mod-mirrorbrain
+PACKAGES += CSWap2-mod-mirrorbrain
 SPKG_DESC_CSWap2-mod-mirrorbrain = MirrorBrain redirector Apache module
 PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_LIBEXEC)/mod_mirrorbrain.so
 PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_EXTRACONF)/mod_mirrorbrain.conf.CSW

Modified: csw/mgar/pkg/mirrorbrain/trunk/checksums
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1 +1 @@
-b0b9172578cb567aec6eb7a164fba657  mirrorbrain-2.18.0.tar.gz
+e4a22a5fafba2283c58f5f7b288625c5  mirrorbrain-2.19.0.tar.gz

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1,25 +0,0 @@
-From 5ca8b992d77a3479f1081432d21f8a96382b41c6 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 1 Feb 2014 14:56:06 +0100
-Subject: [PATCH] Do not take ref on a simple scalar string or it wont match
-
----
- tools/scanner.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/scanner.pl b/tools/scanner.pl
-index ab9bcb8..4216721 100755
---- a/tools/scanner.pl
-+++ b/tools/scanner.pl
-@@ -774,7 +774,7 @@ sub ftp_readdir
-   return unless defined $ftp;
-   my $text = ftp_cont($ftp, "$url/$name");
- 
--  if(!ref($text) && \$text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
-+  if(!ref($text) && $text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
- 
-     # Bug: Net::FTP wrongly reports timeouts (421) as code 550:
-     # sunsite.informatik.rwth-aachen.de: ftp dir: ftp://sunsite.informatik.rwth-aachen.de/pub/linux/opensuse/distribution/11.0/repo/debug/suse/i686
--- 
-1.8.4.1
-

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1,63 +0,0 @@
-From 502e0e73c9c453c6514b44b0f6ed2a5b142c33a8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 4 Feb 2014 10:43:45 +0100
-Subject: [PATCH] realpath must get preallocated memory on Solaris
-
----
- mod_mirrorbrain/mod_mirrorbrain.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/mod_mirrorbrain/mod_mirrorbrain.c b/mod_mirrorbrain/mod_mirrorbrain.c
-index 228fb65..da5fdf5 100644
---- a/mod_mirrorbrain/mod_mirrorbrain.c
-+++ b/mod_mirrorbrain/mod_mirrorbrain.c
-@@ -83,6 +83,7 @@
- 
- #include <unistd.h> /* for getpid */
- #include <math.h>   /* for sqrt() and pow() */
-+#include <limits.h> /* for PATH_MAX */
- #include <arpa/inet.h>
- #ifdef WITH_MEMCACHE
- #include "mod_memcache.h"
-@@ -1859,7 +1860,17 @@ static int mb_handler(request_rec *r)
- 
-     /* The basedir might contain symlinks. That needs to be taken into account. 
-      * See discussion in http://mirrorbrain.org/issues/issue17 */
--    ptr = realpath(cfg->mirror_base, NULL);
-+#if defined(__sun) && defined(__SVR4)
-+    ptr = malloc( PATH_MAX );
-+    if (ptr == NULL) {
-+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-+                "[mod_mirrorbrain] Error allocating memory for path for document root");
-+        return DECLINED; /* fail gracefully */
-+    }
-+#else
-+    ptr = NULL;
-+#endif
-+    ptr = realpath(cfg->mirror_base, ptr);
-     if (ptr == NULL) {
-         /* this should never happen, because the MirrorBrainEngine directive would never
-          * be applied to a non-existing directories */
-@@ -1878,8 +1889,17 @@ static int mb_handler(request_rec *r)
-         filename = apr_pstrcat(r->pool, mirror_base, "/", yum->dir, "/", yum->file, NULL);
-         debugLog(r, cfg, "yum path on disk: %s", filename);
-     }
--
--    ptr = realpath(filename, NULL);
-+#if defined(__sun) && defined(__SVR4)
-+    ptr = malloc( PATH_MAX );
-+    if (ptr == NULL) {
-+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-+                "[mod_mirrorbrain] Error allocating memory for path for filename");
-+        return DECLINED; /* fail gracefully */
-+    }
-+#else
-+    ptr = NULL;
-+#endif
-+    ptr = realpath(filename, ptr);
-     if (ptr == NULL) {
-         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-                 "[mod_mirrorbrain] Error canonicalizing filename '%s'", filename);
--- 
-1.8.4.1
-

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


From dmichelsen at users.sourceforge.net  Sat Feb  8 11:32:28 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat,  8 Feb 2014 10:32:28 +0000
Subject: SF.net SVN: gar:[22971] csw/mgar/pkg/lang-python/mb/trunk
Message-ID: <3fLqT30w2dzjV@mail.opencsw.org>

Revision: 22971
          http://sourceforge.net/p/gar/code/22971
Author:   dmichelsen
Date:     2014-02-08 10:32:26 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
lang-python/mb/trunk: Update to 2.19.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mb/trunk/Makefile
    csw/mgar/pkg/lang-python/mb/trunk/checksums
    csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch

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

Modified: csw/mgar/pkg/lang-python/mb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/Makefile	2014-02-08 10:32:26 UTC (rev 22971)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mirrorbrain
-VERSION = 2.17.0
+VERSION = 2.19.0
 CATEGORIES = python
 GARTYPE = v2
 
@@ -14,10 +14,6 @@
 
 PATCHFILES += 0001-New-locations-for-GeoIP-databases.patch
 
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue135
-PATCHFILES += 0001-Change-default-for-getaddrinfo.patch
-
 # We really do only care for MirrorBrain on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -55,10 +51,14 @@
 CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpython27
 CHECKPKG_OVERRIDES_CSWpy-mb += surplus-dependency|CSWpy-sqlobject
 
+# PATH gets an additionally /usr/share/mirrorbrain, what for? Overwrite for now.
+CHECKPKG_OVERRIDES_CSWpy-mb += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/mb/geoip.py
+CHECKPKG_OVERRIDES_CSWpy-mb += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/mb/geoip.py
+
 PRESERVECONF += $(sysconfdir)/mirrorbrain.conf
 
 # There is no testsuite
-SKIPTEST ?= 1
+TEST_SCRIPTS =
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/lang-python/mb/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/checksums	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/checksums	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1 +1 @@
-c0556adb5c5eef8983b517f938375abc  mirrorbrain-2.17.0.tar.gz
+e4a22a5fafba2283c58f5f7b288625c5  mirrorbrain-2.19.0.tar.gz

Deleted: csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-Change-default-for-getaddrinfo.patch	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1,25 +0,0 @@
-From 3f59a009b2997cfe2f79ad020613a4a1dbf1ae14 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 25 Jan 2014 11:17:09 +0100
-Subject: [PATCH] Change default for getaddrinfo
-
----
- mb/mb/asn.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mb/mb/asn.py b/mb/mb/asn.py
-index 0b6d602..3a5c2c4 100644
---- a/mb/mb/asn.py
-+++ b/mb/mb/asn.py
-@@ -17,7 +17,7 @@ def iplookup(conn, s):
-         ips = []
-         ip6s = []
-         try:
--            for res in socket.getaddrinfo(s, 0):
-+            for res in socket.getaddrinfo(s, None):
-                 af, socktype, proto, canonname, sa = res
-                 if ':' in sa[0]:
-                     if sa[0] not in ip6s:
--- 
-1.8.4.1
-

Modified: csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch
===================================================================
--- csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch	2014-02-08 10:20:49 UTC (rev 22970)
+++ csw/mgar/pkg/lang-python/mb/trunk/files/0001-New-locations-for-GeoIP-databases.patch	2014-02-08 10:32:26 UTC (rev 22971)
@@ -1,6 +1,6 @@
-From 2f8223de7837825fb1838686b75a46796b85e15c Mon Sep 17 00:00:00 2001
+From a2610945b9b47a3ee029c6e6efbc349a73679d43 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 20 Dec 2013 13:51:33 +0100
+Date: Sat, 8 Feb 2014 11:27:12 +0100
 Subject: [PATCH] New locations for GeoIP databases
 
 ---
@@ -8,11 +8,11 @@
  1 file changed, 4 insertions(+), 12 deletions(-)
 
 diff --git a/mb/mb/geoip.py b/mb/mb/geoip.py
-index bcfda33..7b52e2f 100644
+index 681ef67..dd489ca 100644
 --- a/mb/mb/geoip.py
 +++ b/mb/mb/geoip.py
-@@ -4,23 +4,15 @@ from subprocess import Popen, PIPE
- import errno
+@@ -6,23 +6,15 @@ import errno
+ ENV = {'PATH': ':'.join([os.getenv('PATH'), '/usr/share/mirrorbrain'])}
  
  # try different databases and different locations
 -databases = ['/var/lib/GeoIP/GeoLiteCity.dat.updated', 
@@ -40,5 +40,5 @@
  for i in databases6:
      if os.path.exists(i):
 -- 
-1.8.3.4
+1.8.4.1
 

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


From chninkel at users.sourceforge.net  Sat Feb  8 12:25:33 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 11:25:33 +0000
Subject: SF.net SVN: gar:[22972] csw/mgar/pkg/openssl1/trunk
Message-ID: <3fLrfM4ScjzvB@mail.opencsw.org>

Revision: 22972
          http://sourceforge.net/p/gar/code/22972
Author:   chninkel
Date:     2014-02-08 11:25:31 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
openssl1/trunk: Fixed order of patch and updated t4 engine patch

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

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-08 10:32:26 UTC (rev 22971)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-02-08 11:25:31 UTC (rev 22972)
@@ -129,9 +129,6 @@
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifneq ($(shell /usr/bin/uname -r),5.9)
-       # The upstream pkcs11 engine patch depends on the wanboot one
-       # so we will apply the wanboot patch even if we will not enable wanboot
-       PATCHFILES += openssl-1.0.1f-wanboot.patch
        PATCHFILES += openssl-1.0.1f-pkcs11-engine.patch
        ENGINES += pk11
 endif
@@ -142,13 +139,16 @@
 # patch taken from https://hg.openindiana.org/upstream/oracle/userland-gate/
 # To update the patch, do:
 #   cd files && ./update-t4-patch.sh OPENSSL_VERSION
-#
+
+# The upstream t4 engine patch depends on the wanboot one
+# so we will apply the wanboot patch even if we will not enable wanboot
+PATCHFILES.sparc.5.11 += openssl-1.0.1f-wanboot.patch
 PATCHFILES.sparc.5.11 += openssl-1.0.1f-t4-engine.sparc.5.11.patch
 PATCHFILES.sparc.5.11 += openssl-1.0.1e-t4-engine-sparcv9+vis.sparc.5.11.patch
-
 PATCHFILES += $(PATCHFILES.$(GARCH).$(GAROSREL))
 
 
+
 LICENSE = LICENSE
 
 ##### Build and installation information #####

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

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


From chninkel at users.sourceforge.net  Sat Feb  8 13:09:29 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 12:09:29 +0000
Subject: SF.net SVN: gar:[22973] csw/mgar/pkg/ntop/trunk/Makefile
Message-ID: <3fLscw4bF5z10m@mail.opencsw.org>

Revision: 22973
          http://sourceforge.net/p/gar/code/22973
Author:   chninkel
Date:     2014-02-08 12:09:27 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ntop/trunk: add CSWrrdtool-dev as build dependency

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

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 11:25:31 UTC (rev 22972)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 12:09:27 UTC (rev 22973)
@@ -60,6 +60,7 @@
 BUILD_DEP_PKGS += CSWlibtool CSWautoconf CSWautomake
 BUILD_DEP_PKGS += CSWlibpcap-dev CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWgeoip-dev
+BUILD_DEP_PKGS += CSWrrdtool-dev
 
 # These are ntop plugins so these check alerts are not important
 CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.0.3.so

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


From chninkel at users.sourceforge.net  Sat Feb  8 13:40:26 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 12:40:26 +0000
Subject: SF.net SVN: gar:[22974] csw/mgar/pkg/ntop/trunk/Makefile
Message-ID: <3fLtJk2r2Wz156@mail.opencsw.org>

Revision: 22974
          http://sourceforge.net/p/gar/code/22974
Author:   chninkel
Date:     2014-02-08 12:40:24 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ntop/trunk: updated overrides because of version bump

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

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 12:09:27 UTC (rev 22973)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 12:40:24 UTC (rev 22974)
@@ -63,13 +63,13 @@
 BUILD_DEP_PKGS += CSWrrdtool-dev
 
 # These are ntop plugins so these check alerts are not important
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libicmpPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libnetflowPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntop-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntopreport-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libicmpPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libnetflowPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntop-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntopreport-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.1.0.so
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh
 
@@ -89,6 +89,7 @@
 # CONFIGURE_ARGS += --enable-fc
 # CONFIGURE_ARGS += --enable-mysql
 
+
 # We don't have a separate devel-package, so this is ok
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libicmpPlugin.so
@@ -99,12 +100,12 @@
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsflowPlugin.so
 
 # Upstream has chosen it that way...
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.0.3.so|filename=cpacketPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.0.3.so|filename=icmpPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.0.3.so|filename=netflowPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.0.3.so|filename=rrdPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.0.3.so|filename=sflowPlugin.so
-#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.0.3.so',|'libicmpPlugin-4.0.3.so',|'libnetflowPlugin-4.0.3.so',|'libntop-4.0.3.so',|'libntopreport-4.0.3.so',|'librrdPlugin-4.0.3.so',|'libsflowPlugin-4.0.3.so']|pkgname=CSWntop|expected=['CSWlib4-0-3']|
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.1.0.so|filename=cpacketPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.1.0.so|filename=icmpPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.1.0.so|filename=netflowPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.1.0.so|filename=rrdPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.1.0.so|filename=sflowPlugin.so
+#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.1.0.so',|'libicmpPlugin-4.1.0.so',|'libnetflowPlugin-4.1.0.so',|'libntop-4.1.0.so',|'libntopreport-4.1.0.so',|'librrdPlugin-4.1.0.so',|'libsflowPlugin-4.1.0.so']|pkgname=CSWntop|expected=['CSWlib4.1.0']|
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch
 
 # Bad content files - Documentation
@@ -114,13 +115,13 @@
 #CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
 
 # Bad content files - Shared libraries (Captured Build Info for Version Output)
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.1.0.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/sflowPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/cpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/rrdPlugin.so

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


From chninkel at users.sourceforge.net  Sat Feb  8 15:17:02 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 14:17:02 +0000
Subject: SF.net SVN: gar:[22975] csw/mgar/pkg/ntop/trunk
Message-ID: <3fLwS94K26z1Cn@mail.opencsw.org>

Revision: 22975
          http://sourceforge.net/p/gar/code/22975
Author:   chninkel
Date:     2014-02-08 14:17:01 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ntop/trunk: fix python detection

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

Added Paths:
-----------
    csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 12:40:24 UTC (rev 22974)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 14:17:01 UTC (rev 22975)
@@ -33,6 +33,7 @@
 PATCHFILES += 0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
 PATCHFILES += 0007-Update-the-URL-for-etter.finger.os.patch
 PATCHFILES += 0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
+PATCHFILES += 0009-Fix-python-config-detection-and-python-cflags-assign.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233
@@ -89,6 +90,7 @@
 # CONFIGURE_ARGS += --enable-fc
 # CONFIGURE_ARGS += --enable-mysql
 
+EXTRA_CONFIGURE_ENV += PYTHON=/opt/csw/bin/python2.6-config
 
 # We don't have a separate devel-package, so this is ok
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so

Added: csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch	2014-02-08 14:17:01 UTC (rev 22975)
@@ -0,0 +1,44 @@
+From 47a24ec95f6a0e488cffa7982c225029d915019e Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 8 Feb 2014 15:08:41 +0100
+Subject: [PATCH] Fix python-config detection and python cflags assignation in
+ configure
+
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2fcfa86..fe8e49a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1454,7 +1454,7 @@ dnl>
+   AC_CHECK_TOOL(PYTHON, python-config)
+   PYTHON_CONFIG=""
+ 
+-  if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then   
++  if test "x$ac_cv_prog_ac_ct_PYTHON" = "x"; then   
+        if test -f "/etc/debian_version"; then
+        	   AC_MSG_RESULT(Please install python-dev and rerun configure)
+ 	   exit 1
+@@ -1469,7 +1469,7 @@ dnl>
+         fi
+      fi
+   else
+-     PYTHON_CONFIG="python-config"
++     PYTHON_CONFIG="$ac_cv_prog_ac_ct_PYTHON"
+   fi
+ 
+   if test "x$PYTHON_CONFIG" != "x"; then
+@@ -1482,7 +1482,7 @@ dnl>
+ 
+     dnl remove unecessary path
+     dnl line below workaround for OSX 10.6 (Snow Leopard)/10.7 (Lion)
+-    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386// | sed -e "s/-arch ppc// | sed -e "s/-arch x86_64//"`
++    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+     INCS="${INCS} ${PYTHON_INCS}"
+ 
+ OLD_CFLAGS=$CFLAGS
+-- 
+1.8.4.1
+

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


From wahwah at users.sourceforge.net  Sat Feb  8 16:31:44 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat,  8 Feb 2014 15:31:44 +0000
Subject: SF.net SVN: gar:[22976] csw/mgar/pkg/lang-python/pysetuptools/trunk/
	Makefile
Message-ID: <3fLy6L0fh3z1K6@mail.opencsw.org>

Revision: 22976
          http://sourceforge.net/p/gar/code/22976
Author:   wahwah
Date:     2014-02-08 15:31:43 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
lang-python/pysetuptools/trunk: Upstream has rejected our patch: links added.

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

Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2014-02-08 14:17:01 UTC (rev 22975)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2014-02-08 15:31:43 UTC (rev 22976)
@@ -15,6 +15,9 @@
   Distribution Utilities for Python
 endef
 
+# Upstream has rejected our patch. :(
+# https://bitbucket.org/pypa/setuptools/issue/134/spaces-in-file-names-make-it-impossible-to
+# https://bitbucket.org/pypa/setuptools/pull-request/33/rename-script-templatepy-to-script/diff
 PATCHFILES += 0001-Solaris-package-mge-does-not-handle-spaces.patch
 
 ARCHALL_CSWpy-setuptools = 1

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


From chninkel at users.sourceforge.net  Sat Feb  8 16:47:32 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 15:47:32 +0000
Subject: SF.net SVN: gar:[22977] csw/mgar/pkg/ruby18/trunk
Message-ID: <3fLySc6NZxz1Nq@mail.opencsw.org>

Revision: 22977
          http://sourceforge.net/p/gar/code/22977
Author:   chninkel
Date:     2014-02-08 15:47:31 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ruby18/trunk: removed rubytk package that can't be compiled anymore, fix sample code installation, removed berkeleydb dependency

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

Removed Paths:
-------------
    csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2014-02-08 15:31:43 UTC (rev 22976)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2014-02-08 15:47:31 UTC (rev 22977)
@@ -9,11 +9,11 @@
 TEST_SCRIPTS =
 TEST_ARGS = test-all
 
-BUILD_DEP_PKGS =  CSWbdb48devel CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev
+BUILD_DEP_PKGS =  CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev
 BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibz-dev CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibncurses-dev
 
-PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode
+PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-dev CSWruby18-mode
 PACKAGES += CSWruby18-mode-el CSWlibruby18-1 CSWruby18-gcc4
 
 EXTRA_MODULATORS = COMPILER
@@ -23,7 +23,6 @@
 
 OBSOLETED_BY_CSWruby18 = CSWruby
 OBSOLETED_BY_CSWruby18-doc = CSWrubydoc
-OBSOLETED_BY_CSWruby18-tk = CSWrubytk
 OBSOLETED_BY_CSWruby18-dev = CSWrubydev
 OBSOLETED_BY_CSWruby18-mode = CSWrubymode
 OBSOLETED_BY_CSWruby18-mode-el = CSWrubymodeel
@@ -41,7 +40,7 @@
 
 LICENSE = COPYING
 
-RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWruby18 = CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1
 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1
 
@@ -49,13 +48,11 @@
 
 RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18
 
-RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1
-
 RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby18-1 CSWcoreutils
 
-RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon
+RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacs-common
 
-RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacscommon
+RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacs-common
 
 DESCRIPTION = An object-oriented language for quick and easy programming.
 define BLURB
@@ -76,8 +73,6 @@
 
 SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8
 
-SPKG_DESC_CSWruby18-tk = Ruby 1.8 Tcl/TK Extension
-
 SPKG_DESC_CSWruby18-dev = Ruby 1.8 Extension Development Files
 
 SPKG_DESC_CSWruby18-mode = Ruby 1.8 major mode for Emacs
@@ -88,8 +83,6 @@
 
 PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/.*gcc4
 
-PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb
-
 PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a
 PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.*.so
 
@@ -109,7 +102,7 @@
 
 DISTFILES  = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2
 DISTFILES += CSWruby.cswreleasenotes
-DISTFILES += CSWrubydoc.cswreleasenotes CSWrubytk.cswreleasenotes
+DISTFILES += CSWrubydoc.cswreleasenotes
 
 # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698
 PATCHFILES = rdoc_parse_order_fix.patch
@@ -183,9 +176,9 @@
 
 post-merge:
 	@echo "Copying in sample code..."
-	@mkdir -p $(DESTDIR)$(docdir)/ruby18/
+	@mkdir -p $(PKGROOT)$(docdir)/ruby18/
 	@cp -R $(WORKSRC_FIRSTMOD)/sample $(PKGROOT)$(docdir)/ruby18/
-	@for ext in bigdecimal dl tk ; do \
+	@for ext in bigdecimal dl; do \
 		cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample \
 			$(PKGROOT)$(docdir)/ruby18/sample/$$ext ; \
 	done

Deleted: csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes
===================================================================
--- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes	2014-02-08 15:31:43 UTC (rev 22976)
+++ csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes	2014-02-08 15:47:31 UTC (rev 22977)
@@ -1,2 +0,0 @@
-* /usr/share reference in dialog.rb is in a comment
-* /usr/local references are both in comments

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


From chninkel at users.sourceforge.net  Sat Feb  8 18:25:44 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 17:25:44 +0000
Subject: SF.net SVN: gar:[22978] csw/mgar/pkg/ruby18/trunk/Makefile
Message-ID: <3fM0ds2mFqz1W7@mail.opencsw.org>

Revision: 22978
          http://sourceforge.net/p/gar/code/22978
Author:   chninkel
Date:     2014-02-08 17:25:43 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ruby18/trunk: excluded previous CSWrubytk files

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

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2014-02-08 15:47:31 UTC (rev 22977)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2014-02-08 17:25:43 UTC (rev 22978)
@@ -90,6 +90,8 @@
 
 PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$
 
+EXTRA_PKGFILES_EXCLUDED_CSWruby18 += $(libdir)/ruby/1.8/test/unit/ui/tk/.*
+
 PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1
 PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1.*
 

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


From chninkel at users.sourceforge.net  Sat Feb  8 19:27:52 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat,  8 Feb 2014 18:27:52 +0000
Subject: SF.net SVN: gar:[22979] csw/mgar/pkg/ntop/trunk
Message-ID: <3fM21f41ZCz3t@mail.opencsw.org>

Revision: 22979
          http://sourceforge.net/p/gar/code/22979
Author:   chninkel
Date:     2014-02-08 18:27:51 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ntop/trunk: temporarily force ntop recompilation against libgdbm.so.3 instead of libgdbm.so.4

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

Added Paths:
-----------
    csw/mgar/pkg/ntop/trunk/files/gdbm3/
    csw/mgar/pkg/ntop/trunk/files/gdbm3/gdbm.h
    csw/mgar/pkg/ntop/trunk/files/gdbm3/libgdbm.so

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 17:25:43 UTC (rev 22978)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 18:27:51 UTC (rev 22979)
@@ -49,7 +49,7 @@
 RUNTIME_DEP_PKGS_CSWntop += CSWlibrrd-th4
 RUNTIME_DEP_PKGS_CSWntop += CSWlibgeoip1
 RUNTIME_DEP_PKGS_CSWntop += CSWpython
-RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm4
+RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm3
 RUNTIME_DEP_PKGS_CSWntop += CSWlibz1
 
 
@@ -80,8 +80,8 @@
 PRESERVECONF = $(sysconfdir)/ntop.conf
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-gdbm-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-gdbm-include=/opt/csw/include
+CONFIGURE_ARGS += --with-gdbm-lib=$(abspath $(FILEDIR)/gdbm3)
+CONFIGURE_ARGS += --with-gdbm-include=$(abspath $(FILEDIR)/gdbm3)
 CONFIGURE_ARGS += --with-zlib-lib=/opt/csw/lib
 CONFIGURE_ARGS += --with-zlib-include=/opt/csw/include
 CONFIGURE_ARGS += --with-ossl-lib=/opt/csw/lib
@@ -90,6 +90,9 @@
 # CONFIGURE_ARGS += --enable-fc
 # CONFIGURE_ARGS += --enable-mysql
 
+EXTRA_CPPFLAGS = -I$(abspath $(FILEDIR)/gdbm3)
+EXTRA_LDFLAGS = -L$(abspath $(FILEDIR)/gdbm3)
+
 EXTRA_CONFIGURE_ENV += PYTHON=/opt/csw/bin/python2.6-config
 
 # We don't have a separate devel-package, so this is ok

Added: csw/mgar/pkg/ntop/trunk/files/gdbm3/gdbm.h
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/gdbm3/gdbm.h	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/gdbm3/gdbm.h	2014-02-08 18:27:51 UTC (rev 22979)
@@ -0,0 +1,139 @@
+/* gdbm.h  -  The include file for dbm users.  */
+
+/*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
+    Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
+
+    GDBM 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, or (at your option)
+    any later version.
+
+    GDBM is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GDBM; see the file COPYING.  If not, write to
+    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    You may contact the author by:
+       e-mail:  phil at cs.wwu.edu
+      us-mail:  Philip A. Nelson
+                Computer Science Department
+                Western Washington University
+                Bellingham, WA 98226
+       
+*************************************************************************/
+
+/* Protection for multiple includes. */
+#ifndef _GDBM_H_
+#define _GDBM_H_
+
+/* Parameters to gdbm_open for READERS, WRITERS, and WRITERS who
+   can create the database. */
+#define  GDBM_READER  0		/* A reader. */
+#define  GDBM_WRITER  1		/* A writer. */
+#define  GDBM_WRCREAT 2		/* A writer.  Create the db if needed. */
+#define  GDBM_NEWDB   3		/* A writer.  Always create a new db. */
+#define  GDBM_FAST    0x10	/* Write fast! => No fsyncs.  OBSOLETE. */
+#define  GDBM_SYNC    0x20	/* Sync operations to the disk. */
+#define  GDBM_NOLOCK  0x40	/* Don't do file locking operations. */
+
+/* Parameters to gdbm_store for simple insertion or replacement in the
+   case that the key is already in the database. */
+#define  GDBM_INSERT  0		/* Never replace old data with new. */
+#define  GDBM_REPLACE 1		/* Always replace old data with new. */
+
+/* Parameters to gdbm_setopt, specifing the type of operation to perform. */
+#define  GDBM_CACHESIZE 1       /* Set the cache size. */
+#define  GDBM_FASTMODE  2       /* Toggle fast mode.  OBSOLETE. */
+#define  GDBM_SYNCMODE	3	/* Turn on or off sync operations. */
+#define  GDBM_CENTFREE  4	/* Keep all free blocks in the header. */
+#define  GDBM_COALESCEBLKS 5	/* Attempt to coalesce free blocks. */
+
+/* The data and key structure.  This structure is defined for compatibility. */
+typedef struct {
+	char *dptr;
+	int   dsize;
+      } datum;
+
+
+/* The file information header. This is good enough for most applications. */
+typedef struct {int dummy[10];} *GDBM_FILE;
+
+/* Determine if the C(++) compiler requires complete function prototype  */
+#ifndef __P
+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
+#define __P(x) x
+#else
+#define __P(x) ()
+#endif
+#endif
+
+/* External variable, the gdbm build release string. */
+extern char *gdbm_version;	
+
+
+/* GDBM C++ support */
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/* These are the routines! */
+
+extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)()));
+extern void gdbm_close __P((GDBM_FILE));
+extern int gdbm_store __P((GDBM_FILE, datum, datum, int));
+extern datum gdbm_fetch __P((GDBM_FILE, datum));
+extern int gdbm_delete __P((GDBM_FILE, datum));
+extern datum gdbm_firstkey __P((GDBM_FILE));
+extern datum gdbm_nextkey __P((GDBM_FILE, datum));
+extern int gdbm_reorganize __P((GDBM_FILE));
+extern void gdbm_sync __P((GDBM_FILE));
+extern int gdbm_exists __P((GDBM_FILE, datum));
+extern int gdbm_setopt __P((GDBM_FILE, int, int *, int));
+extern int gdbm_fdesc __P((GDBM_FILE));
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#define	GDBM_NO_ERROR		0
+#define	GDBM_MALLOC_ERROR	1
+#define	GDBM_BLOCK_SIZE_ERROR	2
+#define	GDBM_FILE_OPEN_ERROR	3
+#define	GDBM_FILE_WRITE_ERROR	4
+#define	GDBM_FILE_SEEK_ERROR	5
+#define	GDBM_FILE_READ_ERROR	6
+#define	GDBM_BAD_MAGIC_NUMBER	7
+#define	GDBM_EMPTY_DATABASE	8
+#define	GDBM_CANT_BE_READER	9
+#define	GDBM_CANT_BE_WRITER	10
+#define	GDBM_READER_CANT_DELETE	11
+#define	GDBM_READER_CANT_STORE	12
+#define	GDBM_READER_CANT_REORGANIZE	13
+#define	GDBM_UNKNOWN_UPDATE	14
+#define	GDBM_ITEM_NOT_FOUND	15
+#define	GDBM_REORGANIZE_FAILED	16
+#define	GDBM_CANNOT_REPLACE	17
+#define	GDBM_ILLEGAL_DATA	18
+#define	GDBM_OPT_ALREADY_SET	19
+#define	GDBM_OPT_ILLEGAL	20
+typedef int gdbm_error;		/* For compatibilities sake. */
+extern gdbm_error gdbm_errno;
+
+/* extra prototypes */
+
+/* GDBM C++ support */
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern char *gdbm_strerror __P((gdbm_error));
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

Added: csw/mgar/pkg/ntop/trunk/files/gdbm3/libgdbm.so
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/gdbm3/libgdbm.so	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/gdbm3/libgdbm.so	2014-02-08 18:27:51 UTC (rev 22979)
@@ -0,0 +1 @@
+link /opt/csw/lib/libgdbm.so.3
\ No newline at end of file


Property changes on: csw/mgar/pkg/ntop/trunk/files/gdbm3/libgdbm.so
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From dmichelsen at users.sourceforge.net  Sun Feb  9 11:58:13 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun,  9 Feb 2014 10:58:13 +0000
Subject: SF.net SVN: gar:[22980] csw/mgar/pkg/mirrorbrain/trunk/files/
	CSWap2-mod-autoindex-mb.preremove
Message-ID: <3fMS0M4Kb8zcQ@mail.opencsw.org>

Revision: 22980
          http://sourceforge.net/p/gar/code/22980
Author:   dmichelsen
Date:     2014-02-09 10:58:11 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Fix typo

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove

Modified: csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove	2014-02-08 18:27:51 UTC (rev 22979)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/CSWap2-mod-autoindex-mb.preremove	2014-02-09 10:58:11 UTC (rev 22980)
@@ -12,7 +12,7 @@
 PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
 chroot $PKG_INSTALL_ROOT \
     $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
-    asn mod_autoindex_mb.so
+    autoindex_mb mod_autoindex_mb.so
 
 cat <<END
 

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


From pfelecan at users.sourceforge.net  Sun Feb  9 17:55:52 2014
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Sun,  9 Feb 2014 16:55:52 +0000
Subject: SF.net SVN: gar:[22981] csw/mgar/pkg/gdb/trunk
Message-ID: <3fMbx6139xzsX@mail.opencsw.org>

Revision: 22981
          http://sourceforge.net/p/gar/code/22981
Author:   pfelecan
Date:     2014-02-09 16:55:51 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
gdb/trunk: upstream version bump

Modified Paths:
--------------
    csw/mgar/pkg/gdb/trunk/Makefile
    csw/mgar/pkg/gdb/trunk/checksums
    csw/mgar/pkg/gdb/trunk/files/0002-OpenSolaris-gdb-fork-child.patch

Added Paths:
-----------
    csw/mgar/pkg/gdb/trunk/files/0004-cast-rlimit-infinity.patch

Modified: csw/mgar/pkg/gdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdb/trunk/Makefile	2014-02-09 10:58:11 UTC (rev 22980)
+++ csw/mgar/pkg/gdb/trunk/Makefile	2014-02-09 16:55:51 UTC (rev 22981)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = gdb
-VERSION = 7.6.2
+VERSION = 7.7
 GARTYPE = v2
 
 DESCRIPTION = The GNU Debugger
@@ -34,6 +34,8 @@
 # from private patch 4:
 PATCHFILES		+=	0003-Extend-to-OpenCSW-the-OpenSolaris-gdb-fork-child.patch
 
+PATCHFILES		+=	0004-cast-rlimit-infinity.patch
+
 GARCOMPILER		=	GNU
 
 PACKAGING_PLATFORMS	=	solaris10-sparc

Modified: csw/mgar/pkg/gdb/trunk/checksums
===================================================================
--- csw/mgar/pkg/gdb/trunk/checksums	2014-02-09 10:58:11 UTC (rev 22980)
+++ csw/mgar/pkg/gdb/trunk/checksums	2014-02-09 16:55:51 UTC (rev 22981)
@@ -1 +1 @@
-496399e96654fc0f899a5c964bc1f0f8  gdb-7.6.2.tar.bz2
+271a18f41858a7e98b28ae4eb91287c9  gdb-7.7.tar.bz2

Modified: csw/mgar/pkg/gdb/trunk/files/0002-OpenSolaris-gdb-fork-child.patch
===================================================================
--- csw/mgar/pkg/gdb/trunk/files/0002-OpenSolaris-gdb-fork-child.patch	2014-02-09 10:58:11 UTC (rev 22980)
+++ csw/mgar/pkg/gdb/trunk/files/0002-OpenSolaris-gdb-fork-child.patch	2014-02-09 16:55:51 UTC (rev 22981)
@@ -1,17 +1,17 @@
-From 8a377eecfc6cd2ee3fc1cf1cccc6614917306555 Mon Sep 17 00:00:00 2001
+From f661e528c55de3eb4ec1182c497c27a05f652d26 Mon Sep 17 00:00:00 2001
 From: Peter Felecan <pfelecan at opencsw.org>
-Date: Fri, 20 Jul 2012 15:56:22 +0200
+Date: Sun, 9 Feb 2014 15:26:06 +0100
 Subject: [PATCH] OpenSolaris gdb fork child
 
 ---
- gdb/fork-child.c |   37 +++++++++++++++++++++++++++++++++++++
+ gdb/fork-child.c | 37 +++++++++++++++++++++++++++++++++++++
  1 file changed, 37 insertions(+)
 
 diff --git a/gdb/fork-child.c b/gdb/fork-child.c
-index cba91f9..8a45a62 100644
+index 6c42d2e..2a749eb 100644
 --- a/gdb/fork-child.c
 +++ b/gdb/fork-child.c
-@@ -43,6 +43,16 @@ extern char **environ;
+@@ -42,6 +42,16 @@ extern char **environ;
  
  static char *exec_wrapper;
  
@@ -28,7 +28,7 @@
  /* Break up SCRATCH into an argument vector suitable for passing to
     execvp and store it in ARGV.  E.g., on "run a b c d" this routine
     would get as input the string "a b c d", and as output it would
-@@ -144,6 +154,8 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env,
+@@ -143,6 +153,8 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env,
    int i;
    int save_errno;
  
@@ -37,9 +37,9 @@
    /* If no exec file handed to us, get it from the exec-file command
       -- with a good, common error message if none is specified.  */
    exec_file = exec_file_arg;
-@@ -156,12 +168,34 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env,
+@@ -155,12 +167,34 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env,
    shell_file = shell_file_arg;
-   if (STARTUP_WITH_SHELL)
+   if (startup_with_shell)
      {
 +      /* Solaris only, is the shell a hard link to isaexec?  */
 +      struct stat buf1, buf2;
@@ -72,7 +72,7 @@
      }
  
    if (!shell)
-@@ -425,6 +459,9 @@ startup_inferior (int ntraps)
+@@ -429,6 +463,9 @@ startup_inferior (int ntraps)
    else
      resume_ptid = minus_one_ptid;
  
@@ -83,5 +83,5 @@
       have stopped one instruction after execing the shell.  Here we
       must get it up to actual execution of the real program.  */
 -- 
-1.7.10.3
+1.8.4.1
 

Added: csw/mgar/pkg/gdb/trunk/files/0004-cast-rlimit-infinity.patch
===================================================================
--- csw/mgar/pkg/gdb/trunk/files/0004-cast-rlimit-infinity.patch	                        (rev 0)
+++ csw/mgar/pkg/gdb/trunk/files/0004-cast-rlimit-infinity.patch	2014-02-09 16:55:51 UTC (rev 22981)
@@ -0,0 +1,25 @@
+From 462881f0945f43c07ba03fcd21d85ba2a0470ef2 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Sun, 9 Feb 2014 17:10:23 +0100
+Subject: [PATCH] cast rlimit infinity
+
+---
+ bfd/cache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bfd/cache.c b/bfd/cache.c
+index 4d46936..6d76131 100644
+--- a/bfd/cache.c
++++ b/bfd/cache.c
+@@ -82,7 +82,7 @@ bfd_cache_max_open (void)
+ #ifdef HAVE_GETRLIMIT
+       struct rlimit rlim;
+       if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
+-	  && rlim.rlim_cur != RLIM_INFINITY)
++		  && rlim.rlim_cur != (unsigned long)RLIM_INFINITY)
+ 	max = rlim.rlim_cur / 8;
+       else
+ #endif /* HAVE_GETRLIMIT */
+-- 
+1.8.4.1
+

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


From cgrzemba at users.sourceforge.net  Mon Feb 10 09:29:05 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 10 Feb 2014 08:29:05 +0000
Subject: SF.net SVN: gar:[22982] csw/mgar/pkg/xsane/trunk/Makefile
Message-ID: <3fN0dp07GTzHc@mail.opencsw.org>

Revision: 22982
          http://sourceforge.net/p/gar/code/22982
Author:   cgrzemba
Date:     2014-02-10 08:29:04 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
xsane/trunk: add build dependencies

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

Modified: csw/mgar/pkg/xsane/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xsane/trunk/Makefile	2014-02-09 16:55:51 UTC (rev 22981)
+++ csw/mgar/pkg/xsane/trunk/Makefile	2014-02-10 08:29:04 UTC (rev 22982)
@@ -14,6 +14,9 @@
 MASTER_SITES = http://www.xsane.org/download/
 DISTFILES  = $(DISTNAME).tar.gz
 
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibpango-dev
+
 # on libpng15 API changed
 PATCHFILES = 0001-libpng15.patch
 

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


From lblume at users.sourceforge.net  Mon Feb 10 15:33:20 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon, 10 Feb 2014 14:33:20 +0000
Subject: SF.net SVN: gar:[22983] csw/mgar/pkg/mysql5/branches/mysql-5.5.x
Message-ID: <3fN8k82KPbz1LT@mail.opencsw.org>

Revision: 22983
          http://sourceforge.net/p/gar/code/22983
Author:   lblume
Date:     2014-02-10 14:33:19 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Bump to 5.5.36

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-10 08:29:04 UTC (rev 22982)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-10 14:33:19 UTC (rev 22983)
@@ -14,7 +14,7 @@
 PROJ_NAME    = mysql
 NAME         = $(PROJ_NAME)5
 BASE_VERSION = 5.5
-PATCHLEVEL   = 35
+PATCHLEVEL   = 36
 ALTS_PRIO    = 55
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2014-02-10 08:29:04 UTC (rev 22982)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums	2014-02-10 14:33:19 UTC (rev 22983)
@@ -1 +1 @@
-56f833052b579b7d4a2b16326cda6990  mysql-5.5.35.tar.gz
+b7e236ede512b814ba521c84abc37292  mysql-5.5.36.tar.gz

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


From cgrzemba at users.sourceforge.net  Mon Feb 10 15:43:11 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 10 Feb 2014 14:43:11 +0000
Subject: SF.net SVN: gar:[22984] csw/mgar/pkg/lang-python/pygobject/trunk
Message-ID: <3fN8xc37glz1Qh@mail.opencsw.org>

Revision: 22984
          http://sourceforge.net/p/gar/code/22984
Author:   cgrzemba
Date:     2014-02-10 14:43:11 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: downgrade version 2.28.6

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

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pygobject/trunk/files/0002-gi-backport.patch

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-10 14:33:19 UTC (rev 22983)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-10 14:43:11 UTC (rev 22984)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = pygobject
-VERSION = 2.90.4
+VERSION = 2.28.6
 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//')
 # CATEGORIES = python
 
@@ -13,27 +13,42 @@
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(RELVER)/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-# PATCHFILES = 0001-forcing-lglib-2.0.patch
+PATCHFILES = 0001-forcing-lglib-2.0.patch
+PATCHFILES = 0002-gi-backport.patch
 
+GARCOMPILER = GCC4
+
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 BUILD_DEP_PKGS = CSWlibffi-dev
 
-PACKAGES += CSWlibpyglib-gi2-0python0
-PKGFILES_CSWlibpyglib-gi2-0python0 += $(call baseisadirs,$(libdir),libpyglib-gi-2\.0-python\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibpyglib-gi2-0python0 += $(DESCRIPTION), libpyglib-gi-2.0-python.so.0
-RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-gi2-0python0
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibglib2-0-0
+PACKAGES += CSWlibpyglib2-0python0
+CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0
+PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0)
+PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibpyglib2-0python0 += $(DESCRIPTION), libpyglib-2.0-python.so.0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0
 
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibffi5
-RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_$(GARCH))
+# PACKAGES += CSWlibpyglib-gi2-0python0
+# PKGFILES_CSWlibpyglib-gi2-0python0 += $(call baseisadirs,$(libdir),libpyglib-gi-2\.0-python\.so\.0(\.\d+)*)
+# SPKG_DESC_CSWlibpyglib-gi2-0python0 += $(DESCRIPTION), libpyglib-gi-2.0-python.so.0
+# RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-gi2-0python0
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibglib2-0-0
+# 
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibintl8
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibgobject2-0-0
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibffi5
+# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_$(GARCH))
 
 PACKAGES += CSWpy-gobject-dev
 OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject
 SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library
 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibglib2-0-0
 
 # These are just comments
 CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py26-files
@@ -48,7 +63,9 @@
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgirepository1-0-1
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-gi2-0python0
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgcc-s1
 
 RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibgthread2-0-0
@@ -58,6 +75,9 @@
 PYCOMPILE = 1
 STRIP_LIBTOOL = 1
 
+EXTRA_CFLAGS = -std=c99 -D_XPG6 -D__EXTENSIONS__
+EXTRA_BUILD_ENV = V=1
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 # CONFIGURE_ARGS += --without-ffi
 

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/checksums	2014-02-10 14:33:19 UTC (rev 22983)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/checksums	2014-02-10 14:43:11 UTC (rev 22984)
@@ -1 +1 @@
-ea5daef5c9d53efa445f6465c1fa0a2d  pygobject-2.90.4.tar.bz2
+a43d783228dd32899e6908352b8308f3  pygobject-2.28.6.tar.bz2

Added: csw/mgar/pkg/lang-python/pygobject/trunk/files/0002-gi-backport.patch
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/files/0002-gi-backport.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/files/0002-gi-backport.patch	2014-02-10 14:43:11 UTC (rev 22984)
@@ -0,0 +1,29 @@
+--- a/gi/pygi-info.c
++++ b/gi/pygi-info.c
+@@ -162,7 +162,7 @@ _pygi_info_new (GIBaseInfo *info)
+         case GI_INFO_TYPE_CONSTANT:
+             type = &PyGIConstantInfo_Type;
+             break;
+-        case GI_INFO_TYPE_ERROR_DOMAIN:
++        case GI_INFO_TYPE_INVALID_0:
+             type = &PyGIErrorDomainInfo_Type;
+             break;
+         case GI_INFO_TYPE_UNION:
+@@ -481,7 +481,7 @@ _pygi_g_type_info_size (GITypeInfo *type_info)
+                 case GI_INFO_TYPE_INVALID:
+                 case GI_INFO_TYPE_FUNCTION:
+                 case GI_INFO_TYPE_CONSTANT:
+-                case GI_INFO_TYPE_ERROR_DOMAIN:
++                case GI_INFO_TYPE_INVALID_0:
+                 case GI_INFO_TYPE_VALUE:
+                 case GI_INFO_TYPE_SIGNAL:
+                 case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +860,7 @@ pygi_g_struct_info_is_simple (GIStructInfo *struct_info)
+                     case GI_INFO_TYPE_INVALID:
+                     case GI_INFO_TYPE_FUNCTION:
+                     case GI_INFO_TYPE_CONSTANT:
+-                    case GI_INFO_TYPE_ERROR_DOMAIN:
++                    case GI_INFO_TYPE_INVALID_0:
+                     case GI_INFO_TYPE_VALUE:
+                     case GI_INFO_TYPE_SIGNAL:
+                     case GI_INFO_TYPE_PROPERTY:

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


From cgrzemba at users.sourceforge.net  Mon Feb 10 16:38:20 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 10 Feb 2014 15:38:20 +0000
Subject: SF.net SVN: gar:[22985]
	csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Message-ID: <3fNB962Gz3z1Y9@mail.opencsw.org>

Revision: 22985
          http://sourceforge.net/p/gar/code/22985
Author:   cgrzemba
Date:     2014-02-10 15:38:12 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: add sparc dependencies, workaround linker problem?

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

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-10 14:43:11 UTC (rev 22984)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-10 15:38:12 UTC (rev 22985)
@@ -30,6 +30,9 @@
 RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0
 
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0_$(GARCH))
+
 # PACKAGES += CSWlibpyglib-gi2-0python0
 # PKGFILES_CSWlibpyglib-gi2-0python0 += $(call baseisadirs,$(libdir),libpyglib-gi-2\.0-python\.so\.0(\.\d+)*)
 # SPKG_DESC_CSWlibpyglib-gi2-0python0 += $(DESCRIPTION), libpyglib-gi-2.0-python.so.0

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


From dmichelsen at users.sourceforge.net  Mon Feb 10 16:50:44 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 10 Feb 2014 15:50:44 +0000
Subject: SF.net SVN: gar:[22986] csw/mgar/pkg/apache2/branches/apache24
Message-ID: <3fNBRS5JfJz5R@mail.opencsw.org>

Revision: 22986
          http://sourceforge.net/p/gar/code/22986
Author:   dmichelsen
Date:     2014-02-10 15:50:44 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
apache2/branches/apache24: Update to 2.4.7

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile
    csw/mgar/pkg/apache2/branches/apache24/checksums

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-10 15:38:12 UTC (rev 22985)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-10 15:50:44 UTC (rev 22986)
@@ -1,7 +1,7 @@
 # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $
 
 NAME = httpd
-VERSION = 2.4.3
+VERSION = 2.4.7
 CATEGORIES = server
 GARTYPE = v2
 

Modified: csw/mgar/pkg/apache2/branches/apache24/checksums
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/checksums	2014-02-10 15:38:12 UTC (rev 22985)
+++ csw/mgar/pkg/apache2/branches/apache24/checksums	2014-02-10 15:50:44 UTC (rev 22986)
@@ -1 +1 @@
-538dccd22dd18466fff3ec7948495417  httpd-2.4.3.tar.gz
+9272aadaa2d702f6ae5758641d830d7f  httpd-2.4.7.tar.gz

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


From dmichelsen at users.sourceforge.net  Mon Feb 10 22:26:51 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 10 Feb 2014 21:26:51 +0000
Subject: SF.net SVN: gar:[22987] csw/mgar/pkg/sqlite3/trunk
Message-ID: <3fNKv81V5Kzfd@mail.opencsw.org>

Revision: 22987
          http://sourceforge.net/p/gar/code/22987
Author:   dmichelsen
Date:     2014-02-10 21:26:50 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
sqlite3/trunk: Update to 3.8.3

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

Modified: csw/mgar/pkg/sqlite3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sqlite3/trunk/Makefile	2014-02-10 15:50:44 UTC (rev 22986)
+++ csw/mgar/pkg/sqlite3/trunk/Makefile	2014-02-10 21:26:50 UTC (rev 22987)
@@ -1,5 +1,5 @@
 NAME = sqlite3
-VERSION = 3080200
+VERSION = 3080300
 GARTYPE = v2
 
 DESCRIPTION  = An embeddable SQL engine in a C library
@@ -9,7 +9,7 @@
 endef
 
 # Download informations
-MASTER_SITES = http://sqlite.org/2013/
+MASTER_SITES = http://sqlite.org/2014/
 DISTNAME = sqlite-autoconf-$(VERSION)
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += copyright-release.html

Modified: csw/mgar/pkg/sqlite3/trunk/checksums
===================================================================
--- csw/mgar/pkg/sqlite3/trunk/checksums	2014-02-10 15:50:44 UTC (rev 22986)
+++ csw/mgar/pkg/sqlite3/trunk/checksums	2014-02-10 21:26:50 UTC (rev 22987)
@@ -1,2 +1,2 @@
 fc9432136482bcde03102bc3e06dd413  copyright-release.html
-f62206713e6a08d4ccbc60b1fd712a1a  sqlite-autoconf-3080200.tar.gz
+11572878dc0ac74ae370367a464ab5cf  sqlite-autoconf-3080300.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 Feb 10 22:53:57 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 10 Feb 2014 21:53:57 +0000
Subject: SF.net SVN: gar:[22988] csw/mgar/pkg/tcl85/trunk/Makefile
Message-ID: <3fNLVR0M9BzmW@mail.opencsw.org>

Revision: 22988
          http://sourceforge.net/p/gar/code/22988
Author:   dmichelsen
Date:     2014-02-10 21:53:56 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
tcl85/trunk: Switch to alternatives

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-10 21:26:50 UTC (rev 22987)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-10 21:53:56 UTC (rev 22988)
@@ -69,13 +69,25 @@
 PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh)
 RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5
 
+#EXTRA_ISAEXEC_EXCLUDE_FILES += $(bindir)/tclsh8.5
+
+# No isaexec, use alternatives for now
+# ISAEXEC = 1
+
+# Relocate binaries away as we have the symlink in bindir
+EXTRA_MERGE_DIRS += $(bindir)
+
+ALTERNATIVES += 32 64
+ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5 320
+ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5 640
+#ALTERNATIVE_isaexec = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/isaexec 100
+
 # Enable 64 bits, but not for Solaris 9 x86
 BUILD64_5.9_sparc  = 1
 BUILD64_5.10_sparc = 1
 BUILD64_5.9_i386   =
 BUILD64_5.10_i386  = 1
 BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
-ISAEXEC = 1
 
 INCLUDE_FLAGS =
 
@@ -94,8 +106,8 @@
 #      against symbol                  offset      in file
 #  st                                  0x634       tclDTrace.o
 #  ld: fatal: relocations remain against allocatable but non-writable sections
-# CONFIGURE_ARGS-5.10 += --enable-dtrace
-# CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
+CONFIGURE_ARGS-5.10 += --enable-dtrace
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
 
 INSTALL_ARGS = install install-libraries install-private-headers install-tzdata install-msgs
 

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 Feb 11 11:39:12 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 11 Feb 2014 10:39:12 +0000
Subject: SF.net SVN: gar:[22989] csw/mgar/pkg
Message-ID: <3fNgTQ0pmlzDb@mail.opencsw.org>

Revision: 22989
          http://sourceforge.net/p/gar/code/22989
Author:   dmichelsen
Date:     2014-02-11 10:39:11 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
withlock/trunk: Initial commit

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

Added: csw/mgar/pkg/withlock/Makefile
===================================================================
--- csw/mgar/pkg/withlock/Makefile	                        (rev 0)
+++ csw/mgar/pkg/withlock/Makefile	2014-02-11 10:39:11 UTC (rev 22989)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/withlock/trunk
===================================================================
--- csw/mgar/pkg/withlock/trunk	2014-02-10 21:53:56 UTC (rev 22988)
+++ csw/mgar/pkg/withlock/trunk	2014-02-11 10:39:11 UTC (rev 22989)

Property changes on: csw/mgar/pkg/withlock/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/withlock/trunk/Makefile
===================================================================
--- csw/mgar/pkg/withlock/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/withlock/trunk/Makefile	2014-02-11 10:39:11 UTC (rev 22989)
@@ -0,0 +1,24 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = withlock
+VERSION = 0.2
+GARTYPE = v2
+
+DESCRIPTION = A locking wrapper script 
+
+MASTER_SITES = http://mirrorbrain.org/files/releases/
+DISTFILES += $(DISTNAME).tar.gz
+
+VENDOR_URL = https://code.google.com/p/withlock/
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -D -m 0755 $(WORKSRC)/withlock $(DESTDIR)$(bindir)/withlock
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/withlock/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/withlock/trunk/checksums
===================================================================
--- csw/mgar/pkg/withlock/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/withlock/trunk/checksums	2014-02-11 10:39:11 UTC (rev 22989)
@@ -0,0 +1 @@
+07c00ee7e12efe41d1b1dc3827671f23  withlock-0.2.tar.gz

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


From cgrzemba at users.sourceforge.net  Tue Feb 11 11:43:10 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 11 Feb 2014 10:43:10 +0000
Subject: SF.net SVN: gar:[22990] csw/mgar/pkg
Message-ID: <3fNgZ1482SzJ6@mail.opencsw.org>

Revision: 22990
          http://sourceforge.net/p/gar/code/22990
Author:   cgrzemba
Date:     2014-02-11 10:43:09 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
libgnomeprintui/trunk: Initial commit

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

Added: csw/mgar/pkg/libgnomeprintui/Makefile
===================================================================
--- csw/mgar/pkg/libgnomeprintui/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libgnomeprintui/Makefile	2014-02-11 10:43:09 UTC (rev 22990)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/libgnomeprintui/trunk
===================================================================
--- csw/mgar/pkg/libgnomeprintui/trunk	2014-02-11 10:39:11 UTC (rev 22989)
+++ csw/mgar/pkg/libgnomeprintui/trunk	2014-02-11 10:43:09 UTC (rev 22990)

Property changes on: csw/mgar/pkg/libgnomeprintui/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/libgnomeprintui/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgnomeprintui/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libgnomeprintui/trunk/Makefile	2014-02-11 10:43:09 UTC (rev 22990)
@@ -0,0 +1,62 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libgnomeprintui
+VERSION = 2.18.6
+GARTYPE = v2
+
+DESCRIPTION = The GNOME 2 print UI library 
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://ftp.acc.umu.se/pub/GNOME/sources/libgnomeprintui/$(basename $(VERSION))/
+DISTFILES  = $(DISTNAME).tar.gz
+
+# File name regex to get notifications about upstream software releases
+# NOTE: Use this only if the automatic regex creation
+#       does not work for your package
+# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of MASTER_SITES, then 
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# UPSTREAM_MASTER_SITES = 
+
+PACKAGES += CSWlibgnomeprintui2-2-0
+CATALOGNAME_CSWlibgnomeprintui2-2-0 = libgnomeprintui2_2_0
+PKGFILES_CSWlibgnomeprintui2-2-0 += $(call baseisadirs,$(libdir),libgnomeprintui-2-2\.so\.0\.1\.0)
+PKGFILES_CSWlibgnomeprintui2-2-0 += $(call baseisadirs,$(libdir),libgnomeprintui-2-2\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibgnomeprintui2-2-0 += $(DESCRIPTION), libgnomeprintui-2-2.so.0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgnomeprint
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibgnomecanvas2-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibart
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui2-2-0 += CSWlibatk1-0-0
+
+PACKAGES += CSWlibgnomeprintui-dev
+CATALOGNAME_CSWlibgnomeprintui-dev = libgnomeprintui_dev
+SPKG_DESC_CSWlibgnomeprintui-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibgnomeprintui-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui-dev += CSWlibgnomeprintui
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui-dev += CSWlibgnomeprintui2-2-0
+
+PACKAGES += CSWlibgnomeprintui
+CATALOGNAME_CSWlibgnomeprintui = libgnomeprintui
+SPKG_DESC_CSWlibgnomeprintui += $(DESCRIPTION)
+ARCHALL_CSWlibgnomeprintui = 1
+RUNTIME_DEP_PKGS_CSWlibgnomeprintui += CSWlibgnomeprintui2-2-0
+CHECKPKG_OVERRIDES_CSWlibgnomeprintui += surplus-dependency|CSWlibgnomeprintui2-2-0
+
+
+EXTRA_CONFIGURE_ENV = PATH=/opt/csw/gnu:$(PATH)
+EXTRA_LINKER_FLAGS = -lm
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/libgnomeprintui/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/libgnomeprintui/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgnomeprintui/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libgnomeprintui/trunk/checksums	2014-02-11 10:43:09 UTC (rev 22990)
@@ -0,0 +1 @@
+d55af077005e4aad0e72e2dbc28d0cc4  libgnomeprintui-2.18.6.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Feb 11 12:09:55 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 11 Feb 2014 11:09:55 +0000
Subject: SF.net SVN: gar:[22991] csw/mgar/pkg/file/trunk
Message-ID: <3fNh8t4kTRzP0@mail.opencsw.org>

Revision: 22991
          http://sourceforge.net/p/gar/code/22991
Author:   dmichelsen
Date:     2014-02-11 11:09:53 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
file/trunk: Update to 5.16, python version modulation

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

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2014-02-11 10:43:09 UTC (rev 22990)
+++ csw/mgar/pkg/file/trunk/Makefile	2014-02-11 11:09:53 UTC (rev 22991)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.14
+VERSION = 5.16
 GARTYPE = v2
 
 define BLURB
@@ -16,11 +16,21 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
-
 PATCHFILES += 0001-Use-PCRE.patch
 
 VENDOR_URL = http://www.darwinsys.com/file/
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
+
 PACKAGES += CSWgfile
 SPKG_DESC_CSWgfile = A file type guesser
 PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),gfile)
@@ -34,7 +44,15 @@
 ARCHALL_CSWpy-libmagic = 1
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
+OBSOLETED_BY_CSWpy-libmagic += CSWpy-magic
 
+# This is *obsoleted*! Come on, checkpkg...
+CHECKPKG_OVERRIDES_CSWpy-magic += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-magic += python-package-missing-py-files
+
+# checkpkg cannot detect this
+CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1
+
 PACKAGES += CSWlibmagic-data
 SPKG_DESC_CSWlibmagic-data = Database for libmagic
 # PKGFILES is catchall
@@ -78,28 +96,26 @@
 
 include gar/category.mk
 
-post-build:
+post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
-	(cd $(WORKSRC)/python && python setup.py build --compiler=unix)
-	###(cd $(WORKSRC)/python && python setup.py build)
+	(cd $(WORKSRC)/python && $(PYTHON) setup.py build --compiler=unix)
+	###(cd $(WORKSRC)/python && $(PYTHON) setup.py build)
 	@$(MAKECOOKIE)
 
+post-install-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7:
+	(cd $(WORKSRC)/python && \
+		$(BUILD_ENV) $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix))
+	@$(MAKECOOKIE)
+
 post-install:
-	(cd $(WORKSRC)/python && \
-		$(BUILD_ENV) python setup.py install --root=$(DESTDIR) --prefix=$(prefix))
 	(cd $(DESTDIR) && \
 		mv $(DESTDIR)$(bindir)/file $(DESTDIR)$(bindir)/gfile && \
 		mv $(DESTDIR)$(mandir)/man1/file\.1 $(DESTDIR)$(mandir)/man1/gfile\.1)
 	ginstall -d -m 755 $(DESTDIR)$(prefix)/gnu
 	(cd $(DESTDIR) && \
 		gln -s ../bin/gfile $(DESTDIR)$(prefix)/gnu/file)
-	# Injecting a symlink pointing at libmagic.so.1 on the filesystem, so that
-	# checkpkg realizes that the dependency is necessary.
-	if [ -d $(DESTDIR)$(libdir)/python/site-packages ]; then \
-	  ln -s ../../libmagic.so.1 $(DESTDIR)$(libdir)/python/site-packages/need-libmagic; \
-	fi
 	@$(MAKECOOKIE)
 
-post-merge:
+post-merge-all:
 	$(FILEDIR)/check_pkgroot.sh "$(PKGROOT)"
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2014-02-11 10:43:09 UTC (rev 22990)
+++ csw/mgar/pkg/file/trunk/checksums	2014-02-11 11:09:53 UTC (rev 22991)
@@ -1 +1 @@
-c26625f1d6773ad4bc5a87c0e315632c  file-5.14.tar.gz
+359c0cf41c3d438d17b4d293f3b950dc  file-5.16.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Feb 11 14:33:59 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 11 Feb 2014 13:33:59 +0000
Subject: SF.net SVN: gar:[22992] csw/mgar/pkg/file/trunk/Makefile
Message-ID: <3fNlM850Wszkb@mail.opencsw.org>

Revision: 22992
          http://sourceforge.net/p/gar/code/22992
Author:   dmichelsen
Date:     2014-02-11 13:33:58 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
file/trunk: Add i386 modulations

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

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2014-02-11 11:09:53 UTC (rev 22991)
+++ csw/mgar/pkg/file/trunk/Makefile	2014-02-11 13:33:58 UTC (rev 22992)
@@ -96,13 +96,15 @@
 
 include gar/category.mk
 
-post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7:
+post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7
+post-build-isa-pentium_pro-python_version-2.6 post-build-isa-pentium_pro-python_version-2.7:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
 	(cd $(WORKSRC)/python && $(PYTHON) setup.py build --compiler=unix)
 	###(cd $(WORKSRC)/python && $(PYTHON) setup.py build)
 	@$(MAKECOOKIE)
 
-post-install-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7:
+post-install-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7
+post-install-isa-pentium_pro-python_version-2.6 post-install-isa-pentium_pro-python_version-2.7:
 	(cd $(WORKSRC)/python && \
 		$(BUILD_ENV) $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix))
 	@$(MAKECOOKIE)

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


From dmichelsen at users.sourceforge.net  Tue Feb 11 14:34:56 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 11 Feb 2014 13:34:56 +0000
Subject: SF.net SVN: gar:[22993] csw/mgar/pkg/file/trunk/Makefile
Message-ID: <3fNlNF3p4Lzp0@mail.opencsw.org>

Revision: 22993
          http://sourceforge.net/p/gar/code/22993
Author:   dmichelsen
Date:     2014-02-11 13:34:55 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
file/trunk: Typos

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

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2014-02-11 13:33:58 UTC (rev 22992)
+++ csw/mgar/pkg/file/trunk/Makefile	2014-02-11 13:34:55 UTC (rev 22993)
@@ -96,15 +96,13 @@
 
 include gar/category.mk
 
-post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7
-post-build-isa-pentium_pro-python_version-2.6 post-build-isa-pentium_pro-python_version-2.7:
+post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7 post-build-isa-pentium_pro-python_version-2.6 post-build-isa-pentium_pro-python_version-2.7:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
 	(cd $(WORKSRC)/python && $(PYTHON) setup.py build --compiler=unix)
 	###(cd $(WORKSRC)/python && $(PYTHON) setup.py build)
 	@$(MAKECOOKIE)
 
-post-install-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7
-post-install-isa-pentium_pro-python_version-2.6 post-install-isa-pentium_pro-python_version-2.7:
+post-install-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7 post-install-isa-pentium_pro-python_version-2.6 post-install-isa-pentium_pro-python_version-2.7:
 	(cd $(WORKSRC)/python && \
 		$(BUILD_ENV) $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix))
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Tue Feb 11 14:36:17 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 11 Feb 2014 13:36:17 +0000
Subject: SF.net SVN: gar:[22994] csw/mgar/pkg/p11-kit/trunk
Message-ID: <3fNlPm36hlzsq@mail.opencsw.org>

Revision: 22994
          http://sourceforge.net/p/gar/code/22994
Author:   cgrzemba
Date:     2014-02-11 13:36:16 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
p11-kit/trunk: update version 0.20.2: 8 of 13 tests failed

Modified Paths:
--------------
    csw/mgar/pkg/p11-kit/trunk/Makefile
    csw/mgar/pkg/p11-kit/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch

Modified: csw/mgar/pkg/p11-kit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/Makefile	2014-02-11 13:34:55 UTC (rev 22993)
+++ csw/mgar/pkg/p11-kit/trunk/Makefile	2014-02-11 13:36:16 UTC (rev 22994)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = p11-kit
-VERSION = 0.12
+VERSION = 0.20.2
 GARTYPE = v2
 
 DESCRIPTION = Load and enumerate PKCS#11 modules
@@ -12,7 +12,8 @@
 
 # Use patch until this has been fixed:
 #   http://bugs.freedesktop.org/show_bug.cgi?id=49218
-PATCHFILES += 0001-Use-getexecname-instead-of-directly-accessing-__argv.patch
+# PATCHFILES += 0001-Use-getexecname-instead-of-directly-accessing-__argv.patch
+PATCHFILES += 0002-remove-include-paths.h.patch
 
 VENDOR_URL = http://p11-glue.freedesktop.org/p11-kit.html
 
@@ -29,6 +30,8 @@
 RUNTIME_DEP_PKGS_CSWlibp11kit-dev += CSWlibp11kit0 
 
 EXTRA_CPPFLAGS = -features=extensions -D__PRETTY_FUNCTION__=__func__
+EXTRA_CPPFLAGS += -xc99 -D_POSIX_PTHREAD_SEMANTICS -D__FUNCTION__=__func__
+
 EXTRA_LINKER_FLAGS += -lintl
 
 # For fabs(3m)
@@ -40,7 +43,10 @@
 BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --without-trust-paths 
 
+EXTRA_BUILD_ENV = V=1
+
 EXTRA_PAX_ARGS = -s ,pkcs11.conf.example,pkcs11.conf,
 
 PRESERVECONF += $(sysconfdir)/pkcs11.conf

Modified: csw/mgar/pkg/p11-kit/trunk/checksums
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/checksums	2014-02-11 13:34:55 UTC (rev 22993)
+++ csw/mgar/pkg/p11-kit/trunk/checksums	2014-02-11 13:36:16 UTC (rev 22994)
@@ -1 +1 @@
-66baf7ddde982d1b7294d3bd63be7446  p11-kit-0.12.tar.gz
+757b97ee4ac0ce598661a90cd784c4f1  p11-kit-0.20.2.tar.gz

Added: csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch	                        (rev 0)
+++ csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch	2014-02-11 13:36:16 UTC (rev 22994)
@@ -0,0 +1,13 @@
+--- a/trust/tests/test-trust.c
++++ b/trust/tests/test-trust.c
+@@ -54,10 +54,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#ifdef OS_UNIX
+-#include <paths.h>
+-#endif
+-
+ void
+ test_check_object_msg (const char *file,
+                        int line,

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 Feb 11 14:38:24 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 11 Feb 2014 13:38:24 +0000
Subject: SF.net SVN: gar:[22995] csw/mgar/pkg/withlock/trunk/Makefile
Message-ID: <3fNlSB13wdzxJ@mail.opencsw.org>

Revision: 22995
          http://sourceforge.net/p/gar/code/22995
Author:   dmichelsen
Date:     2014-02-11 13:38:24 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
withlock/trunk: Add archall

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

Modified: csw/mgar/pkg/withlock/trunk/Makefile
===================================================================
--- csw/mgar/pkg/withlock/trunk/Makefile	2014-02-11 13:36:16 UTC (rev 22994)
+++ csw/mgar/pkg/withlock/trunk/Makefile	2014-02-11 13:38:24 UTC (rev 22995)
@@ -12,6 +12,11 @@
 
 VENDOR_URL = https://code.google.com/p/withlock/
 
+PACKAGES += CSWwithlock
+SPKG_DESC_CSWwithlock = A locking wrapper script
+# PKGFILES is catchall
+ARCHALL_CSWwithlock = 1
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =

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


From cgrzemba at users.sourceforge.net  Tue Feb 11 15:12:25 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 11 Feb 2014 14:12:25 +0000
Subject: SF.net SVN: gar:[22996] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
Message-ID: <3fNmCX58Hsz196@mail.opencsw.org>

Revision: 22996
          http://sourceforge.net/p/gar/code/22996
Author:   cgrzemba
Date:     2014-02-11 14:12:24 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
lang-python/pygtk/trunk: update dependencies, various cleanups

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

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-11 13:38:24 UTC (rev 22995)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-11 14:12:24 UTC (rev 22996)
@@ -13,43 +13,56 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 STRIP_LIBTOOL = 1
 
+GARCOMPILER = GCC4
+
 # mgar test fails with "GtkWarning: could not open display"
 # however a gmake check works and finish successfull!
 SKIPTEST = 1
 
 PACKAGING_PLATFORMS=solaris10-i386 solaris10-sparc
+
 BUILD_DEP_PKGS += CSWpkgconfig
-BUILD_DEP_PKGS += CSWpygobject
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWpython27-dev
+BUILD_DEP_PKGS += CSWpy-gobject-dev
 BUILD_DEP_PKGS += CSWlibglib2-dev
 BUILD_DEP_PKGS += CSWlibatk-dev
 BUILD_DEP_PKGS += CSWpangodevel
 BUILD_DEP_PKGS += CSWpy-cairo
 BUILD_DEP_PKGS += CSWlibcairo-dev
 BUILD_DEP_PKGS += CSWlibxcbdevel
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWlibglade2
+BUILD_DEP_PKGS += CSWpy-numpy
+BUILD_DEP_PKGS += CSWfontconfig-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWsunx11devel
+BUILD_DEP_PKGS += CSWlibharfbuzz-dev
+BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
 
 PACKAGES = CSWpy-gtk
 CATALOGNAME_CSWpy-gtk = py_gtk
 SPKG_DESC_CSWpy-gtk = $(DESCRIPTION)
-OBSOLETED_BY_CSWpy-gtk = CSWpygtk
+# OBSOLETED_BY_CSWpy-gtk = CSWpygtk
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpython
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglade2
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpango
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibatk1-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpygobject
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWpy-cairo
+RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkfilechooser.html
 CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkrcstyle.html
 # pygtk do not work without this
@@ -58,7 +71,7 @@
 CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpy-cairo
 
 # pkg and classaction is obsolete
-CHECKPKG_OVERRIDES_CSWpygtk += action-class-only-in-pkginfo|cswpycompile
+# CHECKPKG_OVERRIDES_CSWpygtk += action-class-only-in-pkginfo|cswpycompile
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
 PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'

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


From cgrzemba at users.sourceforge.net  Wed Feb 12 09:31:47 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 12 Feb 2014 08:31:47 +0000
Subject: SF.net SVN: gar:[22997] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
Message-ID: <3fPDc209sfzPb@mail.opencsw.org>

Revision: 22997
          http://sourceforge.net/p/gar/code/22997
Author:   cgrzemba
Date:     2014-02-12 08:31:45 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
lang-python/pygtk/trunk: add sparc dependencies

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

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-11 14:12:24 UTC (rev 22996)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-12 08:31:45 UTC (rev 22997)
@@ -62,6 +62,13 @@
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibpango1-0-0
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibpangocairo1-0-0
+
+RUNTIME_DEP_PKGS_CSWpy-gtk_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWpy-gtk_sparc += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWpy-gtk_sparc += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWpy-gtk_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWpy-gtk += $(RUNTIME_DEP_PKGS_CSWpy-gtk_$(GARCH))
+
 CHECKPKG_OVERRIDES_CSWpy-gtk += surplus-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkfilechooser.html
 CHECKPKG_OVERRIDES_CSWpy-gtk += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/pygtk/class-gtkrcstyle.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  Wed Feb 12 15:16:19 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 14:16:19 +0000
Subject: SF.net SVN: gar:[22998] csw/mgar/pkg/ruby19/trunk/Makefile
Message-ID: <3fPNFV64lkz1F1@mail.opencsw.org>

Revision: 22998
          http://sourceforge.net/p/gar/code/22998
Author:   chninkel
Date:     2014-02-12 14:16:16 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ruby19/trunk: avoid using gobjcopy which corrupts Solaris elf information in binaries

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 08:31:45 UTC (rev 22997)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 14:16:16 UTC (rev 22998)
@@ -133,6 +133,12 @@
 CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION)
 CONFIGURE_ARGS += --with-out-ext=tk
 
+# gobjcopy (both the OpenCSW and SFW one) corrupts the ruby library
+# (see https://blogs.oracle.com/mandy/entry/building_ruby_1_9_on)
+# We disable objcopy (same workaround as in pkgsrc
+# https://github.com/jsonn/pkgsrc/blob/trunk/lang/ruby193-base/Makefile#L44)
+EXTRA_CONFIGURE_ENV += OBJCOPY=:
+
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 

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 Feb 12 15:16:48 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 14:16:48 +0000
Subject: SF.net SVN: gar:[22999] csw/mgar/pkg/ruby19/trunk/Makefile
Message-ID: <3fPNG20rxVz1JS@mail.opencsw.org>

Revision: 22999
          http://sourceforge.net/p/gar/code/22999
Author:   chninkel
Date:     2014-02-12 14:16:46 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ruby19/trunk: disable tests for now

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 14:16:16 UTC (rev 22998)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 14:16:46 UTC (rev 22999)
@@ -18,10 +18,10 @@
 #
 # [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543805
 # [2] http://redmine.ruby-lang.org/issues/show/2609
-ifneq ($(VERSION)$(PATCHLEVEL), 1.9.3p0)
-else
+#ifneq ($(VERSION)$(PATCHLEVEL), 1.9.3p0)
+#else
 TEST_SCRIPTS = 
-endif
+#endif
 
 DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL)
 

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


From cgrzemba at users.sourceforge.net  Wed Feb 12 16:41:20 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 12 Feb 2014 15:41:20 +0000
Subject: SF.net SVN: gar:[23000]
	csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Message-ID: <3fPQ7Y3hkQz5M@mail.opencsw.org>

Revision: 23000
          http://sourceforge.net/p/gar/code/23000
Author:   cgrzemba
Date:     2014-02-12 15:41:20 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: attemt to build python2.7 package also

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

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-12 14:16:46 UTC (rev 22999)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-12 15:41:20 UTC (rev 23000)
@@ -3,6 +3,7 @@
 NAME = pygobject
 VERSION = 2.28.6
 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//')
+# keep the 'configure; make; make install'-mantra
 # CATEGORIES = python
 
 DESCRIPTION = Python bindings for the GObject library
@@ -19,8 +20,19 @@
 GARCOMPILER = GCC4
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 BUILD_DEP_PKGS = CSWlibffi-dev
 
+# add this because we do not use the pyton category
+_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test
+_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.*
+PYCOMPILE = 1
+_CATEGORY_MODULATORS ?= PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION ?= 2_6 2_7
+MERGE_SCRIPTS_isa-default-python_version-2_6 ?= copy-all
+MERGE_SCRIPTS_isa-default-python_version-2_7 ?= copy-all
+MERGE_SCRIPTS_isa-default-python_version-3_3 ?= copy-all
+
 PACKAGES += CSWlibpyglib2-0python0
 CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0
 PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0)
@@ -75,7 +87,6 @@
 RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += $(RUNTIME_DEP_PKGS_CSWpy-gobject_$(GARCH))
 
-PYCOMPILE = 1
 STRIP_LIBTOOL = 1
 
 EXTRA_CFLAGS = -std=c99 -D_XPG6 -D__EXTENSIONS__

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 Feb 12 17:39:48 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 16:39:48 +0000
Subject: SF.net SVN: gar:[23001] csw/mgar/pkg/ruby19/trunk/Makefile
Message-ID: <3fPRR14S65zDb@mail.opencsw.org>

Revision: 23001
          http://sourceforge.net/p/gar/code/23001
Author:   chninkel
Date:     2014-02-12 16:39:48 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ruby19/trunk: update dependencies

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 15:41:20 UTC (rev 23000)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 16:39:48 UTC (rev 23001)
@@ -45,10 +45,11 @@
 
 SPKG_DESC_CSWlibruby1-9-1-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION))
 RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1  = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibssl0-9-8 CSWlibyaml
-RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi4
+RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibssl1-0-0 CSWlibyaml0-2
+RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi5
 PKGFILES_CSWlibruby1-9-1-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*)
 PKGFILES_CSWlibruby1-9-1-1 += $(libdir)/ruby/.*
+
 # the next two have /usr/local/bin from dln_find.c.  it should be innocuous and
 # not worth patching
 CHECKPKG_OVERRIDES_CSWlibruby1-9-1-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby1.9.1.so.1

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


From chninkel at users.sourceforge.net  Wed Feb 12 18:45:42 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 17:45:42 +0000
Subject: SF.net SVN: gar:[23002] csw/mgar/pkg/ruby19/trunk/Makefile
Message-ID: <3fPSv81DRszNt@mail.opencsw.org>

Revision: 23002
          http://sourceforge.net/p/gar/code/23002
Author:   chninkel
Date:     2014-02-12 17:45:42 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ruby19/trunk: revert back to the same patch level of the package currently in unstable

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 16:39:48 UTC (rev 23001)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2014-02-12 17:45:42 UTC (rev 23002)
@@ -3,7 +3,7 @@
 # Change this when the build starts putting files in $(libdir)/ruby/$(newver)
 API_VERSION = 1.9.1
 API_SHORT = $(subst .,,$(API_VERSION))
-PATCHLEVEL = p194
+PATCHLEVEL = p0
 GARTYPE = v2
 
 # patchfile 0002-vm.c... is a backport from upstream
@@ -18,10 +18,10 @@
 #
 # [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543805
 # [2] http://redmine.ruby-lang.org/issues/show/2609
-#ifneq ($(VERSION)$(PATCHLEVEL), 1.9.3p0)
-#else
+ifneq ($(VERSION)$(PATCHLEVEL), 1.9.3p0)
+else
 TEST_SCRIPTS = 
-#endif
+endif
 
 DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL)
 

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 Feb 12 18:46:39 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 17:46:39 +0000
Subject: SF.net SVN: gar:[23003] csw/mgar/pkg/ruby19/trunk/checksums
Message-ID: <3fPSwD1y6qzSJ@mail.opencsw.org>

Revision: 23003
          http://sourceforge.net/p/gar/code/23003
Author:   chninkel
Date:     2014-02-12 17:46:35 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ruby19/trunk: checksum update

Modified Paths:
--------------
    csw/mgar/pkg/ruby19/trunk/checksums

Modified: csw/mgar/pkg/ruby19/trunk/checksums
===================================================================
--- csw/mgar/pkg/ruby19/trunk/checksums	2014-02-12 17:45:42 UTC (rev 23002)
+++ csw/mgar/pkg/ruby19/trunk/checksums	2014-02-12 17:46:35 UTC (rev 23003)
@@ -1 +1 @@
-bc0c715c69da4d1d8bd57069c19f6c0e  ruby-1.9.3-p194.tar.gz
+8e2fef56185cfbaf29d0c8329fc77c05  ruby-1.9.3-p0.tar.gz

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


From chninkel at users.sourceforge.net  Wed Feb 12 19:25:46 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 12 Feb 2014 18:25:46 +0000
Subject: SF.net SVN: gar:[23004] csw/mgar/pkg/ntop/trunk
Message-ID: <3fPTnL492dzjS@mail.opencsw.org>

Revision: 23004
          http://sourceforge.net/p/gar/code/23004
Author:   chninkel
Date:     2014-02-12 18:25:45 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
ntop/trunk: revert back to the same version of the package existing in unstable: 4.0.3

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

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-12 17:46:35 UTC (rev 23003)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-12 18:25:45 UTC (rev 23004)
@@ -1,5 +1,5 @@
 NAME = ntop
-VERSION = 4.1.0
+VERSION = 4.0.3
 GARTYPE = v2
 
 DESCRIPTION = A network traffic usage monitor
@@ -13,7 +13,7 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES  = $(NAME)-$(VERSION).tgz
 
 DISTFILES  += cswntop
 EXPANDVARS += cswntop
@@ -64,13 +64,13 @@
 BUILD_DEP_PKGS += CSWrrdtool-dev
 
 # These are ntop plugins so these check alerts are not important
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libicmpPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libnetflowPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntop-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntopreport-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libicmpPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libnetflowPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntop-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntopreport-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.0.3.so
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh
 
@@ -105,12 +105,12 @@
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsflowPlugin.so
 
 # Upstream has chosen it that way...
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.1.0.so|filename=cpacketPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.1.0.so|filename=icmpPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.1.0.so|filename=netflowPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.1.0.so|filename=rrdPlugin.so
-CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.1.0.so|filename=sflowPlugin.so
-#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.1.0.so',|'libicmpPlugin-4.1.0.so',|'libnetflowPlugin-4.1.0.so',|'libntop-4.1.0.so',|'libntopreport-4.1.0.so',|'librrdPlugin-4.1.0.so',|'libsflowPlugin-4.1.0.so']|pkgname=CSWntop|expected=['CSWlib4.1.0']|
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libcpacketPlugin-4.0.3.so|filename=cpacketPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libicmpPlugin-4.0.3.so|filename=icmpPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libnetflowPlugin-4.0.3.so|filename=netflowPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=librrdPlugin-4.0.3.so|filename=rrdPlugin.so
+CHECKPKG_OVERRIDES_CSWntop += soname-not-part-of-filename|soname=libsflowPlugin-4.0.3.so|filename=sflowPlugin.so
+#CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch|sonames=['libcpacketPlugin-4.0.3.so',|'libicmpPlugin-4.0.3.so',|'libnetflowPlugin-4.0.3.so',|'libntop-4.0.3.so',|'libntopreport-4.0.3.so',|'librrdPlugin-4.0.3.so',|'libsflowPlugin-4.0.3.so']|pkgname=CSWntop|expected=['CSWlib4.0.3']|
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch
 
 # Bad content files - Documentation
@@ -120,13 +120,13 @@
 #CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
 
 # Bad content files - Shared libraries (Captured Build Info for Version Output)
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.1.0.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.1.0.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/sflowPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/cpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/rrdPlugin.so

Modified: csw/mgar/pkg/ntop/trunk/checksums
===================================================================
--- csw/mgar/pkg/ntop/trunk/checksums	2014-02-12 17:46:35 UTC (rev 23003)
+++ csw/mgar/pkg/ntop/trunk/checksums	2014-02-12 18:25:45 UTC (rev 23004)
@@ -1 +1 @@
-116df99cf548431393991ea15443c52f  ntop-4.1.0.tar.gz
+f064393a2090e5bda102cd49c2707789  ntop-4.0.3.tgz

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


From jake_goerzen at users.sourceforge.net  Thu Feb 13 00:17:01 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 12 Feb 2014 23:17:01 +0000
Subject: SF.net SVN: gar:[23005] csw/mgar/pkg/dovecot/trunk/Makefile
Message-ID: <3fPcFL3CNPz1Hm@mail.opencsw.org>

Revision: 23005
          http://sourceforge.net/p/gar/code/23005
Author:   jake_goerzen
Date:     2014-02-12 23:17:00 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
dovecot: update to 2.2.11

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-12 18:25:45 UTC (rev 23004)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-12 23:17:00 UTC (rev 23005)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.10
+VERSION = 2.2.11
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server

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


From jake_goerzen at users.sourceforge.net  Thu Feb 13 00:44:03 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Wed, 12 Feb 2014 23:44:03 +0000
Subject: SF.net SVN: gar:[23006] csw/mgar/pkg/dovecot/trunk/checksums
Message-ID: <3fPcrV720Dz1Nd@mail.opencsw.org>

Revision: 23006
          http://sourceforge.net/p/gar/code/23006
Author:   jake_goerzen
Date:     2014-02-12 23:44:03 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
dovecot: update checksums

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

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2014-02-12 23:17:00 UTC (rev 23005)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2014-02-12 23:44:03 UTC (rev 23006)
@@ -1 +1 @@
-037e9c9e07d9dbff54dcff09f280fc8c  dovecot-2.2.10.tar.gz
+d53d207727df99e4362a3787223c6fa3  dovecot-2.2.11.tar.gz

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


From lblume at users.sourceforge.net  Thu Feb 13 10:12:47 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Thu, 13 Feb 2014 09:12:47 +0000
Subject: SF.net SVN: gar:[23007] csw/mgar/pkg/krb5-lib/trunk
Message-ID: <3fPsSv0b01zT0@mail.opencsw.org>

Revision: 23007
          http://sourceforge.net/p/gar/code/23007
Author:   lblume
Date:     2014-02-13 09:12:45 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
krb5-lib/trunk: Bump to 1.12.1; need gtar to extract the file without error

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/checksums

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2014-02-12 23:44:03 UTC (rev 23006)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2014-02-13 09:12:45 UTC (rev 23007)
@@ -5,7 +5,7 @@
 #
 
 NAME    = krb5
-VERSION = 1.11.4
+VERSION = 1.12.1
 GARTYPE = v2
 
 DESCRIPTION = MIT Kerberos 5 core libraries
@@ -166,7 +166,7 @@
 
 post-extract-modulated:
 	@# TODO: Check signature
-	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | gtar xf -)
 	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
 	perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \
 		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in

Modified: csw/mgar/pkg/krb5-lib/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/checksums	2014-02-12 23:44:03 UTC (rev 23006)
+++ csw/mgar/pkg/krb5-lib/trunk/checksums	2014-02-13 09:12:45 UTC (rev 23007)
@@ -1 +1 @@
-138628ae154ff449bc41602c8de78e8b  krb5-1.11.4-signed.tar
+524b1067b619cb5bf780759b6884c3f5  krb5-1.12.1-signed.tar

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 Feb 13 10:22:13 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 09:22:13 +0000
Subject: SF.net SVN: gar:[23008] csw/mgar/pkg/tcl85/trunk/Makefile
Message-ID: <3fPsgk1XPkzfq@mail.opencsw.org>

Revision: 23008
          http://sourceforge.net/p/gar/code/23008
Author:   dmichelsen
Date:     2014-02-13 09:22:10 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
tcl85/trunk: Fix alternatives

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 09:12:45 UTC (rev 23007)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 09:22:10 UTC (rev 23008)
@@ -78,8 +78,10 @@
 EXTRA_MERGE_DIRS += $(bindir)
 
 ALTERNATIVES += 32 64
-ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5 320
-ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5 640
+ALTERNATIVE_32 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh 320
+ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5
+ALTERNATIVE_64 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh 640
+ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5
 #ALTERNATIVE_isaexec = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/isaexec 100
 
 # Enable 64 bits, but not for Solaris 9 x86

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 Feb 13 10:22:53 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 09:22:53 +0000
Subject: SF.net SVN: gar:[23009] csw/mgar/pkg/tcl85/trunk/Makefile
Message-ID: <3fPshN6YgrzkF@mail.opencsw.org>

Revision: 23009
          http://sourceforge.net/p/gar/code/23009
Author:   dmichelsen
Date:     2014-02-13 09:22:52 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
tcl85/trunk: Fix alternatives

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 09:22:10 UTC (rev 23008)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 09:22:52 UTC (rev 23009)
@@ -79,9 +79,9 @@
 
 ALTERNATIVES += 32 64
 ALTERNATIVE_32 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh 320
-ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5
+ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5
 ALTERNATIVE_64 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh 640
-ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5
+ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5
 #ALTERNATIVE_isaexec = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/isaexec 100
 
 # Enable 64 bits, but not for Solaris 9 x86

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


From cgrzemba at users.sourceforge.net  Thu Feb 13 11:12:40 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 13 Feb 2014 10:12:40 +0000
Subject: SF.net SVN: gar:[23010]
	csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Message-ID: <3fPtnv1gVlzxr@mail.opencsw.org>

Revision: 23010
          http://sourceforge.net/p/gar/code/23010
Author:   cgrzemba
Date:     2014-02-13 10:12:35 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
lang-python/pygobject/trunk: add build and package for Python2.7

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

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-13 09:22:52 UTC (rev 23009)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2014-02-13 10:12:35 UTC (rev 23010)
@@ -3,6 +3,7 @@
 NAME = pygobject
 VERSION = 2.28.6
 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//')
+MAJOR = $(shell echo $(VERSION) | gsed -e 's/\(^[0-9]\+\)\..*/\1/')
 # keep the 'configure; make; make install'-mantra
 # CATEGORIES = python
 
@@ -24,46 +25,54 @@
 BUILD_DEP_PKGS = CSWlibffi-dev
 
 # add this because we do not use the pyton category
-_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test
-_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.*
-PYCOMPILE = 1
-_CATEGORY_MODULATORS ?= PYTHON_VERSION
-MODULATIONS_PYTHON_VERSION ?= 2_6 2_7
-MERGE_SCRIPTS_isa-default-python_version-2_6 ?= copy-all
-MERGE_SCRIPTS_isa-default-python_version-2_7 ?= copy-all
-MERGE_SCRIPTS_isa-default-python_version-3_3 ?= copy-all
+# _MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test
+# _MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.*
 
-PACKAGES += CSWlibpyglib2-0python0
-CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0
-PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0)
-PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibpyglib2-0python0 += $(DESCRIPTION), libpyglib-2.0-python.so.0
-RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0
 
-RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0_sparc += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0_$(GARCH))
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
 
-# PACKAGES += CSWlibpyglib-gi2-0python0
-# PKGFILES_CSWlibpyglib-gi2-0python0 += $(call baseisadirs,$(libdir),libpyglib-gi-2\.0-python\.so\.0(\.\d+)*)
-# SPKG_DESC_CSWlibpyglib-gi2-0python0 += $(DESCRIPTION), libpyglib-gi-2.0-python.so.0
-# RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-gi2-0python0
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibgthread2-0-0
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibglib2-0-0
-# 
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibintl8
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibgobject2-0-0
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_sparc += CSWlibffi5
-# RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0_$(GARCH))
+PACKAGES += CSWlibpyglib2-0python2-6-0
+CATALOGNAME_CSWlibpyglib2-0python2-6-0 = libpyglib2_0python2_6_0
+PKGFILES_CSWlibpyglib2-0python2-6-0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python2\.6\.so\.0\.0\.0)
+PKGFILES_CSWlibpyglib2-0python2-6-0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python2\.6\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibpyglib2-0python2-6-0 += $(DESCRIPTION), libpyglib-2.0-python2.6.so.0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0 += CSWlibglib2-0-0
 
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-6-0_$(GARCH))
+
+
+PACKAGES += CSWlibpyglib2-0python2-7-0
+CATALOGNAME_CSWlibpyglib2-0python2-7-0 = libpyglib2_0python2_7_0
+PKGFILES_CSWlibpyglib2-0python2-7-0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python2\.7\.so\.0\.0\.0)
+PKGFILES_CSWlibpyglib2-0python2-7-0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python2\.7\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibpyglib2-0python2-7-0 += $(DESCRIPTION), libpyglib-2.0-python2.7.so.0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0 += CSWlibglib2-0-0
+
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0 += $(RUNTIME_DEP_PKGS_CSWlibpyglib2-0python2-7-0_$(GARCH))
+
 PACKAGES += CSWpy-gobject-dev
 OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject
 SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library
-RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0
 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python2-6-0
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python2-7-0
 
 # These are just comments
 CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py26-files
@@ -72,15 +81,17 @@
 PACKAGES += CSWpy-gobject
 # OBSOLETED_BY_CSWpy-gobject += CSWpygobject
 SPKG_DESC_CSWpy-gobject = $(DESCRIPTION)
-PKGFILES_CSWpy-gobject = $(libdir)/python.*/site-packages/.*
+PKGFILES_CSWpy-gobject += $(libdir)/python.*/site-packages/.*
+PKGFILES_CSWpy-gobject += $(datadir)/$(NAME)/$(MAJOR)\.2/.*
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibffi5
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgirepository1-0-1
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0
 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python2-7-0
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python2-6-0
 
 RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWpy-gobject_sparc += CSWlibgthread2-0-0
@@ -91,6 +102,7 @@
 
 EXTRA_CFLAGS = -std=c99 -D_XPG6 -D__EXTENSIONS__
 EXTRA_BUILD_ENV = V=1
+EXTRA_CONFIGURE_ENV = PYTHON=python$(PYTHON_VERSION)
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 # CONFIGURE_ARGS += --without-ffi
@@ -99,6 +111,7 @@
 TEST_TARGET = check
 TEST_SCRIPTS =
 
+PYCOMPILE = 1
 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
 
 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 Feb 13 11:18:44 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 10:18:44 +0000
Subject: SF.net SVN: gar:[23011] csw/mgar/pkg/sshguard/trunk
Message-ID: <3fPtwy3Wlnz17b@mail.opencsw.org>

Revision: 23011
          http://sourceforge.net/p/gar/code/23011
Author:   dmichelsen
Date:     2014-02-13 10:18:44 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
sshguard/trunk: Update to 1.5, add modulations for used firewall

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

Modified: csw/mgar/pkg/sshguard/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sshguard/trunk/Makefile	2014-02-13 10:12:35 UTC (rev 23010)
+++ csw/mgar/pkg/sshguard/trunk/Makefile	2014-02-13 10:18:44 UTC (rev 23011)
@@ -1,5 +1,5 @@
 NAME = sshguard
-VERSION = 1.5rc3
+VERSION = 1.5
 GARTYPE = v2
 
 DESCRIPTION = Protects networked hosts from brute force attacks
@@ -11,12 +11,32 @@
 SF_PROJECT = $(NAME)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+LICENSE = README
 
+EXTRA_MODULATORS += FIREWALL
+MODULATIONS_FIREWALL = ipfilter hosts
+
 GARCOMPILER = GNU
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-firewall=hosts
+CONFIGURE_ARGS += --with-firewall=$(FIREWALL)
 
+# See ipf(1m) and ipf(4) 
+CONFIGURE_ARGS-ipfilter += --with-ipf=/usr/sbin/ipf
+CONFIGURE_ARGS-ipfilter += --with-ipfilterconf=/etc/ipf/ipf.conf
+
+# This is defined in OpenCSW TCPwrapper
+CONFIGURE_ARGS-hosts += --with-hostsfile=/etc/opt/csw/hosts.allow
+
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(FIREWALL))
+
+EXTRA_PAX_ARGS += -s ",\($(sbindir)/sshguard\),/\1-$(FIREWALL),"
+
+MERGE_SCRIPTS_isa-default-firewall-ipfilter = copy-all
+MERGE_SCRIPTS_isa-default-firewall-hosts = copy-all
+
+ALTERNATIVES += ipfilter hosts
+ALTERNATIVE_ipfilter += $(sbindir)/sshguard sshguard $(sbindir)/sshguard-ipfilter 200
+ALTERNATIVE_hosts    += $(sbindir)/sshguard sshguard $(sbindir)/sshguard-hosts 100
+
 include gar/category.mk

Modified: csw/mgar/pkg/sshguard/trunk/checksums
===================================================================
--- csw/mgar/pkg/sshguard/trunk/checksums	2014-02-13 10:12:35 UTC (rev 23010)
+++ csw/mgar/pkg/sshguard/trunk/checksums	2014-02-13 10:18:44 UTC (rev 23011)
@@ -1 +1 @@
-388315aa687168f838ae3d5c9a486b00  sshguard-1.5rc3.tar.bz2
+11b9f47f9051e25bdfe84a365c961ec1  sshguard-1.5.tar.bz2

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


From dmichelsen at users.sourceforge.net  Thu Feb 13 11:56:09 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 10:56:09 +0000
Subject: SF.net SVN: gar:[23012] csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: <3fPvm72Mp6z1Q4@mail.opencsw.org>

Revision: 23012
          http://sourceforge.net/p/gar/code/23012
Author:   dmichelsen
Date:     2014-02-13 10:56:03 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
krb5-lib/trunk: Update to 1.12.1 and latest mgar

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

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2014-02-13 10:18:44 UTC (rev 23011)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2014-02-13 10:56:03 UTC (rev 23012)
@@ -22,8 +22,8 @@
 
 GARCOMPILER = GCC4
 
-BUILD_DEP_PKGS += CSWggettext
-BUILD_DEP_PKGS += CSWtcl
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWtcl-dev
 
 PACKAGES += CSWlibkrb5-dev
 SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
@@ -164,7 +164,7 @@
 
 include gar/category.mk
 
-post-extract-modulated:
+post-extract:
 	@# TODO: Check signature
 	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | gtar xf -)
 	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
@@ -172,7 +172,7 @@
 		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in
 	@$(MAKECOOKIE)
 
-post-install-modulated:
+post-install:
 	# Remove Studio-specific arch references
 	gsed -i \
 		-e '/^[^#]/s/-xO[0-5][^ ]* *//g' \

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 Feb 13 12:57:03 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 11:57:03 +0000
Subject: SF.net SVN: gar:[23013] csw/mgar/pkg/tcl85/trunk/Makefile
Message-ID: <3fPx6J3tswz30@mail.opencsw.org>

Revision: 23013
          http://sourceforge.net/p/gar/code/23013
Author:   dmichelsen
Date:     2014-02-13 11:56:58 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
tcl85/trunk: Fix alternatives... again!

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 10:56:03 UTC (rev 23012)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2014-02-13 11:56:58 UTC (rev 23013)
@@ -77,11 +77,11 @@
 # Relocate binaries away as we have the symlink in bindir
 EXTRA_MERGE_DIRS += $(bindir)
 
-ALTERNATIVES += 32 64
-ALTERNATIVE_32 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh 320
-ALTERNATIVE_32 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5
-ALTERNATIVE_64 = $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh 640
-ALTERNATIVE_64 = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5
+ALTERNATIVES_CSWtcl += tclsh32 tclsh64
+ALTERNATIVE_tclsh32 += $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT)/tclsh 320
+ALTERNATIVE_tclsh32 += $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT)/tclsh8.5
+ALTERNATIVE_tclsh64 += $(bindir_install)/tclsh tclsh $(bindir_install)/$(ISA_DEFAULT64)/tclsh 640
+ALTERNATIVE_tclsh64 += $(bindir_install)/tclsh8.5 tclsh8.5 $(bindir_install)/$(ISA_DEFAULT64)/tclsh8.5
 #ALTERNATIVE_isaexec = $(bindir_install)/tclsh8.5 tclsh $(bindir_install)/isaexec 100
 
 # Enable 64 bits, but not for Solaris 9 x86

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 Feb 13 15:53:16 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 14:53:16 +0000
Subject: SF.net SVN: gar:[23014] csw/mgar/pkg/sqlite3/trunk/Makefile
Message-ID: <3fQ11d4RBxzhr@mail.opencsw.org>

Revision: 23014
          http://sourceforge.net/p/gar/code/23014
Author:   dmichelsen
Date:     2014-02-13 14:53:15 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
sqlite3/trunk: Fixes for Solaris 9

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

Modified: csw/mgar/pkg/sqlite3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sqlite3/trunk/Makefile	2014-02-13 11:56:58 UTC (rev 23013)
+++ csw/mgar/pkg/sqlite3/trunk/Makefile	2014-02-13 14:53:15 UTC (rev 23014)
@@ -18,6 +18,9 @@
 
 LICENSE = copyright-release.html
 
+PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 PACKAGES += CSWsqlite3
 SPKG_DESC_CSWsqlite3 = An embeddable SQL engine in a C library
 # PKGFILES_CSWsqlite3 = $(bindir)/.*
@@ -43,6 +46,10 @@
 # Enable sqlite3_unlock_notify() API as requested in #4837
 EXTRA_CPPFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 
+# FOr fchmod in stat.h
+EXTRA_CPPFLAGS-5.9 += -D__EXTENSIONS__=1
+EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS-$(GAROSREL))
+
 BUILD64 = 1
 ISAEXEC = 1
 

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


From cgrzemba at users.sourceforge.net  Thu Feb 13 16:29:24 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 13 Feb 2014 15:29:24 +0000
Subject: SF.net SVN: gar:[23015] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
Message-ID: <3fQ1qL3GjbzvH@mail.opencsw.org>

Revision: 23015
          http://sourceforge.net/p/gar/code/23015
Author:   cgrzemba
Date:     2014-02-13 15:29:24 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
lang-python/pygtk/trunk: add build and packaging for Python2.7

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

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-13 14:53:15 UTC (rev 23014)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-13 15:29:24 UTC (rev 23015)
@@ -3,6 +3,8 @@
 VERSION = 2.24.0
 GARTYPE = v2
 RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9].*\.[0-9].*\)\.[0-9]*/\1/')
+# keep the 'configure; make; make install'-mantra
+# CATEGORIES = python
 
 DESCRIPTION = Python bindings for the GTK library
 define BLURB
@@ -21,6 +23,22 @@
 
 PACKAGING_PLATFORMS=solaris10-i386 solaris10-sparc
 
+# add this because we do not use the pyton category
+_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test
+_MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.*
+PYCOMPILE = 1
+_CATEGORY_MODULATORS ?= PYTHON_VERSION
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
+
 BUILD_DEP_PKGS += CSWpkgconfig
 BUILD_DEP_PKGS += CSWpython-dev
 BUILD_DEP_PKGS += CSWpython27-dev
@@ -88,6 +106,7 @@
 # PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig
 # EXTRA_EXPORTS = PKG_CONFIG_PATH
 
+EXTRA_CONFIGURE_ENV = PYTHON=python$(PYTHON_VERSION)
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 #TEST_SCRIPTS = 

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


From dmichelsen at users.sourceforge.net  Thu Feb 13 16:31:00 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 15:31:00 +0000
Subject: SF.net SVN: gar:[23016] csw/mgar/pkg/scons/trunk/Makefile
Message-ID: <3fQ1s93KBJzyq@mail.opencsw.org>

Revision: 23016
          http://sourceforge.net/p/gar/code/23016
Author:   dmichelsen
Date:     2014-02-13 15:30:57 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
scons: Enable Solaris 9 build again for libserf

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

Modified: csw/mgar/pkg/scons/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scons/trunk/Makefile	2014-02-13 15:29:24 UTC (rev 23015)
+++ csw/mgar/pkg/scons/trunk/Makefile	2014-02-13 15:30:57 UTC (rev 23016)
@@ -14,16 +14,26 @@
   caches such as ccache. In short, SCons is an easier, more
   reliable and faster way to build software.
 endef
-SF_PROJECT = scons
+
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-SPKG_SOURCEURL = http://www.scons.org/
-LICENSE = LICENSE.txt
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+
+# We have only one package and that is archall, choose sparc
+# We need libserf on Solaris 9 for subversion and that requires a current scons
+PACKAGING_PLATFORMS = solaris9-sparc
+
+VENDOR_URL = http://www.scons.org/
+
+PACKAGES += CSWscons
+SPKG_DESC_CSWscons = A next-generation build tool
+# PKGFILES is catchall
+ARCHALL_CSWscons = 1
+CHECKPKG_OVERRIDES_CSWscons += file-with-bad-content
+
 CONFIGURE_SCRIPTS =
 TEST_SCRIPTS = 
 EXTRA_PAX_ARGS = -s ",\./opt/csw/man,./opt/csw/share/man,"
-ARCHALL = 1
-PACKAGES = CSWscons
-EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/$(NAME)-$(VERSION)/SCons/.*\.py[co]
-CHECKPKG_OVERRIDES_CSWscons += file-with-bad-content
+
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
+
 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 Feb 13 16:47:28 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 15:47:28 +0000
Subject: SF.net SVN: gar:[23017] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fQ2D85GKVz14Z@mail.opencsw.org>

Revision: 23017
          http://sourceforge.net/p/gar/code/23017
Author:   dmichelsen
Date:     2014-02-13 15:47:26 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
libserf: Enable Solaris 9 for Subversion

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-02-13 15:30:57 UTC (rev 23016)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-02-13 15:47:26 UTC (rev 23017)
@@ -24,8 +24,13 @@
 TEST_SCRIPTS =
 
 # openssl-1.0 only available for sol-10
+PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+BUILD_DEP_PKGS += CSWscons
+BUILD_DEP_PKGS += CSWlibapr-dev
+BUILD_DEP_PKGS += CSWlibaprutil-dev
+
 PACKAGES += CSWlibserf1-3
 CATALOGNAME_CSWlibserf1-3 = libserf1_3
 SPKG_DESC_CSWlibserf1-3 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
@@ -34,11 +39,6 @@
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
 
-BUILD_DEP_PKGS += CSWscons
-BUILD_DEP_PKGS += CSWlibapr-dev
-BUILD_DEP_PKGS += CSWlibaprutil-dev
-
-
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev
 SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1
@@ -59,6 +59,7 @@
 SCONS_FLAGS += LINKFLAGS="$(subst $$,\\$$\\,$(LD_OPTIONS))"
 
 CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1.3.0|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1-3-0
 
 include gar/category.mk
 
@@ -70,6 +71,7 @@
 	@$(MAKECOOKIE)
 
 install-serf:
+	mkdir -p $(DESTDIR)$(BUILD_PREFIX)
 	(cd $(WORKSRC); \
 		scons  \
 		$(SCONS_FLAGS) \

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 Feb 13 17:05:22 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 16:05:22 +0000
Subject: SF.net SVN: gar:[23018] csw/mgar/pkg/subversion/trunk/x
Message-ID: <3fQ2ct14Nlz1Mt@mail.opencsw.org>

Revision: 23018
          http://sourceforge.net/p/gar/code/23018
Author:   dmichelsen
Date:     2014-02-13 16:05:18 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
Test

Added Paths:
-----------
    csw/mgar/pkg/subversion/trunk/x

Added: csw/mgar/pkg/subversion/trunk/x
===================================================================
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 Feb 13 22:55:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 21:55:05 +0000
Subject: SF.net SVN: gar:[23019] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fQBNN0mhVzhx@mail.opencsw.org>

Revision: 23019
          http://sourceforge.net/p/gar/code/23019
Author:   dmichelsen
Date:     2014-02-13 21:55:05 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
libserf/trunk: The .so belongs to the main package

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-02-13 16:05:18 UTC (rev 23018)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-02-13 21:55:05 UTC (rev 23019)
@@ -39,9 +39,14 @@
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
 
+# Yes, this is correct
+CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so
+
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev
 SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1
+# The .so belongs to the main lib as there is no SONAME magic
+PKGFILES_DEVEL_SHAREDLIBLINK =
 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-3
 

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


From jake_goerzen at users.sourceforge.net  Thu Feb 13 23:02:34 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 13 Feb 2014 22:02:34 +0000
Subject: SF.net SVN: gar:[23020] csw/mgar/pkg/dovecot/trunk
Message-ID: <3fQBXz11HGzn8@mail.opencsw.org>

Revision: 23020
          http://sourceforge.net/p/gar/code/23020
Author:   jake_goerzen
Date:     2014-02-13 22:02:30 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
dovecot: update to 2.2.12

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-13 21:55:05 UTC (rev 23019)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-13 22:02:30 UTC (rev 23020)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.11
+VERSION = 2.2.12
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2014-02-13 21:55:05 UTC (rev 23019)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2014-02-13 22:02:30 UTC (rev 23020)
@@ -1 +1 @@
-d53d207727df99e4362a3787223c6fa3  dovecot-2.2.11.tar.gz
+25395269fa2e0525e2d144d71d0450eb  dovecot-2.2.12.tar.gz

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


From cgrzemba at users.sourceforge.net  Fri Feb 14 08:16:07 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 14 Feb 2014 07:16:07 +0000
Subject: SF.net SVN: gar:[23021] csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
Message-ID: <3fQQqh2V7Kz5T@mail.opencsw.org>

Revision: 23021
          http://sourceforge.net/p/gar/code/23021
Author:   cgrzemba
Date:     2014-02-14 07:16:00 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
lang-python/pygtk/trunk: setting _CATEGORY_MODULATORS was too much

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

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-13 22:02:30 UTC (rev 23020)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2014-02-14 07:16:00 UTC (rev 23021)
@@ -26,8 +26,8 @@
 # add this because we do not use the pyton category
 _MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test
 _MERGE_EXCLUDE_CATEGORY += .*/$(NAME)/test/.*
-PYCOMPILE = 1
-_CATEGORY_MODULATORS ?= PYTHON_VERSION
+
+# _CATEGORY_MODULATORS ?= PYTHON_VERSION
 EXTRA_MODULATORS += PYTHON_VERSION
 MODULATIONS_PYTHON_VERSION = 2.6 2.7
 # We need 64 bit just once as it is without python anyway
@@ -100,9 +100,11 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
 PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
-SPKG_CLASSES = none cswpycompile
-RUNTIME_DEP_PKGS += CSWcswclassutils
+# SPKG_CLASSES = none cswpycompile
+# RUNTIME_DEP_PKGS += CSWcswclassutils
 
+PYCOMPILE = 1
+
 # PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig
 # EXTRA_EXPORTS = PKG_CONFIG_PATH
 

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 Feb 14 10:25:43 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 14 Feb 2014 09:25:43 +0000
Subject: SF.net SVN: gar:[23022] csw/mgar/pkg/scons/trunk
Message-ID: <3fQTjN2WGCzJb@mail.opencsw.org>

Revision: 23022
          http://sourceforge.net/p/gar/code/23022
Author:   dmichelsen
Date:     2014-02-14 09:25:42 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
scons/trunk: Add soname patch for Solaris 9

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

Added Paths:
-----------
    csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch

Modified: csw/mgar/pkg/scons/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scons/trunk/Makefile	2014-02-14 07:16:00 UTC (rev 23021)
+++ csw/mgar/pkg/scons/trunk/Makefile	2014-02-14 09:25:42 UTC (rev 23022)
@@ -18,9 +18,15 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES += $(NAME)-$(VERSION).tar.gz
 
+# Linker patch for Solaris 9 only
+PATCHFILES-5.9 += 0001-Solaris-9-ld-1-needs-h-for-soname.patch
+PATCHFILES += $(PATCHFILES-$(GAROSREL))
+
 # We have only one package and that is archall, choose sparc
 # We need libserf on Solaris 9 for subversion and that requires a current scons
-PACKAGING_PLATFORMS = solaris9-sparc
+# Solaris 10 has different link options, so different packages for SOolaris 9 and 10
+PACKAGING_PLATFORMS += solaris9-sparc
+PACKAGING_PLATFORMS += solaris10-sparc
 
 VENDOR_URL = http://www.scons.org/
 

Added: csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch
===================================================================
--- csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch	                        (rev 0)
+++ csw/mgar/pkg/scons/trunk/files/0001-Solaris-9-ld-1-needs-h-for-soname.patch	2014-02-14 09:25:42 UTC (rev 23022)
@@ -0,0 +1,25 @@
+From feb87c6d43dfb361f771cf4d2ddc456cd8746fef Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 14 Feb 2014 10:14:28 +0100
+Subject: [PATCH] Solaris 9 ld(1) needs -h for soname
+
+---
+ engine/SCons/Tool/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engine/SCons/Tool/__init__.py b/engine/SCons/Tool/__init__.py
+index b12095f..344c934 100644
+--- a/engine/SCons/Tool/__init__.py
++++ b/engine/SCons/Tool/__init__.py
+@@ -306,7 +306,7 @@ symlinks for the platform we are on"""
+             (major, age, revision) = version.split(".")
+             # soname will have only the major version number in it
+             soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
+-            shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
++            shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-h%s' % soname ]
+             if Verbose:
+                 print " soname ",soname,", shlink_flags ",shlink_flags
+         elif platform == 'cygwin':
+-- 
+1.8.4.1
+

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


From dmichelsen at users.sourceforge.net  Fri Feb 14 11:25:41 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 14 Feb 2014 10:25:41 +0000
Subject: SF.net SVN: gar:[23023] csw/mgar/pkg/libserf/trunk/Makefile
Message-ID: <3fQW2S4jSHzXB@mail.opencsw.org>

Revision: 23023
          http://sourceforge.net/p/gar/code/23023
Author:   dmichelsen
Date:     2014-02-14 10:25:38 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
libserf/trunk: SONAME fixed, enable 64 bit

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-02-14 09:25:42 UTC (rev 23022)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-02-14 10:25:38 UTC (rev 23023)
@@ -12,18 +12,19 @@
     operation.
 endef
 
-MASTER_SITES = http://serf.googlecode.com/files/
-DISTFILES    = $(DISTNAME).tar.bz2
+GOOGLE_PROJECT = serf
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES += $(DISTNAME).tar.bz2
 PATCHFILES  += 0001-mark-solaris-as-posix-for-scons.patch
-LICENSE      = LICENSE
-VENDOR_URL   = http://code.google.com/p/serf/
 
+LICENSE = LICENSE
+VENDOR_URL = http://code.google.com/p/serf/
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = serf
 INSTALL_SCRIPTS = serf
 TEST_SCRIPTS =
 
-# openssl-1.0 only available for sol-10
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
@@ -31,25 +32,23 @@
 BUILD_DEP_PKGS += CSWlibapr-dev
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 
-PACKAGES += CSWlibserf1-3
-CATALOGNAME_CSWlibserf1-3 = libserf1_3
-SPKG_DESC_CSWlibserf1-3 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
+PACKAGES += CSWlibserf1-1
+SPKG_DESC_CSWlibserf1-1 += HTTP client library built on APR, multiplexes connections, libserf-1.so.1
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibz1
+# The name libserf1_3 was wrong due to false soname interpretation
+OBSOLETED_BY_CSWlibserf1-1 += CSWlibserf1-3
 
-# Yes, this is correct
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so
-
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev
-SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1
-# The .so belongs to the main lib as there is no SONAME magic
-PKGFILES_DEVEL_SHAREDLIBLINK =
+SPKG_DESC_CSWlibserf-dev = Development files for libserf-1.so.1
 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-3
+RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-1
 
+BUILD64 = 1
+
 EXTRA_LIB = $(prefix)/bdb48/lib
 
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
@@ -61,26 +60,22 @@
 
 # scons expands the $ISADIR variable, so we must do some more
 # escape magics to make sure it is passed as is to the linker
-SCONS_FLAGS += LINKFLAGS="$(subst $$,\\$$\\,$(LD_OPTIONS))"
+SCONS_FLAGS += LINKFLAGS="$(LDFLAGS) $(subst $$,\\$$\\,$(LD_OPTIONS))"
 
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1.3.0|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1-3-0
-
 include gar/category.mk
 
-
 build-serf:
 	(cd $(WORKSRC); \
-		scons \
-		$(SCONS_FLAGS) PREFIX="$(prefix)")
+		$(BUILD_ENV) scons \
+		$(SCONS_FLAGS) PREFIX="$(prefix)" LIBDIR="$(libdir)")
 	@$(MAKECOOKIE)
 
 install-serf:
-	mkdir -p $(DESTDIR)$(BUILD_PREFIX)
+	mkdir -p $(DESTDIR)$(prefix)
 	(cd $(WORKSRC); \
-		scons  \
+		$(INSTALL_ENV) scons  \
 		$(SCONS_FLAGS) \
-		-Q PREFIX=$(DESTDIR)$(BUILD_PREFIX) \
+		-Q PREFIX=$(DESTDIR)$(prefix) LIBDIR="$(DESTDIR)$(libdir)"\
 		install)
 	@$(MAKECOOKIE)
 

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


From cgrzemba at users.sourceforge.net  Fri Feb 14 14:32:54 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 14 Feb 2014 13:32:54 +0000
Subject: SF.net SVN: gar:[23024]
	csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
Message-ID: <3fQbBR0XyNzr2@mail.opencsw.org>

Revision: 23024
          http://sourceforge.net/p/gar/code/23024
Author:   cgrzemba
Date:     2014-02-14 13:32:52 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
lang-python/pycairo/trunk: add build and packaging for python 2.7

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

Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-14 10:25:38 UTC (rev 23023)
+++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2014-02-14 13:32:52 UTC (rev 23024)
@@ -19,6 +19,17 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc 
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
+
 PACKAGES = CSWpy-cairo
 SPKG_DESC_CSWpy-cairo = $(DESCRIPTION); main
 OBSOLETED_BY_CSWpy-cairo = CSWpycairo
@@ -33,6 +44,8 @@
 CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo
 EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS
 
+EXTRA_CONFIGURE_ENV = PYTHON=python$(PYTHON_VERSION)
+
 EXTRA_CFLAGS = -D_XPG6
 SKIPTEST = 1
 

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


From dmichelsen at users.sourceforge.net  Fri Feb 14 14:49:53 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 14 Feb 2014 13:49:53 +0000
Subject: SF.net SVN: gar:[23025] csw/mgar/pkg/subversion/trunk
Message-ID: <3fQbZK3jvczwt@mail.opencsw.org>

Revision: 23025
          http://sourceforge.net/p/gar/code/23025
Author:   dmichelsen
Date:     2014-02-14 13:49:53 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
subversion/trunk: General restructuring

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

Removed Paths:
-------------
    csw/mgar/pkg/subversion/trunk/x

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2014-02-14 13:32:52 UTC (rev 23024)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2014-02-14 13:49:53 UTC (rev 23025)
@@ -29,183 +29,220 @@
     that is a compelling replacement for CVS in the open source community.
 endef
 
-VENDOR_URL   = http://subversion.apache.org/
 MASTER_SITES = http://archive.apache.org/dist/subversion/
-#MASTER_SITES = http://people.apache.org/~hwright/svn/1.7.2/
-DISTFILES    = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += CSWsvn.checkinstall
+DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
+DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
 
+# Fix: Add java headers for nested classes
+# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
+PATCHFILES += javahl_headers_for_nested_classes.diff
+
+# Hardcode location of system wide configuration to /etc/opt/csw/subversion
+PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
+
+# Relocate locations of foreign language bindings
+PATCHFILES += 0002-Fix-location-of-bindings.patch
+
+VENDOR_URL = http://subversion.apache.org
 LICENSE = LICENSE
 
 # solaris9 does not have the newest glib2 any more so no gnome-keychain on Solaris9
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386  solaris10-sparc solaris10-i386
 
 BUILD_DEP_PKGS += CSWlibexpat-dev
-BUILD_DEP_PKGS += CSWlibserf-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
+BUILD_DEP_PKGS-5.10 += CSWlibserf-dev
+BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL))
 
-PACKAGES  = CSWsvn
-SPKG_DESC_CSWsvn           = Version control rethought
-CATALOGNAME_CSWsvn         = subversion
+PACKAGES += CSWsvn
+SPKG_DESC_CSWsvn = Version control rethought
+CATALOGNAME_CSWsvn = subversion
 CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn
-RUNTIME_DEP_PKGS_CSWsvn    = CSWbdb48
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibz1
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibserf1-3
-RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibdbus1-3
-RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibglib2-0-0
-CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3
-CHECKPKG_OVERRIDES_CSWsvn += file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWsvn += missing-dependency|CSWlibiconv2
-
+RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWsvn_5.9 += CSWglib2
+RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
 
-
 PACKAGES += CSWsvn-dev
-SPKG_DESC_CSWsvn-dev       = Subversion Development Support
-PKGFILES_CSWsvn-dev        = $(PKGFILES_DEVEL)
-PKGFILES_CSWsvn-dev       += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW
-#Needed for Solaris9 again:
-OBSOLETED_BY_CSWsvn-dev_5.9    = CSWsvn-devel
-OBSOLETED_BY_CSWsvn-dev += $(OBSOLETED_BY_CSWsvn-dev_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWSWsvn-devel_5.9 += CSWsvn-dev
-RUNTIME_DEP_PKGS_CSWSWsvn-devel += $(RUNTIME_DEP_PKGS_CSWSWsvn-devel_$(GAROSREL))
+SPKG_DESC_CSWsvn-dev = Subversion Development Support
+PKGFILES_CSWsvn-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW
+OBSOLETED_BY_CSWsvn-dev += CSWsvn-devel
 
-
 PACKAGES += CSWap2svn
-SPKG_DESC_CSWap2svn         = Subversion Modules for Apache 2.2
-CATALOGNAME_CSWap2svn       = ap2_subversion
-PKGFILES_CSWap2svn          = $(prefix)/apache2.*
-PKGFILES_CSWap2svn         += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
+SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2
+CATALOGNAME_CSWap2svn = ap2_subversion
+CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
+PKGFILES_CSWap2svn += $(prefix)/apache2/.*
+PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWap2svn  = CSWsvn
 RUNTIME_DEP_PKGS_CSWap2svn += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWsvn
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibapr1-0
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWap2svn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWap2svn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWap2svn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWap2svn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2
 
+PACKAGES += CSWjavasvn
+SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
+PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.*
+PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibserf1-1
 
-PACKAGES += CSWjavasvn
-SPKG_DESC_CSWjavasvn           = Subversion Java Language Binding
-CATALOGNAME_CSWjavasvn         = javasvn
-PKGFILES_CSWjavasvn            = $(SVNLIB)/.*java.*
-PKGFILES_CSWjavasvn           += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
-RUNTIME_DEP_PKGS_CSWjavasvn   += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWjavasvn   += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWjavasvn   += CSWsvn
+# This would go away when -norunpath would make it to the linker, but at this point this is difficult.
+# Override for now as it is not harmful.
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWlibserf1-3
 
 PACKAGES += CSWpmsvn
-SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
-CATALOGNAME_CSWpmsvn       = pm_subversion
-PKGFILES_CSWpmsvn          = $(libdir)/perl.*
-PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
-PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
-PKGFILES_CSWpmsvn         += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
+SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding
+CATALOGNAME_CSWpmsvn = pm_subversion
+CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn
+PKGFILES_CSWpmsvn += $(libdir)/perl.*
+PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.*
+PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.*
+PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0
 
-
 PACKAGES += CSWrbsvn
-SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
-CATALOGNAME_CSWrbsvn       = rbsvn
-PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
-PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
-PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
+SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
+PKGFILES_CSWrbsvn += $(libdir)/ruby.*
+PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.*
+PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibserf1-3
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1
 
-
 PACKAGES += CSWpythonsvn
-SPKG_DESC_CSWpythonsvn         = Subversion Python Language Binding
-CATALOGNAME_CSWpythonsvn       = pythonsvn
-PKGFILES_CSWpythonsvn          = $(libdir)/python.*
-PKGFILES_CSWpythonsvn         += $(SVNLIB)/python.*
-PKGFILES_CSWpythonsvn         += $(SVNLIB)/.*swig_py.*
-PKGFILES_CSWpythonsvn         += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
+SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding
+PKGFILES_CSWpythonsvn += $(libdir)/python.*
+PKGFILES_CSWpythonsvn += $(SVNLIB)/python.*
+PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.*
+PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibserf1-1
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWbdb48
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibsasl2-2
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWlibserf1-3
 
+# These are all due to linker problems with -z ignore
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0
+HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWbdb48
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2
 
-DISTFILES += CSWsvn.checkinstall
-DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
-DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
-
-
-# Fix: Add java headers for nested classes
-# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
-PATCHFILES += javahl_headers_for_nested_classes.diff
-
-# Hardcode location of system wide configuration to /etc/opt/csw/subversion
-PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
-
-# Relocate locations of foreign language bindings
-PATCHFILES += 0002-Fix-location-of-bindings.patch
-
 # should be in lib ... put something below to at least make it compile.
 # on the svn mailing list people say we should not build the package
 # with svn installed, and here it seems basic that we build with svn
 # installed.
 # SVNLIB     = $(prefix)/lib
 SVNLIB     = $(prefix)/lib/svn
-JAVA_HOME  = /usr/jdk/latest
 
+JAVA_HOME-5.9 = /usr/jdk1.6.0_20/
+JAVA_HOME-5.10 = /usr/jdk/latest
+JAVA_HOME = $(JAVA_HOME-$(GAROSREL))
+
 #EXTRA_INC += $(prefix)/apache2/include
 
 #EXTRA_LIB += /opt/csw/apache2/lib
@@ -218,36 +255,32 @@
 RUNPATH_ISALIST  = $(libdir)
 #RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) 
 
-#EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
-#PROTOTYPE_MODIFIERS += cswpycompile
-#PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py
-#PROTOTYPE_CLASS_cswpycompile = cswpycompile
+# This is an example for a hook
+REINPLACE_USRLOCAL += subversion/libsvn_repos/repos.c
+
 PYCOMPILE = 1
 
-# All of the perl modules go to $(libdir)/perl/site_perl. We are not interested
-# in the version specific perl directory which only contains a perllocal.pod.
-# Can this be re-done as a version agnostic regex? Couldn't get this to work :/
-# EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl)
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.*
+EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal\.pod
 
 STRIP_LIBTOOL = 1
 
 NODIRPATHS      = --libdir --libexecdir
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
 CONFIGURE_ARGS += --disable-mod-activation
-CONFIGURE_ARGS_5.9 += --with-jdk=/usr/jdk1.6.0_20
+CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
 CONFIGURE_ARGS += --enable-javahl
 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_5.10 += --with-jdk=$(JAVA_HOME)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
 CONFIGURE_ARGS += --with-serf=$(prefix)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
 
-#No Keyring on Solaris9
+# No Keyring on Solaris9
 CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
+
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
 
 # Once you have verified that a new upstream release passes the tests, you can use
@@ -263,10 +296,14 @@
 #     tail -f $(WORKSRC)/tests.log | grep merge_tests.py
 TEST_TARGET  = check
 
+# At the moment the is one test failing because 1.8.5 does some funky statements sqlite 3.8.x doesn't understand but 3.7.x did:
+#   http://subversion.tigris.org/issues/show_bug.cgi?id=4453
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 # pygthon bindings do not link since svn-1.6.5 ...
-BINDING_LANGS   = java perl python ruby
+BINDING_LANGS = java perl python ruby
 BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS))
 
 PI_DEPENDS += copy-templates

Deleted: csw/mgar/pkg/subversion/trunk/x
===================================================================
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 Feb 14 16:14:55 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 14 Feb 2014 15:14:55 +0000
Subject: SF.net SVN: gar:[23026] csw/mgar/pkg/mpg321/trunk/Makefile
Message-ID: <3fQdS74Tlqz8P@mail.opencsw.org>

Revision: 23026
          http://sourceforge.net/p/gar/code/23026
Author:   dmichelsen
Date:     2014-02-14 15:14:53 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
mpg321/trunk: Add alternative fixing #4342

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

Modified: csw/mgar/pkg/mpg321/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpg321/trunk/Makefile	2014-02-14 13:49:53 UTC (rev 23025)
+++ csw/mgar/pkg/mpg321/trunk/Makefile	2014-02-14 15:14:53 UTC (rev 23026)
@@ -29,4 +29,9 @@
 CONFIGURE_ARGS += --enable-ipv6=yes
 CONFIGURE_ARGS += --enable-alsa=no
 
+# The other one is mpg123
+# This fixes #4342
+ALTERNATIVES_CSWmpg321 = mpg321
+ALTERNATIVE_mpg321 = $(bindir)/mpg123 mpg123 $(bindir)/mpg321 50
+
 include gar/category.mk

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


From lblume at users.sourceforge.net  Sun Feb 16 00:41:16 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Sat, 15 Feb 2014 23:41:16 +0000
Subject: SF.net SVN: gar:[23027] csw/mgar/pkg/samba/branches/samba3
Message-ID: <3fRSf44zDBzX6@mail.opencsw.org>

Revision: 23027
          http://sourceforge.net/p/gar/code/23027
Author:   lblume
Date:     2014-02-15 23:41:16 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
samba/branches/samba3: Bump to 3.6.22; remove use of patch that was included

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile
    csw/mgar/pkg/samba/branches/samba3/checksums

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-14 15:14:53 UTC (rev 23026)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-15 23:41:16 UTC (rev 23027)
@@ -2,7 +2,7 @@
 # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time
 
 NAME    = samba
-VERSION = 3.6.20
+VERSION = 3.6.22
 GARTYPE = v2
 
 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -29,7 +29,6 @@
 PATCHFILES += 0001-nss_winbind.patch
 PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch
 PATCHFILES += 0003-rename-nss-modules.patch
-PATCHFILES += 0004-illegal-multibyte-error.patch
 
 BUILD_DEP_PKGS += CSWlibtalloc-dev
 BUILD_DEP_PKGS += CSWopenldap-dev
@@ -336,8 +335,8 @@
 CONFIGURE_ARGS += --with-aio-support
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-winbind
+CONFIGURE_ARGS += --enable-nss-wrapper 
 CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl
-
 # ZFS is only on S10+
 CONFIGURE_ARGS_5.9 += --with-shared-modules=vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
 CONFIGURE_ARGS_5.10 += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
@@ -360,7 +359,8 @@
 CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR)
 
 # Can't use fdatasync atm do to linker problems
-# Symbols are not in the right libc
+# Symbols are not in the right libc:
+#(symbol belongs to unavailable version /lib/libc.so (SUNW_1.22.7))
 CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no
 CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no
 CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no

Modified: csw/mgar/pkg/samba/branches/samba3/checksums
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/checksums	2014-02-14 15:14:53 UTC (rev 23026)
+++ csw/mgar/pkg/samba/branches/samba3/checksums	2014-02-15 23:41:16 UTC (rev 23027)
@@ -1 +1 @@
-3f1b60c681845ce6828a1abe5aacf671  samba-3.6.20.tar.gz
+59add4bb178ebc188d857bc13a508c0b  samba-3.6.22.tar.gz

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


From rmottola at opencsw.org  Sun Feb 16 12:10:43 2014
From: rmottola at opencsw.org (Riccardo Mottola)
Date: Sun, 16 Feb 2014 12:10:43 +0100
Subject: libffi, missing symbolic link
Message-ID: <53009CB3.5020106@opencsw.org>

Hi,


I had some success getting GNUstep work on solaris 8 & 10! however, when 
I updated right now on solaris 10, I cannot configure it anymore (use 
the same options though)

configure:13270: checking whether objc really works
configure:13300: gcc -o conftest -g -O2 
-I/opt/GNUstep/Local/Library/Headers 
-I/opt/GNUstep/Local/Library/Headers -I/o
pt/GNUstep/System/Library/Headers  -fgnu-runtime -x objective-c 
-L/opt/GNUstep/Local/Library/Libraries -L/opt/GNUstep/
Local/Library/Libraries -L/opt/GNUstep/System/Library/Libraries 
conftest.c -lrt -ldl  -lpthread -L/opt/csw/lib -R/opt/c
sw/lib -shared-libgcc -pthread -fexceptions -fgnu-runtime 
-L/home/multix/GNUstep/Library/Libraries -L/opt/GNUstep/Local
/Library/Libraries -L/opt/GNUstep/System/Library/Libraries 
-L/opt/GNUstep/Local/Library/Libraries -L/opt/GNUstep/Local/
Library/Libraries -L/opt/GNUstep/System/Library/Libraries -L/opt/csw/lib 
-lobjc -lxslt -L/usr/lib -R/usr/lib -lxml2 -lz
  -lpthread -lm -lsocket -lnsl -liconv -lffi -lnsl -lrt -ldl -lpthread 
-lz -licui18n -licuuc -licudata -lsocket -lnsl -l
m     >&5
In file included from ./config/config.objc.m:2:0,
                  from conftest.c:100:
./config/objc-common.g:30:1: warning: cannot find interface declaration 
for 'NXConstantString' [enabled by default]
  - (const char*) cString
  ^
ld: fatal: library -lffi: not found
ld: fatal: file processing errors. No output written to conftest

I then check for libffi and see:
  bash-4.2$ ls -l /opt/csw/lib/libffi*
lrwxrwxrwx   1 root     root          15 Dec 29 16:39 
/opt/csw/lib/libffi.so.4 -> libffi.so.4.0.1
-rwxr-xr-x   1 root     bin        50156 Sep 27 17:33 
/opt/csw/lib/libffi.so.4.0.1
lrwxrwxrwx   1 root     root          16 Apr  7  2013 
/opt/csw/lib/libffi.so.5 -> libffi.so.5.0.10
-rwxr-xr-x   1 root     bin        25000 Jun 25  2011 
/opt/csw/lib/libffi.so.5.0.10

I see that there is no main .so library linked to, I'd expect, so.5

I suppose this is an upgrade/package problem? what's your take?
(it would be even better to upgrade all packages to one libffi version, 
in my experience, but that's a different thing)

Riccardo

From pfelecan at opencsw.org  Sun Feb 16 12:45:15 2014
From: pfelecan at opencsw.org (Peter FELECAN)
Date: Sun, 16 Feb 2014 12:45:15 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <53009CB3.5020106@opencsw.org> (Riccardo Mottola's message of
	"Sun, 16 Feb 2014 12:10:43 +0100")
References: <53009CB3.5020106@opencsw.org>
Message-ID: <x6mwhrgu2c.fsf@opencsw.org>

install CSWlibffi-dev which contains the symbolic link,
-- 
Peter

From dam at opencsw.org  Sun Feb 16 13:14:19 2014
From: dam at opencsw.org (Dagobert Michelsen)
Date: Sun, 16 Feb 2014 13:14:19 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <53009CB3.5020106@opencsw.org>
References: <53009CB3.5020106@opencsw.org>
Message-ID: <83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>

Hi Riccardo,

Am 16.02.2014 um 12:10 schrieb Riccardo Mottola <rmottola at opencsw.org>:
> I had some success getting GNUstep work on solaris 8 & 10! however, when I updated right now on solaris 10, I cannot configure it anymore (use the same options though)

Excellent! As Peter suggested the previous ffi-package has been split into the
library and the dev-package which is not installed by default. Maybe you can
make a package from GNUstep?


Best regards

  ? Dago


-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2418 bytes
Desc: not available
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20140216/a6905f94/attachment.p7s>

From dmichelsen at users.sourceforge.net  Sun Feb 16 13:33:08 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 16 Feb 2014 12:33:08 +0000
Subject: SF.net SVN: gar:[23028] csw/mgar/pkg/di/trunk
Message-ID: <3fRnmb37MMz1Jn@mail.opencsw.org>

Revision: 23028
          http://sourceforge.net/p/gar/code/23028
Author:   dmichelsen
Date:     2014-02-16 12:33:05 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
di/trunk: Update to 4.35

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

Modified: csw/mgar/pkg/di/trunk/Makefile
===================================================================
--- csw/mgar/pkg/di/trunk/Makefile	2014-02-15 23:41:16 UTC (rev 23027)
+++ csw/mgar/pkg/di/trunk/Makefile	2014-02-16 12:33:05 UTC (rev 23028)
@@ -1,5 +1,5 @@
 NAME = di
-VERSION = 4.34
+VERSION = 4.35
 GARTYPE = v2
 
 DESCRIPTION = Disk information utility

Modified: csw/mgar/pkg/di/trunk/checksums
===================================================================
--- csw/mgar/pkg/di/trunk/checksums	2014-02-15 23:41:16 UTC (rev 23027)
+++ csw/mgar/pkg/di/trunk/checksums	2014-02-16 12:33:05 UTC (rev 23028)
@@ -1 +1 @@
-d116a6bb04ac39213f07f1e5318b5ea9  di-4.34.tar.gz
+3fb31991a7033e0c921d9f155511708f  di-4.35.tar.gz

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


From dmichelsen at users.sourceforge.net  Sun Feb 16 14:30:53 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 16 Feb 2014 13:30:53 +0000
Subject: SF.net SVN: gar:[23029] csw/mgar/pkg/mpg321/trunk/Makefile
Message-ID: <3fRq385YCqz1XJ@mail.opencsw.org>

Revision: 23029
          http://sourceforge.net/p/gar/code/23029
Author:   dmichelsen
Date:     2014-02-16 13:30:50 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
mpg321/trunk: Remove alternatives, that is too complex with mpg123 and isaexec

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

Modified: csw/mgar/pkg/mpg321/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpg321/trunk/Makefile	2014-02-16 12:33:05 UTC (rev 23028)
+++ csw/mgar/pkg/mpg321/trunk/Makefile	2014-02-16 13:30:50 UTC (rev 23029)
@@ -29,9 +29,4 @@
 CONFIGURE_ARGS += --enable-ipv6=yes
 CONFIGURE_ARGS += --enable-alsa=no
 
-# The other one is mpg123
-# This fixes #4342
-ALTERNATIVES_CSWmpg321 = mpg321
-ALTERNATIVE_mpg321 = $(bindir)/mpg123 mpg123 $(bindir)/mpg321 50
-
 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  Sun Feb 16 14:37:02 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 16 Feb 2014 13:37:02 +0000
Subject: SF.net SVN: gar:[23030] csw/mgar/pkg/mpg123/trunk
Message-ID: <3fRqBH3G9Lz3Z@mail.opencsw.org>

Revision: 23030
          http://sourceforge.net/p/gar/code/23030
Author:   dmichelsen
Date:     2014-02-16 13:37:01 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
mpg123/trunk: Update to 1.18.0, remove alternatives, that is too complex with mpg123 and isaexec

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

Modified: csw/mgar/pkg/mpg123/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpg123/trunk/Makefile	2014-02-16 13:30:50 UTC (rev 23029)
+++ csw/mgar/pkg/mpg123/trunk/Makefile	2014-02-16 13:37:01 UTC (rev 23030)
@@ -1,5 +1,5 @@
 NAME = mpg123
-VERSION = 1.16.0
+VERSION = 1.18.0
 GARTYPE = v2
 
 DESCRIPTION = A command-line MP3 player
@@ -36,7 +36,8 @@
 RUNTIME_DEP_PKGS_CSWlibmpg123-0 += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWlibmpg123-0 += CSWlibesd0
 
-BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
+ISAEXEC = 1
 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -51,16 +52,4 @@
 # Skip for libmpg123, though.
 MERGE_EXCLUDE_LIBTOOL = $(libdir)/[^/]*\.la
 
-# The other one is mpg321
-# This fixes #4342
-ALTERNATIVES_CSWmpg123 = mpg123
-ALTERNATIVE_mpg123 = $(bindir)/mpg123 mpg123 $(bindir)/mpg123 100
-
-# Checkpkg can't check this
-CHECKPKG_OVERRIDES_CSWmpg123 += surplus-dependency|CSWalternatives
-
-# No package split as nobody seems to use the library
-CHECKPKG_OVERRIDES_CSWmpg123 += shared-lib-package-contains-so-symlink
-CHECKPKG_OVERRIDES_CSWmpg123 += shared-lib-pkgname-mismatch
-
 include gar/category.mk

Modified: csw/mgar/pkg/mpg123/trunk/checksums
===================================================================
--- csw/mgar/pkg/mpg123/trunk/checksums	2014-02-16 13:30:50 UTC (rev 23029)
+++ csw/mgar/pkg/mpg123/trunk/checksums	2014-02-16 13:37:01 UTC (rev 23030)
@@ -1 +1 @@
-169cfc32b32b5cae99212fe8e4347215  mpg123-1.16.0.tar.bz2
+0e27ecbc5e48827ec5dd4d4f5fd8e64b  mpg123-1.18.0.tar.bz2

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


From rmottola at opencsw.org  Sun Feb 16 15:46:49 2014
From: rmottola at opencsw.org (Riccardo Mottola)
Date: Sun, 16 Feb 2014 15:46:49 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>
References: <53009CB3.5020106@opencsw.org>
	<83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>
Message-ID: <5300CF59.1060708@opencsw.org>

On 02/16/14 13:14, Dagobert Michelsen wrote:
> Hi Riccardo,
>
> Am 16.02.2014 um 12:10 schrieb Riccardo Mottola <rmottola at opencsw.org>:
>> I had some success getting GNUstep work on solaris 8 & 10! however, when I updated right now on solaris 10, I cannot configure it anymore (use the same options though)
I will try out as soon as the weekend ends and let you know! What 
happened then is that the upgrade did not install the -dev package.
I notice that both v4 and v5 are required, it would be perhaps
> Excellent! As Peter suggested the previous ffi-package has been split into the
> library and the dev-package which is not installed by default. Maybe you can
> make a package from GNUstep?
Is there interest in GS packages? I am ashamed to admit that after one 
year haven't started contributing with packages and my project to have 
at least a subset of solaris 8 packages remained at the starting block.
My principal interest is in GNUstep itself, I'd be very happy if other 
people were interested in it, everything that raises its awareness is 
welcome. I have read sometimes people here interested in alternative 
desktop environments and portable toolkits. i offered GNUstep without reply.

Packaging GNUstep is not that easy when done on certain operating 
systems. I would package separately, adding like 10-20 packages, divided 
in core frameworks, developer tools, additional frameworks and then the 
different applications, ranging from stuff like terminal and file 
manager up to FTP tools and other stuff.
I guess that certain apps don't have a use on Solaris, like a battery 
monitor for laptops or audio mixer control, since there are no laptops 
ad few UltraSparc workstations.

If somebody else is interested in GNUstep I'll be happy to do and/or 
help with the packaging, everything which gives GS more exposure is good!

Riccardo

From dam at opencsw.org  Sun Feb 16 20:55:05 2014
From: dam at opencsw.org (Dagobert Michelsen)
Date: Sun, 16 Feb 2014 20:55:05 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <5300CF59.1060708@opencsw.org>
References: <53009CB3.5020106@opencsw.org>
	<83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>
	<5300CF59.1060708@opencsw.org>
Message-ID: <0A3C3C2D-D2BC-4121-B320-CE9966B00CA8@opencsw.org>

Hi Riccardo,

Am 16.02.2014 um 15:46 schrieb Riccardo Mottola <rmottola at opencsw.org>:
> On 02/16/14 13:14, Dagobert Michelsen wrote:
>> Am 16.02.2014 um 12:10 schrieb Riccardo Mottola <rmottola at opencsw.org>:
>>> I had some success getting GNUstep work on solaris 8 & 10! however, when I updated right now on solaris 10, I cannot configure it anymore (use the same options though)
> I will try out as soon as the weekend ends and let you know! What happened then is that the upgrade did not install the -dev package.
> I notice that both v4 and v5 are required, it would be perhaps

What for? If rebuilds are needed just drop a note and we can rebuild them.

>> Excellent! As Peter suggested the previous ffi-package has been split into the
>> library and the dev-package which is not installed by default. Maybe you can
>> make a package from GNUstep?
> 
> Is there interest in GS packages? I am ashamed to admit that after one year haven't started contributing with packages and my project to have at least a subset of solaris 8 packages remained at the starting block.
> My principal interest is in GNUstep itself, I'd be very happy if other people were interested in it, everything that raises its awareness is welcome. I have read sometimes people here interested in alternative desktop environments and portable toolkits. i offered GNUstep without reply.
> 
> Packaging GNUstep is not that easy when done on certain operating systems. I would package separately, adding like 10-20 packages, divided in core frameworks, developer tools, additional frameworks and then the different applications, ranging from stuff like terminal and file manager up to FTP tools and other stuff.
> I guess that certain apps don't have a use on Solaris, like a battery monitor for laptops or audio mixer control, since there are no laptops ad few UltraSparc workstations.
> 
> If somebody else is interested in GNUstep I'll be happy to do and/or help with the packaging, everything which gives GS more exposure is good!

Probably, I know Carsten runs Solaris on his desktop, I don?t know if he is interested
in GNUstep, though.


Best regards

  ? Dago

-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2418 bytes
Desc: not available
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20140216/923cf3fa/attachment.p7s>

From dmichelsen at users.sourceforge.net  Sun Feb 16 21:43:07 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 16 Feb 2014 20:43:07 +0000
Subject: SF.net SVN: gar:[23031] csw/mgar/pkg/mc/trunk/Makefile
Message-ID: <3fS0dx0k7Yzg3@mail.opencsw.org>

Revision: 23031
          http://sourceforge.net/p/gar/code/23031
Author:   dmichelsen
Date:     2014-02-16 20:43:05 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
mc/trunk: Add build deps

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

Modified: csw/mgar/pkg/mc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mc/trunk/Makefile	2014-02-16 13:37:01 UTC (rev 23030)
+++ csw/mgar/pkg/mc/trunk/Makefile	2014-02-16 20:43:05 UTC (rev 23031)
@@ -16,6 +16,10 @@
 
 VENDOR_URL = http://www.midnight-commander.org
 
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibslang-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
+
 RUNTIME_DEP_PKGS_CSWmc += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWmc += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWmc += CSWlibintl8

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


From chninkel at users.sourceforge.net  Mon Feb 17 12:19:33 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 17 Feb 2014 11:19:33 +0000
Subject: SF.net SVN: gar:[23032] csw/mgar/pkg/openssh/trunk/files
Message-ID: <3fSN5L2PYWzcL@mail.opencsw.org>

Revision: 23032
          http://sourceforge.net/p/gar/code/23032
Author:   chninkel
Date:     2014-02-17 11:19:27 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
openssh/trunk: fixed host keys generation

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW
    csw/mgar/pkg/openssh/trunk/files/cswopenssh
    csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-17 11:19:27 UTC (rev 23032)
@@ -1,3 +1,10 @@
+openssh (6.5p1,REV=2014.02.17) unstable
+
+  * Fixed the host key generation script so that keys for all
+  types are always generared (closes: #5151)
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 17 Feb 2014 12:10:39 +0100
+
 openssh (6.5p1,REV=2014.01.31) unstable
 
   * New upstream release.

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-17 11:19:27 UTC (rev 23032)
@@ -17,12 +17,7 @@
 case $1 in 
 'start')
         if [ -x /opt/csw/bin/ssh-keygen ]; then
-		for ALGO in rsa dsa ecdsa; do
-			if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
-				echo "Creating new ${ALGO} public/private host key pair"
-				ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N ''
-			fi
-		done
+		ssh-keygen -A 
         fi
 
         [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-17 11:19:27 UTC (rev 23032)
@@ -5,12 +5,7 @@
 KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/cswsshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
-	for ALGO in rsa dsa ecdsa; do
-		if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
-			echo "Creating new ${ALGO} public/private host key pair"
-			ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N ''
-		fi
-	done
+	ssh-keygen -A
 fi
 
 /opt/csw/sbin/sshd

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


From chninkel at users.sourceforge.net  Mon Feb 17 12:48:20 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 17 Feb 2014 11:48:20 +0000
Subject: SF.net SVN: gar:[23033] csw/mgar/pkg/openssh/trunk
Message-ID: <3fSNkj62Cdzhy@mail.opencsw.org>

Revision: 23033
          http://sourceforge.net/p/gar/code/23033
Author:   chninkel
Date:     2014-02-17 11:48:15 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
openssh/trunk: uses cswreleasenotes mechanism instead of custom changelog.CSW file

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes
    csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-02-17 11:19:27 UTC (rev 23032)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-02-17 11:48:15 UTC (rev 23033)
@@ -123,7 +123,8 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).tar.gz
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += changelog.CSW
+DISTFILES += CSWopenssh.cswreleasenotes
+DISTFILES += CSWopenssh_client.cswreleasenotes
 DISTFILES += cswusergroup
 
 DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
@@ -211,7 +212,6 @@
 		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
 
 merge-config-files:

Copied: csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes (from rev 23032, csw/mgar/pkg/openssh/trunk/files/changelog.CSW)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes	2014-02-17 11:48:15 UTC (rev 23033)
@@ -0,0 +1,233 @@
+openssh (6.5p1,REV=2014.02.17) unstable
+
+  * Fixed the host key generation script so that keys for all
+  types are always generared (closes: #5151)
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 17 Feb 2014 12:10:39 +0100
+
+openssh (6.5p1,REV=2014.01.31) unstable
+
+  * New upstream release.
+  * Updated the GSSAPI key exchange patch
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 31 Jan 2014 09:23:22 +0100
+
+openssh (6.4p1,REV=2013.11.09) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 09 Nov 2013 00:49:27 +0100
+
+openssh (6.3p1,REV=2013.09.20) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Sep 2013 21:20:54 +0200
+
+openssh (6.2p2,REV=2013.05.02) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 02 May 2013 19:48:33 +0200
+
+openssh (6.1p1,REV=2013.01.08) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 08 Jan 2013 22:35:07 +0100
+
+openssh (6.0p1,REV=2012.09.30) unstable
+
+  * Explicitly disabled lazyloading as it causes
+    problem with chrooting (Closes: #5006).
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Sep 2012 23:22:42 +0200
+
+openssh (6.0p1,REV=2012.08.24) unstable
+
+  * Enabled direct binding during build.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 14:49:44 +0200
+
+openssh (6.0p1,REV=2012.08.17) unstable
+
+  * Added a mapfile to force linking against interface SUNW_1.22
+    of libc.so.1 so we don't work only on last solaris release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 17 Aug 2012 15:51:32 +0200
+
+openssh (6.0p1,REV=2012.08.12) unstable
+
+  * Removed superfluous dependencies:
+  	openssh: libk5crypto3
+	openssh-client: libkrb5_3 libk5crypto3 libcom_err3
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 13 Aug 2012 20:43:54 +0200
+
+openssh (6.0p1,REV=2012.05.17) unstable
+
+  * Rebuilt againt libssl 1.0
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 17 May 2012 15:33:02 +0200
+
+openssh (6.0p1,REV=2012.05.04) unstable
+
+  * New upstream release
+  * Updated dependancies name: CSWosslrt -> CSWlibssl0-9-8
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 04 May 2012 19:19:24 +0200
+
+openssh (5.9p1,REV=2011.09.19) unstable
+
+  * Fixed an error in server key generation (Closes: #4876)
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 16 Dec 2011 20:46:24 +0100
+
+openssh (5.9p1,REV=2011.09.19) unstable
+
+  * New upstream release.
+  * Updated dependancies name:
+     CSWzlib -> CSWlibz1
+     CSWtcpwrap -> CSWlibwrap1
+     CSWkrb5lib -> CSWlibkrb5-3
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 19 Sep 2011 22:31:03 +0200
+
+openssh (5.8p1,REV=2011.07.25) unstable
+
+  * Added the generation of eliptic curve algoritm host keys in init script.
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 25 Jul 2011 19:55:16 +0200
+
+openssh (5.8p1,REV=2011.02.12) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 12 Feb 2011 17:53:23 +0100
+
+openssh (5.6p1,REV=2010.12.19) unstable
+
+  * 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/empty.
+  * Added 0004-no-lastlog-file.patch patch to workaround a bug with
+  Lastlog information printed at login time (see bug #4494).
+  * Added 0005-rename-pidfile.patch to rename pidfile from sshd.pid to
+  cswsshd.pid. This avoids a conflict with sun native ssh (Closes: #4398).
+  * [Build system] Switched to dynamic prototype.
+  * [Build system] Switched to cswclassutils for user/group creation.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 19 Dec 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
+  derelativise_path function (Closes: #4367).
+  * Added dont_derelativise_authorizedkeysfile_option.patch so the
+  AuthorizedKeysFile option can be relative as explained in the man page.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2010 19:15:55 +0100
+
+openssh (5.4p1,REV=2010.03.13) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 12 Mar 2010 23:53:43 +0100
+
+openssh (5.3p1,REV=2010.02.28) unstable
+
+  * Added ssh-copy-id contrib script (Closes: #4306)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 28 Feb 2010 17:03:52 +0100
+
+openssh (5.3p1,REV=2009.12.14) unstable
+
+  * Package rebuild to solve an incorrect upload in the repository tree.
+  * Changed package version numbering scheme.
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 14 Dec 2009 21:19:33 +0100
+
+openssh (5.3,REV=2009.10.10_rev=p1) unstable
+
+  * New upstream release.
+  * PrintMotd is now no in the default config file to avoid a double login
+  banner (Closes: #3829)
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 10 Oct 2009 21:47:46 +0200
+
+openssh (5.2,REV=2009.07.25_rev=p1) unstable
+
+  * Fixed missing /opt/csw/etc/ssh in prototype (Closes: #3765)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 25 Jul 2009 12:57:35 +0200
+
+openssh (5.2,REV=2009.06.30_rev=p1) unstable
+
+  * Switched to cswclassutils for SMF support.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Jun 2009 10:34:39 +0100
+
+openssh (5.2,REV=2008.03.28_rev=p1) unstable
+
+  * New upstream version.
+  * Split the client in a distinct package.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 22 Mar 2009 10:34:39 +0100
+
+openssh (5.1,REV=2008.02.15_rev=p1) unstable
+
+  * Package rebuild to solve incorrect package push in repository tree.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
+
+openssh (5.1,REV=2008.12.06_rev=p1) unstable
+
+  * Added test for configuration file existence in sysV init script 
+  (Closes: #2878) 
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
+
+openssh (5.1,REV=2008.10.04_rev=p1) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 04 Oct 2008 21:25:09 +0200
+
+openssh (5.0,REV=2008.06.02_rev=p1) unstable
+
+  * New upstream version.
+  * Added solaris fix for X11 forwarding bug on ipv4 only machine.
+
+ -- Yann Rouillard <yann at blastwave.org>  Wed, 30 Apr 2008 14:23:40 +0200
+
+openssh (4.9,REV=2008.04.01_rev=p1) unstable
+
+  * New upstream version.
+  * Added documentation files in the package.
+
+ -- Yann Rouillard <yann at blastwave.org>  Tue, 01 Apr 2008 20:37:51 +0200
+
+openssh (4.7,REV=2008.04.04_rev=p1) unstable
+
+  * Added security fixes for CVE-2008-1483 and CVE-2008-1657
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 04 Apr 2008 23:44:19 +0200
+
+openssh (4.7,REV=2007.11.02_rev=p1) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 02 Nov 2007 22:02:23 +0100
+
+openssh (4.6,REV=2007.08.24_rev=p1) unstable
+
+  * Added GSSAPI key exchange patch.
+  * Added spurious error log patch (see openssh bug 1306).
+  * Enabled Solaris contract support for Solaris 10 to avoid
+  ssh disconnections when ssh daemon is restarted.
+  * Re-enabled tcpwrapper support.
+  * replaced \"? ? ?\" with \"0755 root bin\" in the prototype
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 17 Aug 2007 21:15:51 +0200

Copied: csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes (from rev 23032, csw/mgar/pkg/openssh/trunk/files/changelog.CSW)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes	2014-02-17 11:48:15 UTC (rev 23033)
@@ -0,0 +1,233 @@
+openssh (6.5p1,REV=2014.02.17) unstable
+
+  * Fixed the host key generation script so that keys for all
+  types are always generared (closes: #5151)
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 17 Feb 2014 12:10:39 +0100
+
+openssh (6.5p1,REV=2014.01.31) unstable
+
+  * New upstream release.
+  * Updated the GSSAPI key exchange patch
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 31 Jan 2014 09:23:22 +0100
+
+openssh (6.4p1,REV=2013.11.09) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 09 Nov 2013 00:49:27 +0100
+
+openssh (6.3p1,REV=2013.09.20) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Sep 2013 21:20:54 +0200
+
+openssh (6.2p2,REV=2013.05.02) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 02 May 2013 19:48:33 +0200
+
+openssh (6.1p1,REV=2013.01.08) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 08 Jan 2013 22:35:07 +0100
+
+openssh (6.0p1,REV=2012.09.30) unstable
+
+  * Explicitly disabled lazyloading as it causes
+    problem with chrooting (Closes: #5006).
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Sep 2012 23:22:42 +0200
+
+openssh (6.0p1,REV=2012.08.24) unstable
+
+  * Enabled direct binding during build.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 14:49:44 +0200
+
+openssh (6.0p1,REV=2012.08.17) unstable
+
+  * Added a mapfile to force linking against interface SUNW_1.22
+    of libc.so.1 so we don't work only on last solaris release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 17 Aug 2012 15:51:32 +0200
+
+openssh (6.0p1,REV=2012.08.12) unstable
+
+  * Removed superfluous dependencies:
+  	openssh: libk5crypto3
+	openssh-client: libkrb5_3 libk5crypto3 libcom_err3
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 13 Aug 2012 20:43:54 +0200
+
+openssh (6.0p1,REV=2012.05.17) unstable
+
+  * Rebuilt againt libssl 1.0
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 17 May 2012 15:33:02 +0200
+
+openssh (6.0p1,REV=2012.05.04) unstable
+
+  * New upstream release
+  * Updated dependancies name: CSWosslrt -> CSWlibssl0-9-8
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 04 May 2012 19:19:24 +0200
+
+openssh (5.9p1,REV=2011.09.19) unstable
+
+  * Fixed an error in server key generation (Closes: #4876)
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 16 Dec 2011 20:46:24 +0100
+
+openssh (5.9p1,REV=2011.09.19) unstable
+
+  * New upstream release.
+  * Updated dependancies name:
+     CSWzlib -> CSWlibz1
+     CSWtcpwrap -> CSWlibwrap1
+     CSWkrb5lib -> CSWlibkrb5-3
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 19 Sep 2011 22:31:03 +0200
+
+openssh (5.8p1,REV=2011.07.25) unstable
+
+  * Added the generation of eliptic curve algoritm host keys in init script.
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 25 Jul 2011 19:55:16 +0200
+
+openssh (5.8p1,REV=2011.02.12) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 12 Feb 2011 17:53:23 +0100
+
+openssh (5.6p1,REV=2010.12.19) unstable
+
+  * 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/empty.
+  * Added 0004-no-lastlog-file.patch patch to workaround a bug with
+  Lastlog information printed at login time (see bug #4494).
+  * Added 0005-rename-pidfile.patch to rename pidfile from sshd.pid to
+  cswsshd.pid. This avoids a conflict with sun native ssh (Closes: #4398).
+  * [Build system] Switched to dynamic prototype.
+  * [Build system] Switched to cswclassutils for user/group creation.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 19 Dec 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
+  derelativise_path function (Closes: #4367).
+  * Added dont_derelativise_authorizedkeysfile_option.patch so the
+  AuthorizedKeysFile option can be relative as explained in the man page.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2010 19:15:55 +0100
+
+openssh (5.4p1,REV=2010.03.13) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 12 Mar 2010 23:53:43 +0100
+
+openssh (5.3p1,REV=2010.02.28) unstable
+
+  * Added ssh-copy-id contrib script (Closes: #4306)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 28 Feb 2010 17:03:52 +0100
+
+openssh (5.3p1,REV=2009.12.14) unstable
+
+  * Package rebuild to solve an incorrect upload in the repository tree.
+  * Changed package version numbering scheme.
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 14 Dec 2009 21:19:33 +0100
+
+openssh (5.3,REV=2009.10.10_rev=p1) unstable
+
+  * New upstream release.
+  * PrintMotd is now no in the default config file to avoid a double login
+  banner (Closes: #3829)
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 10 Oct 2009 21:47:46 +0200
+
+openssh (5.2,REV=2009.07.25_rev=p1) unstable
+
+  * Fixed missing /opt/csw/etc/ssh in prototype (Closes: #3765)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 25 Jul 2009 12:57:35 +0200
+
+openssh (5.2,REV=2009.06.30_rev=p1) unstable
+
+  * Switched to cswclassutils for SMF support.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Jun 2009 10:34:39 +0100
+
+openssh (5.2,REV=2008.03.28_rev=p1) unstable
+
+  * New upstream version.
+  * Split the client in a distinct package.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 22 Mar 2009 10:34:39 +0100
+
+openssh (5.1,REV=2008.02.15_rev=p1) unstable
+
+  * Package rebuild to solve incorrect package push in repository tree.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
+
+openssh (5.1,REV=2008.12.06_rev=p1) unstable
+
+  * Added test for configuration file existence in sysV init script 
+  (Closes: #2878) 
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
+
+openssh (5.1,REV=2008.10.04_rev=p1) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 04 Oct 2008 21:25:09 +0200
+
+openssh (5.0,REV=2008.06.02_rev=p1) unstable
+
+  * New upstream version.
+  * Added solaris fix for X11 forwarding bug on ipv4 only machine.
+
+ -- Yann Rouillard <yann at blastwave.org>  Wed, 30 Apr 2008 14:23:40 +0200
+
+openssh (4.9,REV=2008.04.01_rev=p1) unstable
+
+  * New upstream version.
+  * Added documentation files in the package.
+
+ -- Yann Rouillard <yann at blastwave.org>  Tue, 01 Apr 2008 20:37:51 +0200
+
+openssh (4.7,REV=2008.04.04_rev=p1) unstable
+
+  * Added security fixes for CVE-2008-1483 and CVE-2008-1657
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 04 Apr 2008 23:44:19 +0200
+
+openssh (4.7,REV=2007.11.02_rev=p1) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 02 Nov 2007 22:02:23 +0100
+
+openssh (4.6,REV=2007.08.24_rev=p1) unstable
+
+  * Added GSSAPI key exchange patch.
+  * Added spurious error log patch (see openssh bug 1306).
+  * Enabled Solaris contract support for Solaris 10 to avoid
+  ssh disconnections when ssh daemon is restarted.
+  * Re-enabled tcpwrapper support.
+  * replaced \"? ? ?\" with \"0755 root bin\" in the prototype
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 17 Aug 2007 21:15:51 +0200

Deleted: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-17 11:19:27 UTC (rev 23032)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-17 11:48:15 UTC (rev 23033)
@@ -1,233 +0,0 @@
-openssh (6.5p1,REV=2014.02.17) unstable
-
-  * Fixed the host key generation script so that keys for all
-  types are always generared (closes: #5151)
-
- -- Yann Rouillard <yann at opencsw.org>  Mon, 17 Feb 2014 12:10:39 +0100
-
-openssh (6.5p1,REV=2014.01.31) unstable
-
-  * New upstream release.
-  * Updated the GSSAPI key exchange patch
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 31 Jan 2014 09:23:22 +0100
-
-openssh (6.4p1,REV=2013.11.09) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 09 Nov 2013 00:49:27 +0100
-
-openssh (6.3p1,REV=2013.09.20) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Sep 2013 21:20:54 +0200
-
-openssh (6.2p2,REV=2013.05.02) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Thu, 02 May 2013 19:48:33 +0200
-
-openssh (6.1p1,REV=2013.01.08) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Tue, 08 Jan 2013 22:35:07 +0100
-
-openssh (6.0p1,REV=2012.09.30) unstable
-
-  * Explicitly disabled lazyloading as it causes
-    problem with chrooting (Closes: #5006).
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Sep 2012 23:22:42 +0200
-
-openssh (6.0p1,REV=2012.08.24) unstable
-
-  * Enabled direct binding during build.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 14:49:44 +0200
-
-openssh (6.0p1,REV=2012.08.17) unstable
-
-  * Added a mapfile to force linking against interface SUNW_1.22
-    of libc.so.1 so we don't work only on last solaris release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 17 Aug 2012 15:51:32 +0200
-
-openssh (6.0p1,REV=2012.08.12) unstable
-
-  * Removed superfluous dependencies:
-  	openssh: libk5crypto3
-	openssh-client: libkrb5_3 libk5crypto3 libcom_err3
-
- -- Yann Rouillard <yann at opencsw.org>  Mon, 13 Aug 2012 20:43:54 +0200
-
-openssh (6.0p1,REV=2012.05.17) unstable
-
-  * Rebuilt againt libssl 1.0
-
- -- Yann Rouillard <yann at opencsw.org>  Thu, 17 May 2012 15:33:02 +0200
-
-openssh (6.0p1,REV=2012.05.04) unstable
-
-  * New upstream release
-  * Updated dependancies name: CSWosslrt -> CSWlibssl0-9-8
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 04 May 2012 19:19:24 +0200
-
-openssh (5.9p1,REV=2011.09.19) unstable
-
-  * Fixed an error in server key generation (Closes: #4876)
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 16 Dec 2011 20:46:24 +0100
-
-openssh (5.9p1,REV=2011.09.19) unstable
-
-  * New upstream release.
-  * Updated dependancies name:
-     CSWzlib -> CSWlibz1
-     CSWtcpwrap -> CSWlibwrap1
-     CSWkrb5lib -> CSWlibkrb5-3
-
- -- Yann Rouillard <yann at opencsw.org>  Mon, 19 Sep 2011 22:31:03 +0200
-
-openssh (5.8p1,REV=2011.07.25) unstable
-
-  * Added the generation of eliptic curve algoritm host keys in init script.
-
- -- Yann Rouillard <yann at opencsw.org>  Mon, 25 Jul 2011 19:55:16 +0200
-
-openssh (5.8p1,REV=2011.02.12) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 12 Feb 2011 17:53:23 +0100
-
-openssh (5.6p1,REV=2010.12.19) unstable
-
-  * 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/empty.
-  * Added 0004-no-lastlog-file.patch patch to workaround a bug with
-  Lastlog information printed at login time (see bug #4494).
-  * Added 0005-rename-pidfile.patch to rename pidfile from sshd.pid to
-  cswsshd.pid. This avoids a conflict with sun native ssh (Closes: #4398).
-  * [Build system] Switched to dynamic prototype.
-  * [Build system] Switched to cswclassutils for user/group creation.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 19 Dec 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
-  derelativise_path function (Closes: #4367).
-  * Added dont_derelativise_authorizedkeysfile_option.patch so the
-  AuthorizedKeysFile option can be relative as explained in the man page.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2010 19:15:55 +0100
-
-openssh (5.4p1,REV=2010.03.13) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 12 Mar 2010 23:53:43 +0100
-
-openssh (5.3p1,REV=2010.02.28) unstable
-
-  * Added ssh-copy-id contrib script (Closes: #4306)
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 28 Feb 2010 17:03:52 +0100
-
-openssh (5.3p1,REV=2009.12.14) unstable
-
-  * Package rebuild to solve an incorrect upload in the repository tree.
-  * Changed package version numbering scheme.
-
- -- Yann Rouillard <yann at opencsw.org>  Mon, 14 Dec 2009 21:19:33 +0100
-
-openssh (5.3,REV=2009.10.10_rev=p1) unstable
-
-  * New upstream release.
-  * PrintMotd is now no in the default config file to avoid a double login
-  banner (Closes: #3829)
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 10 Oct 2009 21:47:46 +0200
-
-openssh (5.2,REV=2009.07.25_rev=p1) unstable
-
-  * Fixed missing /opt/csw/etc/ssh in prototype (Closes: #3765)
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 25 Jul 2009 12:57:35 +0200
-
-openssh (5.2,REV=2009.06.30_rev=p1) unstable
-
-  * Switched to cswclassutils for SMF support.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Jun 2009 10:34:39 +0100
-
-openssh (5.2,REV=2008.03.28_rev=p1) unstable
-
-  * New upstream version.
-  * Split the client in a distinct package.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 22 Mar 2009 10:34:39 +0100
-
-openssh (5.1,REV=2008.02.15_rev=p1) unstable
-
-  * Package rebuild to solve incorrect package push in repository tree.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
-
-openssh (5.1,REV=2008.12.06_rev=p1) unstable
-
-  * Added test for configuration file existence in sysV init script 
-  (Closes: #2878) 
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 06 Dec 2008 15:36:48 +0100
-
-openssh (5.1,REV=2008.10.04_rev=p1) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 04 Oct 2008 21:25:09 +0200
-
-openssh (5.0,REV=2008.06.02_rev=p1) unstable
-
-  * New upstream version.
-  * Added solaris fix for X11 forwarding bug on ipv4 only machine.
-
- -- Yann Rouillard <yann at blastwave.org>  Wed, 30 Apr 2008 14:23:40 +0200
-
-openssh (4.9,REV=2008.04.01_rev=p1) unstable
-
-  * New upstream version.
-  * Added documentation files in the package.
-
- -- Yann Rouillard <yann at blastwave.org>  Tue, 01 Apr 2008 20:37:51 +0200
-
-openssh (4.7,REV=2008.04.04_rev=p1) unstable
-
-  * Added security fixes for CVE-2008-1483 and CVE-2008-1657
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 04 Apr 2008 23:44:19 +0200
-
-openssh (4.7,REV=2007.11.02_rev=p1) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 02 Nov 2007 22:02:23 +0100
-
-openssh (4.6,REV=2007.08.24_rev=p1) unstable
-
-  * Added GSSAPI key exchange patch.
-  * Added spurious error log patch (see openssh bug 1306).
-  * Enabled Solaris contract support for Solaris 10 to avoid
-  ssh disconnections when ssh daemon is restarted.
-  * Re-enabled tcpwrapper support.
-  * replaced \"? ? ?\" with \"0755 root bin\" in the prototype
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 17 Aug 2007 21:15:51 +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  Mon Feb 17 12:49:24 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 17 Feb 2014 11:49:24 +0000
Subject: SF.net SVN: gar:[23034] csw/mgar/pkg/openssh/trunk/files
Message-ID: <3fSNld0vpWzmL@mail.opencsw.org>

Revision: 23034
          http://sourceforge.net/p/gar/code/23034
Author:   chninkel
Date:     2014-02-17 11:49:23 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
openssh/trunk: make sure OpenCSW ssh-keygen is used to generate host keys

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

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-17 11:48:15 UTC (rev 23033)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-17 11:49:23 UTC (rev 23034)
@@ -17,7 +17,7 @@
 case $1 in 
 'start')
         if [ -x /opt/csw/bin/ssh-keygen ]; then
-		ssh-keygen -A 
+		/opt/csw/bin/ssh-keygen -A 
         fi
 
         [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-17 11:48:15 UTC (rev 23033)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-17 11:49:23 UTC (rev 23034)
@@ -5,7 +5,7 @@
 KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/cswsshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
-	ssh-keygen -A
+	/opt/csw/bin/ssh-keygen -A
 fi
 
 /opt/csw/sbin/sshd

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


From lblume at users.sourceforge.net  Mon Feb 17 15:04:55 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon, 17 Feb 2014 14:04:55 +0000
Subject: SF.net SVN: gar:[23035] csw/mgar/pkg/samba/branches/samba3/Makefile
Message-ID: <3fSRm16YzDz1X0@mail.opencsw.org>

Revision: 23035
          http://sourceforge.net/p/gar/code/23035
Author:   lblume
Date:     2014-02-17 14:04:51 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
samba/branches/samba3: Remove dep that is suddenly detected as surplus

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-17 11:49:23 UTC (rev 23034)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-17 14:04:51 UTC (rev 23035)
@@ -48,7 +48,6 @@
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2
@@ -85,7 +84,6 @@
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibldap2-4-2
@@ -106,7 +104,6 @@
 PKGFILES_CSWlibsmbclient0 += $(mandir)/man7/libsmbclient\.7
 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibkrb5-3
@@ -130,7 +127,6 @@
 SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibcom-err3
@@ -225,7 +221,6 @@
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWliblber2-4-2
@@ -295,7 +290,6 @@
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibz1
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibcom-err3

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


From lblume at users.sourceforge.net  Mon Feb 17 16:25:15 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon, 17 Feb 2014 15:25:15 +0000
Subject: SF.net SVN: gar:[23036] csw/mgar/pkg/samba/branches/samba3/Makefile
Message-ID: <3fSTXg2PVKzSS@mail.opencsw.org>

Revision: 23036
          http://sourceforge.net/p/gar/code/23036
Author:   lblume
Date:     2014-02-17 15:25:11 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
samba/branches/samba3: Add workarond deps for ld bug

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-17 14:04:51 UTC (rev 23035)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2014-02-17 15:25:11 UTC (rev 23036)
@@ -306,6 +306,19 @@
 
 CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWsamba-nss
 
+### Needed to work around the ld Bug 
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtdb1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibwbclient0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtevent0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibintl8
+###
+
 # Needed as the configure script doesn't add it
 EXTRA_LINKER_FLAGS += -lintl 
 EXTRA_LINKER_FLAGS += -z ignore -z lazyload

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 Feb 18 00:25:59 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 17 Feb 2014 23:25:59 +0000
Subject: SF.net SVN: gar:[23037] csw/mgar/gar/v2
Message-ID: <3fShDl4yhdz1QS@mail.opencsw.org>

Revision: 23037
          http://sourceforge.net/p/gar/code/23037
Author:   wahwah
Date:     2014-02-17 23:25:58 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
pkgdb: The grand rewrite

Work started in January 2013. Main feature: JSON blobs split into smaller parts.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/README
    csw/mgar/gar/v2/lib/python/catalog.py
    csw/mgar/gar/v2/lib/python/checkpkg2.py
    csw/mgar/gar/v2/lib/python/checkpkg_defaults.ini
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py
    csw/mgar/gar/v2/lib/python/configuration.py
    csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
    csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py
    csw/mgar/gar/v2/lib/python/database.py
    csw/mgar/gar/v2/lib/python/database_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/integrate_catalogs.py
    csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py
    csw/mgar/gar/v2/lib/python/ldd_emul.py
    csw/mgar/gar/v2/lib/python/ldd_emul_test.py
    csw/mgar/gar/v2/lib/python/models.py
    csw/mgar/gar/v2/lib/python/models_test.py
    csw/mgar/gar/v2/lib/python/overrides_test.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py
    csw/mgar/gar/v2/lib/python/package_stats.py
    csw/mgar/gar/v2/lib/python/package_stats_test.py
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/python/pkgmap.py
    csw/mgar/gar/v2/lib/python/pkgmap_test.py
    csw/mgar/gar/v2/lib/python/representations.py
    csw/mgar/gar/v2/lib/python/rest.py
    csw/mgar/gar/v2/lib/python/retry_decorator.py
    csw/mgar/gar/v2/lib/python/sharedlib_utils.py
    csw/mgar/gar/v2/lib/python/shell.py
    csw/mgar/gar/v2/lib/python/struct_util.py
    csw/mgar/gar/v2/lib/python/system_pkgmap.py
    csw/mgar/gar/v2/lib/python/system_pkgmap_test.py
    csw/mgar/gar/v2/lib/python/test_base.py
    csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py
    csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py
    csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py
    csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py
    csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py
    csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py
    csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py
    csw/mgar/gar/v2/lib/python/testdata/neon_stats.py
    csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py
    csw/mgar/gar/v2/lib/python/testdata/tree_stats.py
    csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py
    csw/mgar/gar/v2/lib/sh/db_privileges.sh
    csw/mgar/gar/v2/lib/web/pkgdb_web.py
    csw/mgar/gar/v2/lib/web/releases_web.py
    csw/mgar/gar/v2/lib/web/templates/CatalogDetail.html
    csw/mgar/gar/v2/lib/web/templates/CatalogList.html
    csw/mgar/gar/v2/lib/web/templates/Catalogname.html
    csw/mgar/gar/v2/lib/web/templates/CatalognameList.html
    csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html
    csw/mgar/gar/v2/lib/web/templates/ErrorTagList.html
    csw/mgar/gar/v2/lib/web/templates/MaintainerCheckpkgReport.html
    csw/mgar/gar/v2/lib/web/templates/MaintainerDetail.html
    csw/mgar/gar/v2/lib/web/templates/MaintainerList.html
    csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html
    csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html
    csw/mgar/gar/v2/lib/web/templates/Srv4List.html
    csw/mgar/gar/v2/lib/web/templates/index.html
    csw/mgar/gar/v2/tests/run_tests.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py
    csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py
    csw/mgar/gar/v2/lib/python/collect_pkg_metadata_test.py
    csw/mgar/gar/v2/lib/python/configuration_test.py
    csw/mgar/gar/v2/lib/python/errors.py
    csw/mgar/gar/v2/lib/python/fake_pkgstats_composer.py
    csw/mgar/gar/v2/lib/python/fake_pkgstats_composer_test.py
    csw/mgar/gar/v2/lib/python/integrate_catalogs_auto.py
    csw/mgar/gar/v2/lib/python/integrate_catalogs_auto_test.py
    csw/mgar/gar/v2/lib/python/prepare_mock_calls.py
    csw/mgar/gar/v2/lib/python/prepare_test_data.py
    csw/mgar/gar/v2/lib/python/relational_util.py
    csw/mgar/gar/v2/lib/python/relational_util_test.py
    csw/mgar/gar/v2/lib/python/sqlobject_test.py
    csw/mgar/gar/v2/lib/python/testdata/berkeleydb48_stats.py
    csw/mgar/gar/v2/lib/python/testdata/djvulibre_rt_stats.py
    csw/mgar/gar/v2/lib/python/testdata/rsync_stats.py
    csw/mgar/gar/v2/lib/python/util.py
    csw/mgar/gar/v2/lib/python/util_test.py
    csw/mgar/gar/v2/lib/sh/make_allpkgs.sh
    csw/mgar/gar/v2/lib/web/pkgdb_web_test.py
    csw/mgar/gar/v2/lib/web/releases_web_test.py
    csw/mgar/gar/v2/lib/web/templates/ElfdumpInfoBlob.html
    csw/mgar/gar/v2/lib/web/templates/Srv4StructDump.html

Removed Paths:
-------------
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
    csw/mgar/gar/v2/bin/comparepkg
    csw/mgar/gar/v2/lib/python/compare_pkgs.py
    csw/mgar/gar/v2/lib/python/compare_pkgs_test.py
    csw/mgar/gar/v2/lib/python/inspective_package.py
    csw/mgar/gar/v2/lib/python/inspective_package_test.py
    csw/mgar/gar/v2/lib/python/package.py
    csw/mgar/gar/v2/lib/python/package_test.py
    csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py
    csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py
    csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py

Deleted: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1,57 +0,0 @@
-#!/opt/csw/bin/python2.6
-# coding=utf-8
-
-import code
-import itertools
-import logging
-import optparse
-import os
-import pprint
-import sys
-import re
-import progressbar
-
-# The following bit of code sets the correct path to Python libraries
-# distributed with GAR.
-path_list = [os.path.dirname(__file__),
-             "..", "lib", "python"]
-sys.path.append(os.path.join(*path_list))
-import opencsw
-import configuration
-
-def main():
-  usage = "Usage: %prog [ options ] file | md5 [ file | md5 [ ... ] ]"
-  parser = optparse.OptionParser(usage)
-  parser.add_option("-d", "--debug", dest="debug",
-                    default=False, action="store_true",
-                    help="Turn on debugging messages")
-  parser.add_option("-p", "--print_stats", dest="print_stats",
-                    default=False, action="store_true")
-  options, args = parser.parse_args()
-  if options.debug:
-    logging.basicConfig(level=logging.DEBUG)
-  else:
-    logging.basicConfig(level=logging.INFO)
-  logging.debug("Collecting statistics about given package files.")
-  configuration.SetUpSqlobjectConnection()
-  pkgstat_objs = checkpkg_lib.GetPackageStatsByFilenamesOrMd5s(
-      args,
-      options.debug)
-  bar = progressbar.ProgressBar()
-  bar.maxval = len(pkgstat_objs)
-  bar.start()
-  counter = itertools.count()
-  pkgstats = []
-  for pkgstat in pkgstat_objs:
-    pkgstats.append(pkgstat.GetAllStats())
-    bar.update(counter.next())
-  bar.finish()
-  if options.print_stats:
-    print "import datetime"
-    print "pkgstat_objs = ",
-    pprint.pprint(pkgstats)
-  else:
-    code.interact(local=locals())
-
-if __name__ == '__main__':
-  main()

Deleted: csw/mgar/gar/v2/bin/comparepkg
===================================================================
--- csw/mgar/gar/v2/bin/comparepkg	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/bin/comparepkg	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1 +0,0 @@
-link ../lib/python/compare_pkgs.py
\ No newline at end of file

Modified: csw/mgar/gar/v2/lib/python/README
===================================================================
--- csw/mgar/gar/v2/lib/python/README	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/README	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1,7 +1,28 @@
 This directory contains Python libraries, mostly related to checkpkg.
 
-==Checkpkg==
+== TODO items ==
 
+- populating allpkgs based on an existing catalog tree
+- Testing uploads (locally)
+- Auth for users on the buildfarm
+- Unit tests (unit test data)
+  - what about callbacks?
+
+== Private Buildfarm ==
+
+Notes:
+
+- When running a RESTful web app, /tmp is used to store temporary files.
+  Therefore, if you're uploading a large file and your system has little space
+  in /tmp, the server side process will fail with an error. Make sure that the
+  /tmp directory has about 1GB of free space.
+  If you increase the swap size, /tmp will grow too.
+  References:
+  http://docs.oracle.com/cd/E19963-01/html/821-1448/ggrln.html
+  http://www.c0t0d0s0.org/archives/5815-Less-known-Solaris-features-The-curious-case-of-the-tmp-in-Solaris.html
+
+== Checkpkg ==
+
 Checks to implement:
  - *dev(el)? -> error, suggest *-dev
  - *-?rt -> error, suggest specific library packages
@@ -25,15 +46,8 @@
 
 Development plan for checkpkg:
   Primary focus:
-  - Add support for tiering (core/active/unsupported)
-  - Remeber, against which catalogs has a package been checked, and
-    when.
-  - Add MySQL database garbage collection
-    - Currently, the database is growing indefinitely, at the time of writing
-      it's 1.5GB uncompressed.
-  - When adding a package to a catalog, store the time and date of the
-    addition
-    - Can be generalized as logging
+  - Allow to create a package database on a machine with 1-1.5GB of RAM
+    (e.g. for virtual machines)
   - Add fields to the srv4_file_stats table:
     - source URL (for grouping by software)
     - Description (to search for the word 'transitional')
@@ -62,6 +76,7 @@
 - Notify maintainers when their package is available from mirrors
 - Add support for the 'overridden' field in the database
 - Support for relocatable packages
+- Database objects garbage collection
 
 Known problems:
 - libmagic fails sometimes when processing the whole catalog
@@ -73,21 +88,27 @@
 for Ubuntu.
 
 sudo aptitude install \
-  python-mysql \
   python-cheetah \
   python-magic \
   python-mox \
+  python-mysql \
   python-progressbar \
   python-pycurl \
   python-sqlobject \
   python-unittest2 \
+  python-webpy \
   python-yaml
 
 Seem unpackaged: elftools from
 http://eli.thegreenplace.net/2012/01/06/pyelftools-python-library-for-parsing-elf-and-dwarf/
 
-Solaris package dependencies.
+The progressbar package in older Ubuntu versions (12.4) is too old and does not
+have the progressbar.widget submodule.
 
+Solaris package dependencies:
+
+CSWap2-modwsgi
+CSWapache2
 CSWpy-cheetah
 CSWpy-curl
 CSWpy-libmagic
@@ -97,12 +118,8 @@
 CSWpy-pyelftools
 CSWpy-sqlobject
 CSWpy-unittest2
+CSWpy-webpy
 
-For pkgdb-web
-
-CSWapache2
-CSWap2-modwsgi
-
 ===Checkpkg database===
 
 Additional database indexes:
@@ -112,3 +129,28 @@
 CREATE INDEX srv4_mtime_idx ON srv4_file_stats(mtime);
 CREATE INDEX srv4_md5_idx ON srv4_file_stats(md5_sum);
 CREATE INDEX catalog_idx ON srv4_file_in_catalog (arch_id, osrel_id, catrel_id);
+
+A query showing how many packages there are in each catalog.
+
+SELECT
+  a.name as arch, o.short_name as osrel, c.name as catrel,
+  s.use_to_generate_catalogs, count(*)
+FROM
+  srv4_file_in_catalog as sit,
+  architecture as a,
+  os_release as o,
+  catalog_release as c,
+  srv4_file_stats as s
+WHERE
+  sit.srv4file_id = s.id
+  and
+  sit.arch_id = a.id
+  and
+  sit.osrel_id = o.id
+  and
+  sit.catrel_id = c.id
+GROUP BY
+  a.id, osrel_id, catrel_id, s.use_to_generate_catalogs
+ORDER BY
+  c.name
+;

Modified: csw/mgar/gar/v2/lib/python/catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/catalog.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/catalog.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -3,17 +3,15 @@
 import os
 import re
 import logging
-import opencsw
 
+from lib.python import errors
+from lib.python import opencsw
 
-class Error(Exception):
-  pass
 
+class CatalogLineParseError(errors.Error):
+  """Failed to parse a line from a catalog file."""
 
-class CatalogLineParseError(Error):
-  pass
 
-
 class OpencswCatalogBuilder(object):
 
   def __init__(self, product_dir, catalog_dir):
@@ -25,9 +23,7 @@
     for pkg_dir in pkg_dirs:
       pkg_path = os.path.join(self.product_dir, pkg_dir)
       pkginfo_path = os.path.join(pkg_path, "pkginfo")
-      if (os.path.isdir(pkg_path)
-            and
-          os.path.exists(pkginfo_path)):
+      if (os.path.isdir(pkg_path) and os.path.exists(pkginfo_path)):
         if not self.Srv4Exists(pkg_path):
           pkg = None
           tmpdir = None
@@ -52,7 +48,6 @@
       else:
         logging.warn("%s is not a directory.", pkg_path)
 
-
   def Srv4Exists(self, pkg_dir):
     pkg = DirectoryFormatPackage(pkg_dir)
     srv4_name = pkg.GetSrv4FileName()

Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -3,23 +3,25 @@
 # checkpkg
 #
 
+import datetime
+import hashlib
 import logging
 import operator
 import optparse
 import os
+import sqlobject
 import sys
 import textwrap
-import configuration
-import datetime
-import database
 
-import common_constants
-import package_stats
-import struct_util
-import checkpkg_lib
-import overrides
-import models
-import sqlobject
+from lib.python import checkpkg_lib
+from lib.python import common_constants
+from lib.python import configuration
+from lib.python import errors
+from lib.python import models
+from lib.python import overrides
+from lib.python import package_stats
+from lib.python import rest
+from lib.python import struct_util
 
 USAGE = """%prog [ options ] pkg1 [ pkg2 [ ... ] ]"""
 CHECKPKG_MODULE_NAME = "The main checking module."
@@ -43,12 +45,40 @@
 
 cc = common_constants
 
-class Error(Exception):
-  """Generic error."""
+class UsageError(errors.Error):
+  """Problem with usage, e.g. command line options."""
 
 
-class UsageError(Error):
-  """Problem with usage, e.g. command line options."""
+def VerifyContents(sqo_osrel, sqo_arch):
+  """Verify that we know the system files on the OS release and architecture."""
+  res = models.Srv4FileStats.select(
+      sqlobject.AND(
+        models.Srv4FileStats.q.use_to_generate_catalogs==False,
+        models.Srv4FileStats.q.registered_level_two==True,
+        models.Srv4FileStats.q.os_rel==sqo_osrel,
+        models.Srv4FileStats.q.arch==sqo_arch))
+  # logging.warning("VerifyContents(): Packages Count: %s", res.count())
+  system_pkgs = res.count()
+  logging.debug("VerifyContents(%s, %s): %s", sqo_osrel, sqo_arch, system_pkgs)
+  if system_pkgs < 10:
+    msg = (
+        "Checkpkg can't find system files for %s %s in the cache database.  "
+        "These are files such as /usr/lib/libc.so.1.  "
+        "Private DB setup: "
+        "you can only check packages built for the same Solaris version "
+        "you're running on this machine.  "
+        "For instance, you can't check a SunOS5.9 package on SunOS5.10. "
+        "Shared DB setup (e.g. OpenCSW maintainers): "
+        "If you have one home directory on multiple hosts, make sure you "
+        "run checkpkg on the host you intended to.  "
+        "To fix, go to a %s %s host and execute: pkgdb system-files-to-file; "
+        "pkgdb import-system-file install-contents-%s-%s.marshal; "
+        "See http://wiki.opencsw.org/checkpkg for more information."
+        % (sqo_osrel.short_name, sqo_arch.name,
+           sqo_arch.name, sqo_osrel.short_name,
+           sqo_osrel.short_name, sqo_arch.name))
+    logging.fatal(msg)
+    raise errors.DatabaseContentsError('OS files not indexed.')
 
 
 def main():
@@ -90,8 +120,6 @@
   logging.debug("Starting.")
 
   configuration.SetUpSqlobjectConnection()
-  dm = database.DatabaseManager()
-  dm.AutoManage()
 
   err_msg_list = []
   if not options.osrel_commas:
@@ -105,7 +133,7 @@
   if err_msg_list:
     raise UsageError(" ".join(err_msg_list))
 
-  stats_list = []
+  md5_sums_from_files = []
   collector = package_stats.StatsCollector(
       logger=logging,
       debug=options.debug)
@@ -116,10 +144,35 @@
       md5_sums.append(arg)
     else:
       file_list.append(arg)
+
+  config = configuration.GetConfig()
+  rest_client = rest.RestClient(
+      pkgdb_url=config.get('rest', 'pkgdb'),
+      releases_url=config.get('rest', 'releases'))
+
   if file_list:
-    stats_list = collector.CollectStatsFromFiles(file_list, None)
+    def MakeEntry(file_name):
+      file_hash = hashlib.md5()
+      with open(file_name, "r") as fd:
+        chunk_size = 2 * 1024 * 1024
+        data = fd.read(chunk_size)
+        while data:
+          file_hash.update(data)
+          data = fd.read(chunk_size)
+        md5_sum = file_hash.hexdigest()
+        del file_hash
+      _, file_basename = os.path.split(file_name)
+      return {
+          'pkg_path': file_name,
+          'md5sum': md5_sum,
+          'file_basename': file_basename,
+      }
+    entries = [MakeEntry(x) for x in file_list]
+    md5_sums_from_files = collector.CollectStatsFromCatalogEntries(entries, False)
+    for md5_sum in md5_sums_from_files:
+      rest_client.RegisterLevelOne(md5_sum)
   # We need the md5 sums of these files
-  md5_sums.extend([x["basic_stats"]["md5_sum"] for x in stats_list])
+  md5_sums.extend(md5_sums_from_files)
   assert md5_sums, "The list of md5 sums must not be empty."
   logging.debug("md5_sums: %s", md5_sums)
   osrel_list = options.osrel_commas.split(",")
@@ -145,7 +198,7 @@
   sqo_arch = models.Architecture.selectBy(name=options.arch).getOne()
   for osrel in osrel_list:
     sqo_osrel = models.OsRelease.selectBy(short_name=osrel).getOne()
-    dm.VerifyContents(sqo_osrel, sqo_arch)
+    VerifyContents(sqo_osrel, sqo_arch)
     check_manager = checkpkg_lib.CheckpkgManager2(
         CHECKPKG_MODULE_NAME,
         sqo_pkgs,

Modified: csw/mgar/gar/v2/lib/python/checkpkg_defaults.ini
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_defaults.ini	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/checkpkg_defaults.ini	2014-02-17 23:25:58 UTC (rev 23037)
@@ -2,5 +2,3 @@
 ; config file and starts to populate the database.
 
 [database]
-
-auto_manage = no

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -3,35 +3,34 @@
 # This file is supposed to drain the checkpkg.py file until is becomes
 # empty and goes away.
 
+from Cheetah import Template
+from sqlobject import sqlbuilder
+import collections
 import copy
-from Cheetah import Template
-import logging
 import getpass
-import package_stats
-import package_checks
-import sqlobject
-import collections
 import itertools
-import progressbar
-import database
-import models as m
-import textwrap
+import logging
+import operator
 import os.path
-import tag
 import pprint
-import operator
-import common_constants
-import sharedlib_utils
-import mute_progressbar
-import cPickle
-import dependency_checks
-from sqlobject import sqlbuilder
+import progressbar
 import re
+import sqlobject
+import textwrap
 
+from lib.python import mute_progressbar
+from lib.python import common_constants
+from lib.python import configuration
+from lib.python import database
+from lib.python import errors
+from lib.python import models as m
+from lib.python import rest
+from lib.python import sharedlib_utils
+from lib.python import tag
+from lib.python import representations
 
 DESCRIPTION_RE = r"^([\S]+) - (.*)$"
 
-INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261
 SYS_DEFAULT_RUNPATH = [
     "/usr/lib/$ISALIST",
     "/usr/lib",
@@ -39,63 +38,23 @@
     "/lib",
 ]
 
-class Error(Exception):
-  """Generic error."""
 
-
-class CatalogDatabaseError(Error):
+class CatalogDatabaseError(errors.Error):
   """Problem with the catalog database."""
 
 
-class DataError(Error):
+class DataError(errors.Error):
   """A problem with reading required data."""
 
 
-class ConfigurationError(Error):
+class ConfigurationError(errors.Error):
   """A problem with checkpkg configuration."""
 
 
-class PackageError(Error):
-  pass
-
-
-class StdoutSyntaxError(Error):
-  pass
-
-
-class SetupError(Error):
-  pass
-
-
-class InternalDataError(Error):
+class InternalDataError(errors.Error):
   """Problem with internal checkpkg data structures."""
 
 
-def GetPackageStatsByFilenamesOrMd5s(args, debug=False):
-  filenames = []
-  md5s = []
-  for arg in args:
-    if struct_util.IsMd5(arg):
-      md5s.append(arg)
-    else:
-      filenames.append(arg)
-  srv4_pkgs = [inspective_package.InspectiveCswSrv4File(x) for x in filenames]
-  pkgstat_objs = []
-  pbar = progressbar.ProgressBar()
-  pbar.maxval = len(md5s) + len(srv4_pkgs)
-  pbar.start()
-  counter = itertools.count()
-  for pkg in srv4_pkgs:
-    pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug))
-    pbar.update(counter.next())
-  for md5 in md5s:
-    pkgstat_objs.append(package_stats.PackageStats(None, md5sum=md5, debug=debug))
-    pbar.update(counter.next())
-  pbar.finish()
-  return pkgstat_objs
-
-
-
 REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames
 Dependency issues of $pkgname:
 #end if
@@ -204,6 +163,23 @@
     return self.triad_cache[key]
 
 
+class LazyElfinfo(object):
+  """Used at runtime for lazy fetches of elfdump info data."""
+
+  def __init__(self, rest_client):
+    self.rest_client = rest_client
+
+  def __getitem__(self, md5_sum):
+    elfdump_data = self.rest_client.GetBlob('elfdump', md5_sum)
+    # json doesn't preserve namedtuple so we do some post-processing
+    # to transform symbol info from List to NamedTuple
+    symbols = elfdump_data['symbol table']
+    for idx, symbol_as_list in enumerate(symbols):
+      symbols[idx] = representations.ElfSymInfo(*symbol_as_list)
+
+    return elfdump_data
+
+
 class CheckpkgManagerBase(SqlobjectHelperMixin):
   """Common functions between the older and newer calling functions."""
 
@@ -220,6 +196,10 @@
     self._ResetState()
     self.individual_checks = []
     self.set_checks = []
+    config = configuration.GetConfig()
+    self.rest_client = rest.RestClient(
+        pkgdb_url=config.get('rest', 'pkgdb'),
+        releases_url=config.get('rest', 'releases'))
 
   def _ResetState(self):
     self.errors = []
@@ -277,16 +257,12 @@
       #
       # Python strings are already implementing the flyweight pattern. What's
       # left is lists and dictionaries.
-      i = counter.next()
-      if stats_obj.data_obj:
-        raw_pkg_data = stats_obj.GetStatsStruct()
-      else:
-        raise CatalogDatabaseError(
-            "%s (%s) is missing the data object."
-            % (stats_obj.basename, stats_obj.md5_sum))
-      pkg_data = raw_pkg_data
-      pkgs_data.append(pkg_data)
-      pbar.update(i)
+      raw_pkg_data = self.rest_client.GetBlob('pkgstats', stats_obj.md5_sum)
+      # Registering a callback allowing the receiver to retrieve the elfdump
+      # information when necessary.
+      raw_pkg_data['elfdump_info'] = LazyElfinfo(self.rest_client)
+      pkgs_data.append(raw_pkg_data)
+      pbar.update(counter.next())
     pbar.finish()
     return pkgs_data
 
@@ -360,13 +336,17 @@
   It wraps access to the catalog database.
   """
 
-  def __init__(self, osrel, arch, catrel, catalog, pkg_set_files, lines_dict=None):
+  def __init__(self, osrel, arch, catrel, catalog, pkg_set_files, lines_dict=None,
+               rest_client=None):
     """
     Args:
       osrel: OS release
       arch: Architecture
       catrel: Catalog release
+      catalog: ?
       pkgs_set_files: A dictionary of collections of pairs path / basename
+      lines_dict: ?
+      rest_client: the rest interface client
 
     An example:
     {
@@ -406,6 +386,7 @@
         self.pkgs_by_basename.setdefault(base_name, {})
         self.pkgs_by_basename[base_name].setdefault(base_path, set())
         self.pkgs_by_basename[base_name][base_path].add(pkgname)
+    self.rest_client = rest_client
 
   def GetErrors(self):
     return self.__errors
@@ -417,9 +398,8 @@
 
   def GetPathsAndPkgnamesByBasename(self, basename):
     """Proxies calls to class member."""
-    catalog_paths = self.catalog.GetPathsAndPkgnamesByBasename(
-        basename, self.osrel, self.arch, self.catrel)
-    paths_and_pkgs = copy.deepcopy(catalog_paths)
+    paths_and_pkgs = self.rest_client.GetPathsAndPkgnamesByBasename(
+      self.catrel, self.arch, self.osrel, basename)
     # Removing references to packages under test
     for catalog_path in paths_and_pkgs:
       for pkgname in self.pkg_set_files:
@@ -446,9 +426,9 @@
       if file_path in self.pkgs_by_file:
         for pkg in self.pkgs_by_file[file_path]:
           pkgs.add(pkg)
-      logging_response = pprint.pformat(pkgs)
-      logging.debug("GetPkgByPath(%s).AndReturn(%s)"
-                    % (file_path, logging_response))
+      # logging_response = pprint.pformat(pkgs)
+      # logging.debug("GetPkgByPath(%s).AndReturn(%s)"
+      #               % (file_path, logging_response))
       self.pkgs_by_path_cache[key] = pkgs
     return self.pkgs_by_path_cache[key]
 
@@ -512,21 +492,24 @@
     checkpkg_tag = tag.CheckpkgTag(pkgname, tag_name, tag_info, msg=msg)
     self.AddError(checkpkg_tag)
 
+  def GetElfdumpInfo(self, md5_sum):
+    return self.rest_client.GetBlob('elfinfo', md5_sum)
 
+
 class IndividualCheckInterface(CheckInterfaceBase):
   """To be passed to the checking functions.
 
   Wraps the creation of tag.CheckpkgTag objects.
   """
 
-  def __init__(self, pkgname, osrel, arch, catrel, catalog, pkg_set_files):
+  def __init__(self, pkgname, osrel, arch, catrel, catalog, pkg_set_files, rest_client):
     super(IndividualCheckInterface, self).__init__(
-        osrel, arch, catrel, catalog, pkg_set_files)
+        osrel, arch, catrel, catalog, pkg_set_files, rest_client=rest_client)
     self.pkgname = pkgname
 
   def ReportError(self, tag_name, tag_info=None, msg=None):
-    logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s)",
-                  repr(tag_name), repr(tag_info), repr(msg))
+    # logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s)",
+    #               repr(tag_name), repr(tag_info), repr(msg))
     self.ReportErrorForPkgname(
         self.pkgname, tag_name, tag_info, msg=msg)
 
@@ -542,8 +525,9 @@
 class SetCheckInterface(CheckInterfaceBase):
   """To be passed to set checking functions."""
 
-  def __init__(self, osrel, arch, catrel, catalog, pkg_set_files):
-    super(SetCheckInterface, self).__init__(osrel, arch, catrel, catalog, pkg_set_files)
+  def __init__(self, osrel, arch, catrel, catalog, pkg_set_files, rest_client):
+    super(SetCheckInterface, self).__init__(
+      osrel, arch, catrel, catalog, pkg_set_files, rest_client=rest_client)
 
   def NeedFile(self, pkgname, full_path, reason):
     "See base class _NeedFile."
@@ -554,9 +538,9 @@
     self._NeedPackage(pkgname, needed_pkg, reason)
 
   def ReportError(self, pkgname, tag_name, tag_info=None, msg=None):
-    logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s, %s)",
-                  repr(pkgname),
-                  repr(tag_name), repr(tag_info), repr(msg))
+    # logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s, %s)",
+    #               repr(pkgname),
+    #               repr(tag_name), repr(tag_info), repr(msg))
     self.ReportErrorForPkgname(pkgname, tag_name, tag_info, msg)
 
 
@@ -568,16 +552,16 @@
     self.gar_lines = []
 
   def Message(self, m):
-    logging.debug("self.messenger.Message(%s)", repr(m))
+    # logging.debug("self.messenger.Message(%s)", repr(m))
     self.messages.append(m)
 
   def OneTimeMessage(self, key, m):
-    logging.debug("self.messenger.OneTimeMessage(%s, %s)", repr(key), repr(m))
+    # logging.debug("self.messenger.OneTimeMessage(%s, %s)", repr(key), repr(m))
     if key not in self.one_time_messages:
       self.one_time_messages[key] = m
 
   def SuggestGarLine(self, m):
-    logging.debug("self.messenger.SuggestGarLine(%s)", repr(m))
+    # logging.debug("self.messenger.SuggestGarLine(%s)", repr(m))
     self.gar_lines.append(m)
 
 
@@ -606,6 +590,7 @@
     if self.checks_registered:
       logging.debug("Checks already registered.")
       return
+    from lib.python import package_checks
     checkpkg_module = package_checks
     members = dir(checkpkg_module)
     for member_name in members:
@@ -822,6 +807,18 @@
         new_missing_dep_groups.add(frozenset(new_missing_deps_group))
     return new_missing_dep_groups
 
+  def _ExaminedFilesByPkg(self, pkgs_data):
+    examined_files_by_pkg = {}
+    for pkg_data in pkgs_data:
+      pkgname = pkg_data["basic_stats"]["pkgname"]
+      examined_files_by_pkg.setdefault(pkgname, set())
+      for entry in pkg_data["pkgmap"]:
+        if "path" in entry and entry["path"]:
+          base_path, base_name = os.path.split(entry["path"])
+          examined_files_by_pkg[pkgname].add((base_path, base_name))
+    return examined_files_by_pkg
+
+
   def GetAllTags(self, stats_obj_list):
     errors = {}
     catalog = Catalog()
@@ -839,19 +836,13 @@
     pbar.start()
     declared_deps_by_pkgname = {}
     # Build a map between packages and files:
-    examined_files_by_pkg = {}
-    for pkg_data in pkgs_data:
-      pkgname = pkg_data["basic_stats"]["pkgname"]
-      examined_files_by_pkg.setdefault(pkgname, set())
-      for entry in pkg_data["pkgmap"]:
-        if "path" in entry and entry["path"]:
-          base_path, base_name = os.path.split(entry["path"])
-          examined_files_by_pkg[pkgname].add((base_path, base_name))
+    examined_files_by_pkg = self._ExaminedFilesByPkg(pkgs_data)
     # Running individual checks
     for pkg_data in pkgs_data:
       pkgname = pkg_data["basic_stats"]["pkgname"]
       check_interface = IndividualCheckInterface(
-          pkgname, self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg)
+          pkgname, self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg,
+          rest_client=self.rest_client)
       for function in self.individual_checks:
         logger = logging.getLogger("%s-%s" % (pkgname, function.__name__))
         logger.debug("Calling %s", function.__name__)
@@ -879,7 +870,8 @@
     for function in self.set_checks:
       logger = logging.getLogger(function.__name__)
       check_interface = SetCheckInterface(
-          self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg)
+          self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg,
+          rest_client=self.rest_client)
       logger.debug("Calling %s", function.__name__)
       function(pkgs_data, check_interface, logger=logger, messenger=messenger)
       if check_interface.errors:
@@ -887,12 +879,11 @@
       needed_files.extend(check_interface.needed_files)
       needed_pkgs.extend(check_interface.needed_pkgs)
     check_interface = SetCheckInterface(
-        self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg)
+        self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg,
+        rest_client=self.rest_client)
     self._ReportDependencies(check_interface,
         needed_files, needed_pkgs, messenger, declared_deps_by_pkgname)
     errors = self.SetErrorsToDict(check_interface.errors, errors)
-    # open("/home/maciej/debug.py", "w").write(pprint.pformat(
-    #     (needed_files, needed_pkgs, pkgname, declared_deps_by_pkgname)))
     messages = messenger.messages + messenger.one_time_messages.values()
     return errors, messages, messenger.gar_lines
 
@@ -1044,6 +1035,8 @@
     # Memoization won't buy us much.  Perhaps we can fetch all the files
     # belonging to the same package, so that we quickly prepopulate the cache.
 
+    # TODO(maciej): Move this to models.py and have pkgdb_web return the JSON
+    # structure. This is a step towards RESTification.
     key = (full_file_path, osrel, arch, catrel)
     if key not in self.pkgs_by_path_cache:
       file_path, basename = os.path.split(full_file_path)
@@ -1057,7 +1050,7 @@
           oac,
           m.CswFile.q.path==file_path,
           m.CswFile.q.basename==basename,
-          m.Srv4FileStats.q.registered==True)
+          m.Srv4FileStats.q.registered_level_two==True)
       join = [
           sqlbuilder.INNERJOINOn(None,
             m.Srv4FileStats,
@@ -1134,7 +1127,7 @@
     if not who:
       who = 'unknown'
     # There are only i386 and sparc catalogs.
-    if arch != 'i386' and arch != 'sparc':
+    if arch not in ('i386', 'sparc'):
       raise CatalogDatabaseError("Wrong architecture: %s" % arch)
     sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad(
         osrel, arch, catrel)
@@ -1143,7 +1136,7 @@
           "Specified package does not match the catalog. "
           "Package: %s, catalog: %s %s %s"
           % (sqo_srv4, osrel, arch, catrel))
-    if not sqo_srv4.registered:
+    if not sqo_srv4.registered_level_two:
       raise CatalogDatabaseError(
           "Package %s (%s) is not registered for releases."
           % (sqo_srv4.basename, sqo_srv4.md5_sum))
@@ -1176,12 +1169,12 @@
             m.Srv4FileInCatalog.q.catrel==sqo_catrel,
             m.Srv4FileInCatalog.q.srv4file==sqo_srv4))
     if res.count():
-      logging.warning("%s is already part of %s %s %s",
+      logging.debug("%s is already part of %s %s %s",
                       sqo_srv4, osrel, arch, catrel)
       # Our srv4 is already part of that catalog.
       return
     # SQL INSERT happens here.
-    obj = m.Srv4FileInCatalog(
+    m.Srv4FileInCatalog(
         arch=sqo_arch,
         osrel=sqo_osrel,
         catrel=sqo_catrel,

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -6,27 +6,31 @@
 except ImportError:
   import unittest
 
-import checkpkg_lib
-import common_constants
+import pprint
+
+import cjson
 import copy
 import cPickle
-import database
-import inspective_package
-import models
+import hashlib
 import mox
-import package_stats
-import package_stats
 import pprint
 import re
 import sqlite3
 import sqlobject
-import tag
-import test_base
-from testdata import stubs
 
-from testdata.neon_stats import pkgstats as neon_stats
+from lib.python import checkpkg_lib
+from lib.python import common_constants
+from lib.python import database
+from lib.python import models
+from lib.python import package_stats
+from lib.python import relational_util
+from lib.python import tag
+from lib.python import rest
+from lib.python import test_base
+from lib.python.testdata import neon_stats
+from lib.python.testdata import stubs
+from lib.web import releases_web
 
-
 class CheckpkgManager2UnitTest(mox.MoxTestBase):
 
   def testSingleTag(self):
@@ -100,7 +104,7 @@
     stat_obj = self.mox.CreateMockAnything()
     data_obj = self.mox.CreateMockAnything()
     stat_obj.data_obj = data_obj
-    pkg_stats = copy.deepcopy(neon_stats[0])
+    pkg_stats = copy.deepcopy(neon_stats.pkgstats)
     # Resetting the dependencies so that it doesn't report surplus deps.
     pkg_stats["depends"] = []
     data_obj.pickle = cPickle.dumps(pkg_stats)
@@ -343,42 +347,107 @@
 
 
 class CheckpkgManager2DatabaseIntegrationTest(
-    test_base.SqlObjectTestMixin, unittest.TestCase):
+    test_base.SqlObjectTestMixin, mox.MoxTestBase):
 
+  def SetUpStatsForTesting(self, pkgstat_module):
+    for md5_sum, data in pkgstat_module.pkgstats[0]['elfdump_info'].iteritems():
+      json = cjson.encode(data)
+      content_hash = hashlib.md5()
+      content_hash.update(json)
+      models.ElfdumpInfoBlob(
+          md5_sum=md5_sum,
+          json=json,
+          content_md5_sum=content_hash.hexdigest(),
+          mime_type='application/json')
+    data = copy.deepcopy(pkgstat_module.pkgstats[0])
+    data['elf_callback'] = None
+    json = cjson.encode(data)
+    content_hash = hashlib.md5()
+    content_hash.update(json)
+    md5_sum = pkgstat_module.pkgstats[0]['basic_stats']['md5_sum']
+    models.Srv4FileStatsBlob(
+        md5_sum=md5_sum,
+        json=json,
+        content_md5_sum=content_hash.hexdigest(),
+        mime_type='application/json')
+
+    sqo_pkgstats, pkgstats = relational_util.StatsStructToDatabaseLevelOne(
+        md5_sum, False)
+    return sqo_pkgstats, pkgstats
+
+  def SetUpMockCalls(self, pkgstats_module, pkg_md5_sum, pkgstats):
+    # This is a stupid way of doing this. We would be better off with a fake.
+    pkgstats_pruned = copy.copy(pkgstats)
+    del pkgstats_pruned['elfdump_info']
+    md5_by_binary = {}
+    for bin_path, md5_sum in pkgstats['binary_md5_sums']:
+      md5_by_binary[bin_path] = md5_sum
+    self.rest_client_mock.GetBlob('pkgstats', pkg_md5_sum).AndReturn(
+            pkgstats_pruned)
+    for bin_path, _, _, sonames, _, _, _, _ in pkgstats['binaries_dump_info']:
+      for soname in sorted(sonames):
+        # self.rest_client_mock.GetBlob('elfinfo', md5_by_binary[bin_path])
+        self.rest_client_mock.GetPathsAndPkgnamesByBasename(
+            'unstable', 'sparc', 'SunOS5.9', soname).AndReturn({})
+      # for soname in sorted(sonames):
+      #   self.rest_client_mock.GetBlob('elfinfo', md5_by_binary[bin_path]).AndReturn(
+      #       pkgstats['elfdump_info'][md5_sum])
+    for binary_path, md5_sum in pkgstats['binary_md5_sums']:
+      data = pkgstats['elfdump_info'][md5_sum]
+      self.rest_client_mock.GetBlob(
+          'elfdump', md5_sum).AndReturn(data)
+
   def setUp(self):
     super(CheckpkgManager2DatabaseIntegrationTest, self).setUp()
-    self.mox = mox.Mox()
+    self.rest_client_mock = self.mox.CreateMock(rest.RestClient)
+    self.mox.StubOutWithMock(rest, 'RestClient')
+    rest.RestClient(
+        pkgdb_url=mox.IsA(str),
+        releases_url=mox.IsA(str)).AndReturn(
+            self.rest_client_mock)
 
-  def testInsertNeon(self):
-    self.dbc.InitialDataImport()
-    sqo_pkg = package_stats.PackageStats.SaveStats(neon_stats[0], True)
-    cm = checkpkg_lib.CheckpkgManager2(
-        "testname", [sqo_pkg], "SunOS5.9", "sparc", "unstable",
-        show_progress=False)
-    cm.Run()
-    # Verifying that there are some reported error tags.
-    self.assertTrue(list(models.CheckpkgErrorTag.select()))
+  # Broken test
+  # def testInsertNeon(self):
+  #   self.dbc.InitialDataImport()
+  #   sqo_pkg, pkgstats = self.SetUpStatsForTesting(neon_stats)
+  #   # self.rest_client_mock.GetPathsAndPkgnamesByBasename(
+  #   #     'unstable', 'sparc', 'SunOS5.9', 'libc.so.1').AndReturn({})
+  #   # self.SetUpMockCalls(neon_stats, 'ba3b78331d2ed321900e5da71f7714c5', pkgstats)
+  #   self.mox.ReplayAll()
+  #   cm = checkpkg_lib.CheckpkgManager2(
+  #       "testname", [sqo_pkg], "SunOS5.9", "sparc", "unstable",
+  #       show_progress=False)
+  #   cm.Run()
+  #   # Verifying that there are some reported error tags.
+  #   self.assertTrue(list(models.CheckpkgErrorTag.select()))
 
-  def testReRunCheckpkg(self):
-    """Error tags should not accumulate.
+  # Broken test
+  # def testReRunCheckpkg(self):
+  #   """Error tags should not accumulate.
 
-    FIXME(maciej): Figure out what's wrong with this one: It errors out.
-    """
-    self.dbc.InitialDataImport()
-    sqo_pkg = package_stats.PackageStats.SaveStats(neon_stats[0], True)
-    cm = checkpkg_lib.CheckpkgManager2(
-        "testname", [sqo_pkg], "SunOS5.9", "sparc", "unstable",
-        show_progress=False)
-    before_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
-    cm.Run()
-    first_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
-    cm.Run()
-    second_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
-    self.assertEquals(0, before_count)
-    self.assertEquals(first_run_count, second_run_count)
+  #   FIXME(maciej): Figure out what's wrong with this one: It errors out.
+  #   """
+  #   self.dbc.InitialDataImport()
+  #   sqo_pkg, pkgstats = self.SetUpStatsForTesting(neon_stats)
+  #   self.SetUpMockCalls(neon_stats, 'ba3b78331d2ed321900e5da71f7714c5', pkgstats)
+  #   self.SetUpMockCalls(neon_stats, 'ba3b78331d2ed321900e5da71f7714c5', pkgstats)
+  #   self.mox.ReplayAll()
+  #   cm = checkpkg_lib.CheckpkgManager2(
+  #       "testname", [sqo_pkg], "SunOS5.9", "sparc", "unstable",
+  #       show_progress=False)
+  #   before_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
+  #   cm.Run()
+  #   first_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
+  #   cm.Run()
+  #   second_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count()
+  #   self.assertEquals(0, before_count)
+  #   self.assertEquals(first_run_count, second_run_count)
 
 
 class IndividualCheckInterfaceUnitTest(mox.MoxTestBase):
+  def setUp(self):
+    super(IndividualCheckInterfaceUnitTest, self).setUp()
+    self.rest_client_mock = self.mox.CreateMock(rest.RestClient)
 
   def testNeededFile(self):
     catalog_mock = self.mox.CreateMock(checkpkg_lib.Catalog)
@@ -386,7 +455,7 @@
     # functions are called.
     self.mox.ReplayAll()
     ici = checkpkg_lib.IndividualCheckInterface(
-        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {})
+        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {}, None)
     ici.NeedFile("/opt/csw/bin/foo", "Because.")
     # This might look like encapsulation violation, but I think this is
     # a reasonable interface to that class.
@@ -413,7 +482,7 @@
         '/opt/csw/bin', 'AlienOS5.1', 'amd65', 'calcified').AndReturn(frozenset())
     self.mox.ReplayAll()
     ici = checkpkg_lib.IndividualCheckInterface(
-        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, pkg_set_files)
+        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, pkg_set_files, None)
     pkgs = ici.GetPkgByPath("/opt/csw/bin")
     self.assertEqual(frozenset(["CSWfoo"]), pkgs)
 
@@ -434,15 +503,17 @@
         "/opt/csw/bin": ["CSWbar"],
         "/opt/csw/share/unrelated": ["CSWbaz"],
     }
-    catalog_mock.GetPathsAndPkgnamesByBasename(
-        'foo', 'AlienOS5.1', 'amd65', 'calcified').AndReturn(in_catalog)
     expected = {
         "/opt/csw/bin": ["CSWfoo"],
         "/opt/csw/share/unrelated": ["CSWbaz"],
     }
+    self.rest_client_mock.GetPathsAndPkgnamesByBasename(
+        'calcified', 'amd65', 'AlienOS5.1', 'foo').AndReturn(in_catalog)
+    
     self.mox.ReplayAll()
-    ici = checkpkg_lib.IndividualCheckInterface(
-        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, pkg_set_files)
+    ici = checkpkg_lib.IndividualCheckInterface( 'CSWfoo', 'AlienOS5.1',
+        'amd65', 'calcified', catalog_mock, pkg_set_files,
+        self.rest_client_mock)
     paths_and_pkgnames = ici.GetPathsAndPkgnamesByBasename("foo")
     self.assertEqual(expected, paths_and_pkgnames)
 
@@ -452,7 +523,7 @@
     # functions are called.
     self.mox.ReplayAll()
     ici = checkpkg_lib.IndividualCheckInterface(
-        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {})
+        'CSWfoo', 'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {}, None)
     ici.NeedPackage("CSWbar", "Because foo needs bar")
     # This might look like encapsulation violation, but I think this is
     # a reasonable interface to that class.
@@ -471,7 +542,7 @@
     # functions are called.
     self.mox.ReplayAll()
     sci = checkpkg_lib.SetCheckInterface(
-        'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {})
+        'AlienOS5.1', 'amd65', 'calcified', catalog_mock, {}, None)
     sci.NeedFile("CSWfoo", "/opt/csw/bin/foo", "Because.")
     # This might look like encapsulation violation, but I think this is
     # a reasonable interface to that class.

Added: csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py
===================================================================
--- csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -0,0 +1,235 @@
+#!/opt/csw/bin/python2.6
+
+import hashlib
+import io
+import json
+import logging
+import optparse
+import os
+import sys
+import collections
+import mmap
+
+from elftools.elf.elffile import ELFFile
+from elftools.elf.constants import SUNW_SYMINFO_FLAGS
+from elftools.elf.enums import ENUM_E_MACHINE
+from elftools.elf.descriptions import (
+  describe_symbol_type, describe_symbol_bind,
+  describe_symbol_shndx, describe_syminfo_flags
+)
+from elftools.common.exceptions import ELFParseError
+
+from lib.python import configuration
+from lib.python import errors
+from lib.python import rest
+from lib.python import representations
+
+
+class ElfExtractor(object):
+
+  sh_type2name = {'SHT_SUNW_syminfo': 'syminfo', 'SHT_DYNSYM': 'symbols',
+                  'SHT_GNU_verneed': 'verneed', 'SHT_GNU_verdef': 'verdef',
+                  'SHT_GNU_versym': 'versym', 'SHT_DYNAMIC': 'dynamic'}
+
+  def __init__(self, binary_path, debug=False):
+    self.debug = debug
+    self._binary_path = binary_path
+    self.config = configuration.GetConfig()
+    self.rest_client = rest.RestClient(
+        pkgdb_url=self.config.get('rest', 'pkgdb'),
+        releases_url=self.config.get('rest', 'releases'))
+    fd = open(self._binary_path, 'rb')
+    self._mmap = mmap.mmap(fd.fileno(), 0, access=mmap.PROT_READ)
+    self._elffile = ELFFile(self._mmap)
+
+  def _compute_md5_sum(self):
+    md5_hash = hashlib.md5()
+    md5_hash.update(self._mmap)
+    return md5_hash.hexdigest()
+
+  def _get_sections_of_interest(self, *names):
+    """ Find and returns the given sections based on their short names
+    """
+    sections = {}
+    for section in self._elffile.iter_sections():
+      if section.header['sh_type'] in ElfExtractor.sh_type2name:
+        name = ElfExtractor.sh_type2name[section.header['sh_type']]
+        if name in names:
+          sections[name] = section
+
+    return sections
+
+  def _describe_symbol_shndx(self, shndx):
+    """ We use our own instead of the one provided by pyelftools.
+        This one resolves the section name if shndx is a section index
+        and it outputs the same string as elfdump in the other cases.
+    """
+    if isinstance(shndx, int):
+      try:
+        return self._elffile.get_section(shndx).name
+      except (ELFParseError, ValueError):
+        # The elf file is a bit corrupt, the shndx refers
+        # to a non-existing section. There are some existing
+        # binaries with this issue is the repository so
+        # we just skip the problem and return the section number
+        return str(shndx)
+    else:
+      return shndx[4:]
+
+  def _describe_symbol_boundto(self, syminfo):
+    """ We use our own instead of the one provided by pyelftools.
+        because we only want here to display the related library
+        referenced in the dynamic section.
+    """
+    dynamic_section = self._elffile.get_section_by_name('.dynamic')
+    if syminfo['si_flags'] & SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER:
+      return dynamic_section.get_tag(syminfo['si_boundto']).sunw_filter
+    else:
+      return dynamic_section.get_tag(syminfo['si_boundto']).needed
+
+  def CollectBinaryElfinfo(self):
+    """Returns various informations symbol and versions present in elf header
+    We will analyse 5 sections:
+     - version definitions and
+       version needed: contains version interface defined for this binary
+                       and for each required soname, the version interfaces
+                       required
+     - symbol table: contains list of symbol name
+     - version symbol table: maps the symbol against version interface
+     - syminfo: contains special linking flags for each symbol
+    The amount of data might be too large for it to fit in memory at one time,
+    therefore the rest_client is passed to facilitate saving data.
+    """
+    md5_sum = self._compute_md5_sum()
+    if self.rest_client.BlobExists('elfdump', md5_sum):
+      logging.debug('We already have info about %r.', self._binary_path)
+      return md5_sum
+
+    sections = self._get_sections_of_interest('verneed', 'verdef',
+                                              'syminfo', 'symbols')
+    versions_needed = []
+    if 'verneed' in sections:
+      for verneed, vernaux_iter in sections['verneed'].iter_versions():
+        versions_needed.extend([{'index': vernaux['vna_other'],
+                                 'soname': verneed.name,
+                                 'version': vernaux.name}
+                                for vernaux in vernaux_iter])
+
+      versions_needed.sort(key=lambda x: x['index'])
+      for version in versions_needed:
+        del version['index']
+
+    version_definitions = []
+    if 'verdef' in sections:
+      for verdef, verdaux_iter in sections['verdef'].iter_versions():
+        version_name = verdaux_iter.next().name
+        dependencies = [x.name for x in verdaux_iter]
+        version_definitions.append({'index': verdef['vd_ndx'],
+                                    'version': version_name,
+                                    'dependencies': dependencies})
+
+      if version_definitions:
+        version_definitions.sort(key=lambda x: x['index'])
+        # the first "version definition" entry is the base soname
+        # we don't care about this information
+        version_definitions.pop(0)
+        for version in version_definitions:
+          del version['index']
+
+    symbols = []
+    if 'symbols' in sections:
+      versions_info = (version_definitions + versions_needed)
+      symbol_iter = sections['symbols'].iter_symbols()
+      # We skip the first symbol which is always the 'UNDEF' symbol entry
+      symbol_iter.next()
+      for index, sym in enumerate(symbol_iter, start=1):
+
+        symbol = {'bind': describe_symbol_bind(sym['st_info']['bind']),
+                  'shndx': self._describe_symbol_shndx(sym['st_shndx']),
+                  'symbol': sym.name,
+                  'flags': None, 'soname': None, 'version': None}
+
+        if 'versym' in sections:
+          versym = sections['versym'].get_symbol(index)
+          if not versym['ndx'] in ['VER_NDX_LOCAL', 'VER_NDX_GLOBAL']:
+            # if versym is 2 or more, it's an index on the version
+            # definition and version needed tables
+            version = versions_info[versym['ndx'] - 2]
+            symbol['version'] = version['version']
+            if 'soname' in version:
+              symbol['soname'] = version['soname']
+
+        if 'syminfo' in sections:
+          syminfo = sections['syminfo'].get_symbol(index)
+          # We only use the information from syminfo if:
+          # - there is at least one flag that uses the boundto value,
+          # - boundto is an index and not special value (SYMINFO_BT_SELF...)
+          if (syminfo['si_flags'] & (
+                SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT |
+                SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND |
+                SUNW_SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD |
+                SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER)
+              and isinstance(syminfo['si_boundto'], int)):
+            symbol['flags'] = describe_syminfo_flags(syminfo['si_flags'])
+            symbol['soname'] = self._describe_symbol_boundto(syminfo)
+
+        symbols.append(representations.ElfSymInfo(**symbol))
+
+      symbols.sort(key=lambda m: m.symbol)
+
+    binary_info = {'version definition': version_definitions,
+                   'version needed': versions_needed,
+                   'symbol table': symbols}
+    self.rest_client.SaveBlob('elfdump', md5_sum, binary_info)
+    return md5_sum
+
+  def CollectBinaryDumpinfo(self):
+    """Returns informations about soname and runpath located in
+       the dynamic section.
+    """
+    binary_dump_info = {'needed_sonames': [],
+                        'runpath': [],
+                        'rpath': [],
+                        'soname': None}
+
+    sections = self._get_sections_of_interest('dynamic')
+    if 'dynamic' in sections:
+
+      for dyn_tag in sections['dynamic'].iter_tags():
+        if dyn_tag['d_tag'] == 'DT_NEEDED':
+          binary_dump_info['needed_sonames'].append(dyn_tag.needed)
+        elif dyn_tag['d_tag'] == 'DT_RUNPATH':
+          binary_dump_info['runpath'].extend(dyn_tag.runpath.split(':'))
+        elif dyn_tag['d_tag'] == 'DT_RPATH':
+          binary_dump_info['rpath'].extend(dyn_tag.rpath.split(':'))
+        elif dyn_tag['d_tag'] == 'DT_SONAME':
+          binary_dump_info['soname'] = dyn_tag.soname
+
+    return binary_dump_info
+
+  def GetMachineIdOfBinary(self):
+    e_machine = self._elffile.header['e_machine']
+    if e_machine not in ENUM_E_MACHINE:
+      logging.warning('%r not found in ENUM_E_MACHINE in elftools; '
+                      'resetting to EM_NONE', e_machine)
+      e_machine = 'EM_NONE'
+    return ENUM_E_MACHINE[e_machine]
+
+
+if __name__ == '__main__':
+  parser = optparse.OptionParser()
+  parser.add_option("-i", "--input", dest="input_file",
+                    help="Input file")
+  parser.add_option("--debug", dest="debug",
+                    action="store_true", default=False)
+  options, args = parser.parse_args()
+  if not options.input_file:
+    sys.stdout.write("Please provide input file name. See --help\n")
+    sys.exit(1)
+  logging.basicConfig(level=logging.DEBUG)
+  extractor = ElfExtractor(options.input_file, debug=options.debug)
+  md5_sum = extractor.CollectBinaryElfinfo()
+  return_struct = {
+      'md5_sum': md5_sum,
+  }
+  print(json.dumps(return_struct, indent=2))


Property changes on: csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py
===================================================================
--- csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -0,0 +1,622 @@
+#!/opt/csw/bin/python2.6
+
+import cjson
+import copy
+import datetime
+import hashlib
+import logging
+import optparse
+import os
+import re
+import shutil
+import sys
+import tempfile
+import time
+
+from lib.python import common_constants
+from lib.python import configuration
+from lib.python import opencsw
+from lib.python import overrides
+from lib.python import pkgmap
+from lib.python import rest
+from lib.python import sharedlib_utils
+from lib.python import shell
+from lib.python import util
+from lib.python import representations
+
+ADMIN_FILE_CONTENT = """
+basedir=default
+runlevel=nocheck
+conflict=nocheck
+setuid=nocheck
+action=nocheck
+partial=nocheck
+instance=unique
+idepend=quit
+rdepend=quit
+space=quit
+authentication=nocheck
+networktimeout=10
+networkretries=5
+keystore=/var/sadm/security
+proxy=
+"""
+
+BAD_CONTENT_REGEXES = (
+    # Slightly obfuscating these by using the default concatenation of
+    # strings.
+    r'/export' r'/home',
+    r'/export' r'/medusa',
+    r'/opt' r'/build',
+    r'/usr' r'/local',
+    r'/usr' r'/share',
+)
+
+
+class Error(Exception):
+  """Generic error."""
+
+
+class ShellCommandError(Error):
+  """A problem with running a binary."""
+
+
+class Unpacker(object):
+  """Responsible for unpacking the package and extracting data.
+
+  The functionality of this class used to be split among 3 classes in the old
+  code base: Package, InspectivePackage and PackageStats.
+  """
+  STATS_VERSION = 13L
+  
+  def __init__(self, pkg_path, debug):
+    self.debug = debug
+    self.pkg_path = pkg_path
+    self._work_dir = None
+    self._admin_file = None
+    self._gunzipped_path = None
+    self._md5_sum = None
+    self._stat = None
+    self._mtime = None
+    self._transformed = False
+    self._pkgname = None
+    self._pkginfo_dict = None
+    self._dir_format_base_dir = None
+    self._files_metadata = None
+    self._binaries = None
+    self._file_paths = None
+    self.config = configuration.GetConfig()
+    self.rest_client = rest.RestClient(
+        pkgdb_url=self.config.get('rest', 'pkgdb'),
+        releases_url=self.config.get('rest', 'releases'))
+
+  def __del__(self):
+    self.Cleanup()
+
+  def __repr__(self):
+    return u"Unpacker(%s)" % repr(self.pkg_path)
+
+  def Cleanup(self):
+    if self._work_dir and shutil:
+      logging.debug("Removing %r", self._work_dir)
+      shutil.rmtree(self._work_dir)
+      self._work_dir = None
+
+  @property
+  def work_dir(self):
+    if not self._work_dir:
+      self._work_dir = tempfile.mkdtemp(prefix="pkg_", dir="/var/tmp")
+    return self._work_dir
+
+  @property
+  def admin_file_path(self):
+    if self._admin_file is None:
+      self._admin_file = os.path.join(self.work_dir, "admin")
+      with open(self._admin_file, "w") as fd:
+        fd.write(ADMIN_FILE_CONTENT)
+    return self._admin_file
+
+  @property
+  def md5_sum(self):
+    if self._md5_sum is None:
+      logging.debug("md5_sum: reading file %r", self.pkg_path)
+      md5_hash = hashlib.md5()
+      with open(self.pkg_path) as fp:
+        # Chunking the data reads to avoid reading huge packages into memory at
+        # once.
+        chunk_size = 2 * 1024 * 1024
+        data = fp.read(chunk_size)
+        while data:
+          md5_hash.update(data)
+          data = fp.read(chunk_size)
+      self._md5_sum = md5_hash.hexdigest()
+    return self._md5_sum
+
+  @property
+  def stat(self):
+    if self._stat is None:
+      self._stat = os.stat(self.pkg_path)
+    return self._stat
+
+  @property
+  def size(self):
+    return self.stat.st_size
+
+  @property
+  def mtime(self):
+    """The mtime of the svr4 file.
+
+    Returns: a datetime.datetime object (not encodable with json!).
+    """
+    if self._mtime is None:
+      s = self.stat
+      t = time.gmtime(s.st_mtime)
+      self._mtime = datetime.datetime(*t[:6])
+    return self._mtime
+
+  def _Gunzip(self):
+    """Gunzipping the package."""
+    gzip_suffix = ".gz"
+    pkg_suffix = ".pkg"
+    if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)):
+      # Causing the class to stat the .gz file.  This call throws away the
+      # result, but the result will be cached as a object member.
+      self.mtime
+      self.md5_sum
+      base_name = os.path.split(self.pkg_path)[1][:(-len(gzip_suffix))]
+      self._gunzipped_path = os.path.join(self.work_dir, base_name)
+      with open(self._gunzipped_path, 'w') as gunzipped_file:
+        args = ["gunzip", "-f", "-c", self.pkg_path]
+        unused_ret_code, _, _ = shell.ShellCommand(args, stdout=gunzipped_file)
+    elif self.pkg_path.endswith(pkg_suffix):
+      self._gunzipped_path = self.pkg_path
+    else:
+      raise Error("The file name should end in either "
+                  "%s or %s, but it's %s."
+                  % (gzip_suffix, pkg_suffix, repr(self.pkg_path)))
+
+  @property
+  def gunzipped_path(self):
+    if self._gunzipped_path is None:
+      self._Gunzip()
+    return self._gunzipped_path
+
+  @property
+  def pkgname(self):
+    """It's necessary to figure out the pkgname from the .pkg file.
+    # nawk 'NR == 2 {print $1; exit;} $f
+    """
+    if self._pkgname is None:
+      gunzipped_path = self.gunzipped_path
+      args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path]
+      ret_code, stdout, stderr = shell.ShellCommand(args)
+      self._pkgname = stdout.strip()
+      logging.debug("GetPkgname(): %s", repr(self.pkgname))
+    return self._pkgname
+
+  def DirsInWorkdir(self):
+    """Directories present in self.work_dir."""
+    paths = os.listdir(self.work_dir)
+    dirs = []
+    for p in paths:
+      abspath = os.path.join(self.work_dir, p)
+      if os.path.isdir(abspath):
+        dirs.append(abspath)
+    return dirs
+
+  def _TransformToDir(self):
+    """Transforms the file to the directory format.
+
+    This uses the Pkgtrans function at the top, because pkgtrans behaves
+    differently on Solaris 8 and 10.  Having our own implementation helps
+    achieve consistent behavior.
+    """
+    if not self._transformed:
+      gunzipped_path = self.gunzipped_path
+      pkgname = self.pkgname
+      args = [os.path.join(os.path.dirname(__file__),
+                           "..", "..", "bin", "custom-pkgtrans"),
+              gunzipped_path, self.work_dir, pkgname]
+      shell.ShellCommand(args, allow_error=False)
+      dirs = self.DirsInWorkdir()
+      if len(dirs) != 1:
+        raise Error("Exactly one package in the package stream is expected; actual: "
+                    "%s." % (dirs))
+      self._transformed = True
+      self._dir_format_base_dir = os.path.join(self.work_dir, pkgname)
+
+  def GetPkginfoFilename(self):
+    return os.path.join(self._dir_format_base_dir, "pkginfo")
+
+  def GetParsedPkginfo(self):
+    if self._pkginfo_dict is None:
+      with open(self.GetPkginfoFilename(), "r") as pkginfo_fd:
+        self._pkginfo_dict = opencsw.ParsePkginfo(pkginfo_fd)
+    return self._pkginfo_dict
+
+  def GetBasedir(self):
+    basedir_id = "BASEDIR"
+    pkginfo = self.GetParsedPkginfo()
+    if basedir_id in pkginfo:
+      basedir = pkginfo[basedir_id]
+    else:
+      basedir = ""
+    # The convention in checkpkg is to not include the leading slash in paths.
+    basedir = basedir.lstrip("/")
+    return basedir
+
+  def GetCatalogname(self):
+    """Returns the catalog name of the package.
+
+    A bit hacky.  Looks for the first word of the NAME field in the package.
+    """
+    pkginfo = self.GetParsedPkginfo()
+    words = re.split(configuration.WS_RE, pkginfo["NAME"])
+    return words[0]
+
+  def GetBasicStats(self):
+    basic_stats = {}
+    basic_stats["stats_version"] = self.STATS_VERSION
+    basic_stats["pkg_path"] = self.pkg_path
+    basic_stats["pkg_basename"] = os.path.basename(self.pkg_path)
+    basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(
+        basic_stats["pkg_basename"])
+    basic_stats["pkgname"] = self.pkgname
+    basic_stats["catalogname"] = self.GetCatalogname()
+    basic_stats["md5_sum"] = self.md5_sum
+    basic_stats["size"] = self.size
+    return basic_stats
+
+  def _GetOverridesStream(self, file_path):
+    # This might potentially cause a file descriptor leak, but I'm not going to
+    # worry about that at this stage.
+    # NB, the whole catalog run doesn't seem to be suffering. (~2500 packages)
+    #
+    # There is a race condition here, but it's executing sequentially, I don't
+    # expect any concurrency problems.
+    if os.path.isfile(file_path):
+      logging.debug("Opening %s override file." % repr(file_path))
+      return open(file_path, "r")
+    else:
+      logging.debug("Override file %s not found." % repr(file_path))
+      return None
+
+  def _ParseOverridesStream(self, stream):
+    override_list = []
+    for line in stream:
+      if line.startswith("#"):
+        continue
+      override_list.append(overrides.ParseOverrideLine(line))
+    return override_list
+
+  def GetOverrides(self):
+    """Returns overrides, a list of overrides.Override instances."""
+    override_list = []
+    catalogname = self.GetCatalogname()
+    override_paths = (
+        [self._dir_format_base_dir,
+         "root",
+         "opt/csw/share/checkpkg/overrides", catalogname],
+        [self._dir_format_base_dir,
+         "install",
+         "checkpkg_override"],
+    )
+    for override_path in override_paths:
+      file_path = os.path.join(*override_path)
+      try:
+        with open(file_path, "r") as stream:
+          override_list.extend(self._ParseOverridesStream(stream))
+      except IOError as e:
+        logging.debug('Could not open %r: %s' % (file_path, e))
+    """Simple data structure with overrides."""
+    def OverrideToDict(override):
+      return {
+        "pkgname":  override.pkgname,
+        "tag_name":  override.tag_name,
+        "tag_info":  override.tag_info,
+      }
+    overrides_simple = [OverrideToDict(x) for x in override_list]
+    return overrides_simple
+
+  def GetDependencies(self):
+    """Gets dependencies information.
+
+    Returns:
+      A tuple of (list, list) of depends and i_depends.
+    """
+    # The collection of dependencies needs to be a list (as opposed to
+    # a set) because there might be duplicates and it's necessary to
+    # carry that information.
+    depends = []
+    i_depends = []
+    depend_file_path = os.path.join(self._dir_format_base_dir, "install", "depend")
+    try:
+      with open(depend_file_path, "r") as fd:
+        for line in fd:
+          fields = re.split(configuration.WS_RE, line)
+          if len(fields) < 2:
+            logging.warning("Bad depends line: %r", line)
+          if fields[0] == "P":
+            pkgname = fields[1]
+            pkg_desc = " ".join(fields[1:])
+            depends.append((pkgname, pkg_desc))
+          if fields[0] == "I":
+            pkgname = fields[1]
+            i_depends.append(pkgname)
+    except IOError as e:
+      logging.debug('Could not open %r: %s' % (depend_file_path, e))
+    return depends, i_depends
+
+  def CheckPkgpathExists(self):
+    if not os.path.isdir(self._dir_format_base_dir):
+      raise PackageError("%s does not exist or is not a directory"
+                         % self._dir_format_base_dir)
+
+  def GetPathsInSubdir(self, remove_prefix, subdir):
+    file_paths = []
+    for root, dirs, files in os.walk(os.path.join(self._dir_format_base_dir, subdir)):
+      full_paths = [os.path.join(root, f) for f in files]
+      file_paths.extend([f.replace(remove_prefix, "") for f in full_paths])
+    return file_paths
+
+  def GetAllFilePaths(self):
+    """Returns a list of all paths from the package."""
+    if self._file_paths is None:
+      # Support for relocatable packages
+      basedir = self.GetBasedir()
+      self.CheckPkgpathExists()
+      remove_prefix = "%s/" % self._dir_format_base_dir
+      self._file_paths = self.GetPathsInSubdir(remove_prefix, "root")
+      if self.RelocPresent():
+        self._file_paths += self.GetPathsInSubdir(remove_prefix, "reloc")
+    return self._file_paths
+
+  def GetFilesMetadata(self):
+    """Returns a data structure with all the files plus their metadata.
+
+    [
+      {
+        "path": ...,
+        "mime_type": ...,
+      },
+    ]
+    """
+    if not self._files_metadata:
+      self.CheckPkgpathExists()
+      self._files_metadata = []
+      files_root = self.GetFilesDir()
+      all_files = self.GetAllFilePaths()
+      file_magic = util.FileMagic()
+      basedir = self.GetBasedir()
+      for file_path in all_files:
+        full_path = unicode(self.MakeAbsolutePath(file_path))
+        file_info = util.GetFileMetadata(file_magic, self._dir_format_base_dir, full_path)
+        # To prevent files from containing the full temporary path.
+        file_info_dict = file_info._asdict()
+        file_info_dict["path"] = util.StripRe(file_path, util.ROOT_RE)
+        file_info = representations.FileMetadata(**file_info_dict)
+        self._files_metadata.append(file_info)
+      file_magic.Close()
+    return self._files_metadata
+
+  def RelocPresent(self):
+    return os.path.exists(os.path.join(self._dir_format_base_dir, "reloc"))
+
+  def GetFilesDir(self):
+    """Returns the subdirectory in which files, are either "reloc" or "root"."""
+    if self.RelocPresent():
+      return "reloc"
+    else:
+      return "root"
+
+  def MakeAbsolutePath(self, p):
+    return os.path.join(self._dir_format_base_dir, p)
+
+  def ListBinaries(self):
+    """Lists all the binaries from a given package.
+
+    Original checkpkg code:
+
+    #########################################
+    # find all executables and dynamic libs,and list their filenames.
+    listbinaries() {
+      if [ ! -d $1 ] ; then
+        print errmsg $1 not a directory
+        rm -rf $EXTRACTDIR
+        exit 1
+      fi
+      find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}'
+    }
+
+    Returns a list of absolute paths.
+
+    Now that there are files_metadata, this function can safely go away, once
+    all its callers are modified to use files_metadata instead.
+    """
+    if self._binaries is None:
+      self.CheckPkgpathExists()
+      files_metadata = self.GetFilesMetadata()
+      self._binaries = []
+      # The nested for-loop looks inefficient.
+      for file_info in files_metadata:
+        if sharedlib_utils.IsBinary(file_info._asdict()):
+          self._binaries.append(file_info.path)
+      self._binaries.sort()
+    return self._binaries
+
+  def GetBinaryDumpInfo(self):
+    # Binaries. This could be split off to a separate function.
+    # man ld.so.1 for more info on this hack
+    basedir = self.GetBasedir()
+    binaries_dump_info = []
+    for binary in self.ListBinaries():
+      binary_abs_path = os.path.join(
+          self._dir_format_base_dir, self.GetFilesDir(), binary)
+      if basedir:
+        binary = os.path.join(basedir, binary)
+      
+      binaries_dump_info.append(util.GetBinaryDumpInfo(binary_abs_path, binary))
+
+    return binaries_dump_info
+
+  def GetObsoletedBy(self):
+    """Collects obsolescence information from the package if it exists
+
+    Documentation:
+    http://wiki.opencsw.org/obsoleting-packages
+
+    Returns:
+
+    A dictionary of "has_obsolete_info", "syntax_ok" and
+    "obsoleted_by" where obsoleted_by is a list of (pkgname,
+    catalogname) tuples and has_obsolete_info and syntax_ok are
+    booleans.
+
+    If the package has not been obsoleted or the package predates the
+    implementation of this mechanism, obsoleted_by is an empty list
+    and has_obsolete_info will be False.
+
+    If the package provides obsolescence information but the format of
+    the information is invalid, syntax_ok will be False and the list
+    may be empty.  It will always contain the valid entries.
+    """
+
+    has_obsolete_info = False
+    obsoleted_syntax_ok = True
+    obsoleted_by = []
+    obsoleted_by_path = os.path.join(self._dir_format_base_dir, "install", "obsolete")
+
+    if os.path.exists(obsoleted_by_path):
+      has_obsolete_info = True
+      with open(obsoleted_by_path, "r") as fd:
+        for line in fd:
+          fields = re.split(configuration.WS_RE, line)
+          if len(fields) < 2:
+            obsoleted_syntax_ok = False
+            logging.warning("Bad line in obsolete file: %s", repr(line))
+            continue
+          pkgname, catalogname = fields[0:2]
+          obsoleted_by.append((pkgname, catalogname))
+
+    return {
+        "syntax_ok": obsoleted_syntax_ok,
+        "obsoleted_by": obsoleted_by,
+        "has_obsolete_info": has_obsolete_info,
+    }
+
+  def GetPkgmap(self, analyze_permissions=False, strip=None):
+    fd = open(os.path.join(self._dir_format_base_dir, "pkgmap"), "r")
+    basedir = self.GetBasedir()
+    return pkgmap.Pkgmap(fd, analyze_permissions, strip, basedir)
+
+  def GetPkgchkOutput(self):
+    """Returns: (exit code, stdout, stderr)."""
+    if not self._transformed:
+        self._TransformToDir()
+    args = ["/usr/sbin/pkgchk", "-d", self.work_dir, self.pkgname]
+    return shell.ShellCommand(args)
+
+  def GetPkgchkData(self):
+    ret, stdout, stderr = self.GetPkgchkOutput()
+    data = {
+        'return_code': ret,
+        'stdout_lines': stdout.splitlines(),
+        'stderr_lines': stderr.splitlines(),
+    }
+    return data
+
+  def GetFilesContaining(self, regex_list):
+    full_paths = self.GetAllFilePaths()
+    files_by_pattern = {}
+    for full_path in full_paths:
+      content = open(self.MakeAbsolutePath(full_path), "rb").read()
+      for regex in regex_list:
+        if re.search(regex, content):
+          if regex not in files_by_pattern:
+            files_by_pattern[regex] = []
+          files_by_pattern[regex].append(full_path)
+    return files_by_pattern
+
+  def GetMainStatsStruct(self, binary_md5_sums):
+    basic_stats = self.GetBasicStats()
+    depends, i_depends = self.GetDependencies()
+    arch = basic_stats["parsed_basename"]["arch"]
+    pkg_stats = {
+        "basic_stats": basic_stats,
+        "depends": depends,
+        "i_depends": i_depends,
+        "overrides": self.GetOverrides(),
+        "pkginfo": self.GetParsedPkginfo(),
+        # GetIsaList returns a frozenset, but we need a list because of
+        # serializing to JSON.
+        "isalist": list(sharedlib_utils.GetIsalist(arch)),
+        # Data in json must be stored using simple structures such as numbers
+        # or strings. We cannot store a datetime.datetime object, we must
+        # convert it into a string.
+        "mtime": self.mtime.isoformat(),
+        "files_metadata": self.GetFilesMetadata(),
+        "binaries": self.ListBinaries(),
+        "binaries_dump_info": self.GetBinaryDumpInfo(),
+        "obsoleteness_info": self.GetObsoletedBy(),
+        "pkgmap": self.GetPkgmap().entries,
+        "pkgchk": self.GetPkgchkData(),
+        "bad_paths": self.GetFilesContaining(BAD_CONTENT_REGEXES),
+        "binary_md5_sums": binary_md5_sums,
+    }
+    return pkg_stats
+
+  def _CollectElfdumpData(self):
+    logging.debug("Elfdump data.")
+    binary_md5_sums = []
+    for binary in self.ListBinaries():
+      binary_abs_path = os.path.join(
+          self._dir_format_base_dir, self.GetFilesDir(), binary)
+      args = [os.path.join(os.path.dirname(__file__),
+                           'collect_binary_elfinfo.py'),
+              '--input', binary_abs_path]
+      se = None
+      if self.debug:
+        args.append('--debug')
+        se = sys.stderr
+      ret_code, stdout, stderr = shell.ShellCommand(args, stderr=se)
+      if ret_code:
+        raise ShellCommandError(stderr)
+      binary_data = cjson.decode(stdout)
+      binary_md5_sums.append((binary, binary_data['md5_sum']))
+    return binary_md5_sums
+
+
+  def CollectStats(self, force_unpack):
+    if force_unpack or not self.rest_client.BlobExists('pkgstats',
+                                                       self.md5_sum):
+      self._Gunzip()
+      self._TransformToDir()
+      binary_md5_sums = self._CollectElfdumpData()
+      main_struct = self.GetMainStatsStruct(binary_md5_sums)
+      self.rest_client.SaveBlob('pkgstats', self.md5_sum, main_struct)
+      return True
+    return False
+
+
+if __name__ == '__main__':
+  parser = optparse.OptionParser()
+  parser.add_option("-i", "--input", dest="input_file",
+                    help="Input file")
+  parser.add_option("--force-unpack", dest="force_unpack",
+                    action="store_true", default=False)
+  parser.add_option("--debug", dest="debug",
+                    action="store_true", default=False)
+  options, args = parser.parse_args()
+  if not options.input_file:
+    sys.stdout.write("Please provide an input file name. See --help\n")
+    sys.exit(1)
+  logging.basicConfig(level=logging.DEBUG)
+  unpacker = Unpacker(options.input_file, debug=options.debug)
+  unpacked = unpacker.CollectStats(force_unpack=options.force_unpack)
+  unpacker.Cleanup()
+  data_back = {
+      "md5_sum": unpacker.md5_sum,
+      "unpacked": bool(unpacked),
+  }
+  # Returning data to the master process.
+  print(cjson.encode(data_back))


Property changes on: csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: csw/mgar/gar/v2/lib/python/collect_pkg_metadata_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/collect_pkg_metadata_test.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/collect_pkg_metadata_test.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+import unittest
+
+
+
+if __name__ == '__main__':
+  unittest.main()


Property changes on: csw/mgar/gar/v2/lib/python/collect_pkg_metadata_test.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: csw/mgar/gar/v2/lib/python/compare_pkgs.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_pkgs.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/compare_pkgs.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1,70 +0,0 @@
-#!/opt/csw/bin/python2.6
-# coding=utf-8
-# vim:set sw=2 ts=2 sts=2 expandtab:
-#
-# Copyright (c) 2009 Maciej Blizi?ski
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by the
-# Free Software Foundation.
-
-"""Compares the contents of two svr4 packages.
-
-The needed opencsw.py library is now at:
-https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/
-
-$Id: compare_pkgs.py 124 2010-02-18 07:28:10Z wahwah $
-"""
-
-import logging
-import optparse
-import opencsw
-import package
-
-USAGE = """Compares two packages with the same catalogname.
-
-To use, place packages (say, foo-1.0,REV=1898.09.25-SunOS5.9-sparc-CSW.pkg.gz
-and foo-1.0.1,REV=2010.09.25-SunOS5.9-sparc-CSW.pkg.gz) in two directories
-(say, /a and /b), and issue:
-
-  comparepkg --package-dir-a /a --package-dir-b /b --catalog-name foo
-"""
-
-def main():
-  parser = optparse.OptionParser(USAGE)
-  parser.add_option("-d", "--debug", dest="debug",
-                    default=False, action="store_true")
-  parser.add_option("-a", "--package-dir-a", dest="package_dir_a",
-                    help="Package directory A")
-  parser.add_option("-b", "--package-dir-b", dest="package_dir_b",
-                    help="Package directory B")
-  parser.add_option("-c", "--catalog-name", dest="catalog_name",
-                    help="Catalog name, for example 'cups'")
-  parser.add_option("-p", "--permissions", dest="permissions",
-                    help="Whether to analyze permission bits",
-                    default=False, action="store_true")
-  parser.add_option("", "--strip-a", dest="strip_a",
-                    help="Strip from paths in a")
-  parser.add_option("", "--strip-b", dest="strip_b",
-                    help="Strip from paths in b")
-  (options, args) = parser.parse_args()
-  if options.debug:
-    current_logging_level = logging.DEBUG
-  else:
-    current_logging_level = logging.INFO
-  logging.basicConfig(level=current_logging_level)
-  pkg_dir_a = opencsw.StagingDir(options.package_dir_a)
-  pkg_dir_b = opencsw.StagingDir(options.package_dir_b)
-  pkg_path_a = pkg_dir_a.GetLatest(options.catalog_name)[-1]
-  pkg_path_b = pkg_dir_b.GetLatest(options.catalog_name)[-1]
-  pc = package.PackageComparator(
-                         pkg_path_a,
-                         pkg_path_b,
-                         permissions=options.permissions,
-                         strip_a=options.strip_a,
-                         strip_b=options.strip_b)
-  pc.Run()
-
-
-if __name__ == '__main__':
-  main()

Deleted: csw/mgar/gar/v2/lib/python/compare_pkgs_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_pkgs_test.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/compare_pkgs_test.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1,66 +0,0 @@
-#!/opt/csw/bin/python2.6
-# coding=utf-8
-# vim:set sw=2 ts=2 sts=2 expandtab:
-
-"""
-The needed opencsw.py library is now at:
-https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/
-
-$Id: compare_pkgs_test.py 124 2010-02-18 07:28:10Z wahwah $
-"""
-
-import unittest
-import compare_pkgs as cpkg
-import opencsw
-
-PKGMAP_1 = """: 1 4407
-1 f none /etc/init.d/cswvncserver 0744 root sys 1152 21257 1048192898
-1 s none /etc/rc0.d/K36cswvncserver=../init.d/cswvncserver
-1 s none /etc/rc1.d/K36cswvncserver=../init.d/cswvncserver
-1 s none /etc/rc2.d/K36cswvncserver=../init.d/cswvncserver
-1 s none /etc/rc3.d/S92cswvncserver=../init.d/cswvncserver
-1 s none /etc/rcS.d/K36cswvncserver=../init.d/cswvncserver
-1 d none /opt/csw/bin 0755 root bin
-1 f none /opt/csw/bin/Xvnc 0755 root bin 1723040 56599 1048192381
-1 f none /opt/csw/bin/vncconnect 0755 root bin 5692 56567 1048192381
-1 f none /opt/csw/bin/vncpasswd 0755 root bin 15828 10990 1048192381
-1 d none /opt/csw/etc 0755 root bin
-1 d none /opt/csw/share 0755 root bin
-1 d none /opt/csw/share/man 0755 root bin
-1 d none /opt/csw/share/man/man1 0755 root bin
-1 f none /opt/csw/share/man/man1/Xvnc.1 0644 root bin 6000 15243 1028731374
-1 f none /opt/csw/share/man/man1/vncconnect.1 0644 root bin 1082 26168 1028731541
-1 f none /opt/csw/share/man/man1/vncpasswd.1 0644 root bin 2812 53713 1042812886
-1 f none /opt/csw/share/man/man1/vncserver.1 0644 root bin 3070 7365 1028731541
-1 d none /opt/csw/share/vnc 0755 root bin
-1 d none /opt/csw/share/vnc/classes 0755 root bin
-1 f none /opt/csw/share/vnc/classes/AuthPanel.class 0644 root bin 2458 21987 1048192130
-1 f none /opt/csw/share/vnc/classes/ButtonPanel.class 0644 root bin 3044 1240 1048192130
-1 f none /opt/csw/share/vnc/classes/ClipboardFrame.class 0644 root bin 2595 24223 1048192130
-1 f none /opt/csw/share/vnc/classes/DesCipher.class 0644 root bin 12745 33616 1048192130
-1 f none /opt/csw/share/vnc/classes/OptionsFrame.class 0644 root bin 6908 39588 1048192130
-1 f none /opt/csw/share/vnc/classes/RecordingFrame.class 0644 root bin 6101 7175 1048192130
-1 f none /opt/csw/share/vnc/classes/ReloginPanel.class 0644 root bin 1405 22871 1048192130
-1 f none /opt/csw/share/vnc/classes/RfbProto.class 0644 root bin 14186 29040 1048192130
-1 f none /opt/csw/share/vnc/classes/SessionRecorder.class 0644 root bin 2654 62139 1048192130
-1 f none /opt/csw/share/vnc/classes/SocketFactory.class 0644 root bin 342 23575 1048192130
-1 f none /opt/csw/share/vnc/classes/VncCanvas.class 0644 root bin 20927 18690 1048192130
-1 f none /opt/csw/share/vnc/classes/VncViewer.class 0644 root bin 13795 52263 1048192130
-1 f none /opt/csw/share/vnc/classes/VncViewer.jar 0644 root bin 47606 63577 1048192130
-1 f none /opt/csw/share/vnc/classes/index.vnc 0644 root bin 846 592 1048192130
-1 f none /opt/csw/share/vnc/vncserver.bin 0755 root bin 15190 2021 1048192092
-1 f none /opt/csw/share/vnc/vncservers.etc 0644 root sys 698 58245 1048192098
-1 i copyright 18000 30145 1048191525
-1 i depend 454 38987 1051394941
-1 i pkginfo 363 30834 1219230102
-1 i postinstall 827 2423 1048191525
-"""
-
-class PkgmapTest(unittest.TestCase):
-
-  def testPkgmap1(self):
-    lines = PKGMAP_1.splitlines()
-    p1 = opencsw.Pkgmap(lines)
-
-if __name__ == '__main__':
-  unittest.main()

Modified: csw/mgar/gar/v2/lib/python/configuration.py
===================================================================
--- csw/mgar/gar/v2/lib/python/configuration.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/configuration.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -46,7 +46,19 @@
     (USER_CONFIG_FILE_TMPL,        False)
 ]
 
+CONFIG_DEFAULTS = {
+    'host': '',
+    'user': '',
+    'password': '',
+    # Caching is disabled by default to conserve RAM. The buildfarm
+    # infrastructure is suffering from OutOfMemory errors on systems with
+    # e.g.  1GB or 1.5GB of RAM.
+    'cache': 'false',
+    'debug': 'false',
+    'debugOutput': 'false',
+}
 
+
 class Error(Exception):
   "Generic error."
 
@@ -70,7 +82,8 @@
 
 
 def GetConfig():
-  config = ConfigParser.SafeConfigParser()
+  # TODO(maciej): set defaults here in the constructor
+  config = ConfigParser.SafeConfigParser(CONFIG_DEFAULTS)
   file_was_found = False
   filenames_read = []
   for file_name_tmpl, default_file in CONFIGURATION_FILE_LOCATIONS:
@@ -83,7 +96,7 @@
         filename_found = file_name_tmpl % os.environ
         filenames_read.append(filename_found)
         config.read(filename_found)
-    except KeyError, e:
+    except KeyError as e:
       logging.warn(e)
   if not file_was_found:
     if HomeExists():
@@ -102,7 +115,13 @@
       config.set("database", "host", "")
       config.set("database", "user", "")
       config.set("database", "password", "")
-      config.set("database", "auto_manage", "yes")
+      if not config.has_section("rest"):
+        config.add_section("rest")
+      config.set("rest", "pkgdb", "http://localhost:8000")
+      config.set("rest", "releases", "http://localhost:8001")
+      if not config.has_section("buildfarm"):
+        config.add_section("buildfarm")
+      config.set("buildfarm", "catalog_root", "/export/opencsw")
       with open(config_file, "w") as fd:
         config.write(fd)
       logging.debug("Configuration has been written.")
@@ -115,21 +134,35 @@
   return config
 
 
-def ComposeDatabaseUri(config):
+def ComposeDatabaseUri(config, cache=False):
   db_data = {
       'db_type': config.get("database", "type"),
       'db_name': config.get("database", "name"),
       'db_host': config.get("database", "host"),
       'db_user': config.get("database", "user"),
-      'db_password': config.get("database", "password")}
-  logging.debug("db_name: %(db_name)s, db_user: %(db_user)s" % db_data)
+      'db_password': config.get("database", "password"),
+      'cache': config.get("database", "cache"),
+      'debug': config.get("database", "debug"),
+      'debugOutput': config.get("database", "debugOutput"),
+  }
+  display_db_data = dict(db_data)
+  display_db_data['db_password'] = '******'
+  logging.debug("db_data: %s" % display_db_data)
   if db_data["db_type"] == "mysql":
-    db_uri_tmpl = "%(db_type)s://%(db_user)s:%(db_password)s@%(db_host)s/%(db_name)s"
+    db_uri_tmpl = ("%(db_type)s://%(db_user)s:%(db_password)s@%(db_host)s/"
+                   "%(db_name)s?cache=%(cache)s")
   elif db_data["db_type"] == "sqlite":
-    db_uri_tmpl = "%(db_type)s://%(db_name)s"
+    connector = '://'
+    if db_data["db_name"] == ":memory:":
+      connector = ':/'
+    db_uri_tmpl = '%(db_type)s'
+    db_uri_tmpl += connector
+    db_uri_tmpl += '%(db_name)s?cache=%(cache)s'
+    db_uri_tmpl += '&debug=%(debug)s'
+    db_uri_tmpl += '&debugOutput=%(debugOutput)s'
   else:
     raise ConfigurationError(
-        "Database type %s is not supported" % repr(db_data["db_type"]))
+        "Database type %r is not supported" % db_data["db_type"])
   db_uri = db_uri_tmpl % db_data
   return db_uri
 
@@ -139,3 +172,6 @@
   db_uri = ComposeDatabaseUri(config)
   sqo_conn = sqlobject.connectionForURI(db_uri)
   sqlobject.sqlhub.processConnection = sqo_conn
+
+def TearDownSqlobjectConnection():
+  sqlobject.sqlhub.processConnection = None

Added: csw/mgar/gar/v2/lib/python/configuration_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/configuration_test.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/configuration_test.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -0,0 +1,46 @@
+#!/usr/bin/env python2.6
+
+import ConfigParser
+import unittest
+
+from lib.python import configuration
+
+class ConfigUnitTest(unittest.TestCase):
+
+  def testComposeURI1(self):
+    config = ConfigParser.SafeConfigParser(configuration.CONFIG_DEFAULTS)
+    config.add_section('database')
+    config.set('database', 'type', 'sqlite')
+    config.set('database', 'name', ':memory:')
+    self.assertEqual(
+        'sqlite:/:memory:?cache=false&debug=false&debugDisplay=false',
+        configuration.ComposeDatabaseUri(config))
+
+  def testComposeUriDebug(self):
+    config = ConfigParser.SafeConfigParser(configuration.CONFIG_DEFAULTS)
+    config.add_section('database')
+    config.set('database', 'type', 'sqlite')
+    config.set('database', 'name', ':memory:')
+    config.set('database', 'debug', 'true')
+    config.set('database', 'debugDisplay', 'true')
+    self.assertEqual(
+        'sqlite:/:memory:?cache=false&debug=true&debugDisplay=true',
+        configuration.ComposeDatabaseUri(config))
+
+  def testComposeUriDebugMysql(self):
+    config = ConfigParser.SafeConfigParser(configuration.CONFIG_DEFAULTS)
+    config.add_section('database')
+    config.set('database', 'type', 'mysql')
+    config.set('database', 'name', 'checkpkg')
+    config.set('database', 'host', 'localhost')
+    config.set('database', 'user', 'checkpkg_user')
+    config.set('database', 'password', 'secret')
+    config.set('database', 'debug', 'true')
+    config.set('database', 'cache', 'true')
+    self.assertEqual(
+        'mysql://checkpkg_user:secret at localhost/checkpkg?cache=true',
+        configuration.ComposeDatabaseUri(config))
+
+
+if __name__ == '__main__':
+  unittest.main()


Property changes on: csw/mgar/gar/v2/lib/python/configuration_test.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -7,25 +7,26 @@
 """
 
 from StringIO import StringIO
-import pycurl
+import getpass
+import hashlib
+import json
 import logging
 import optparse
-import hashlib
 import os.path
-import opencsw
-import json
-import common_constants
+import pycurl
+import rest
 import socket
-import rest
-import struct_util
 import subprocess
-import file_set_checker
 import sys
-import getpass
 import urllib2
 
-BASE_URL = "http://buildfarm.opencsw.org"
-RELEASES_APP = "/releases"
+import common_constants
+import configuration
+import errors
+import file_set_checker
+import opencsw
+import struct_util
+
 DEFAULT_CATREL = "unstable"
 USAGE = """%prog [ options ] <file1.pkg.gz> [ <file2.pkg.gz> [ ... ] ]
 
@@ -59,33 +60,25 @@
 http://wiki.opencsw.org/automated-release-process#toc0
 """
 
-class Error(Exception):
-  pass
+class PackageCheckError(errors.Error):
+  """A problem with a package."""
 
 
-class RestCommunicationError(Error):
-  pass
-
-
-class PackageCheckError(Error):
-  """A problem with the package."""
-
-
-class DataError(Error):
+class DataError(errors.Error):
   """Unexpected data found."""
 
 
-class WorkflowError(Error):
+class WorkflowError(errors.Error):
   """Unexpected state of workflow, e.g. expected element not found."""
 
 
-class OurInfrastructureSucksError(Error):
+class OurInfrastructureSucksError(errors.Error):
   """Something that would work in a perfect world, but here it doesn't."""
 
 
 class Srv4Uploader(object):
 
-  def __init__(self, filenames, rest_url, os_release=None, debug=False,
+  def __init__(self, filenames, os_release=None, debug=False,
       output_to_screen=True,
       username=None, password=None,
       catrel=DEFAULT_CATREL):
@@ -96,9 +89,10 @@
     self.md5_by_filename = {}
     self.debug = debug
     self.os_release = os_release
-    self.rest_url = rest_url
+    config = configuration.GetConfig()
     self._rest_client = rest.RestClient(
-        self.rest_url,
+        pkgdb_url=config.get('rest', 'pkgdb'),
+        releases_url=config.get('rest', 'releases'),
         username=username,
         password=password)
     self.output_to_screen = output_to_screen
@@ -142,13 +136,14 @@
     for filename in self.filenames:
       self._ImportMetadata(filename)
       md5_sum = self._GetFileMd5sum(filename)
+      self._rest_client.RegisterLevelTwo(md5_sum)
       file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum)
       if file_in_allpkgs:
         logging.debug("File %s already uploaded.", filename)
       else:
         if do_upload:
           logging.debug("Uploading %s.", filename)
-          self._PostFile(filename)
+          self._rest_client.PostFile(filename, md5_sum)
           # Querying the database again, this time the data should be
           # there
           file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum)
@@ -240,11 +235,7 @@
         try:
           srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname(
               catrel, arch, osrel, catalogname)
-          # To get the full information; the Srv4ByCatalogAndCatalogname
-          # return a smaller set of data.
-          srv4_in_catalog = self._rest_client.GetPkgByMd5(
-              srv4_in_catalog['md5_sum'])
-        except urllib2.HTTPError, e:
+        except urllib2.HTTPError:
           srv4_in_catalog = None
         if srv4_in_catalog:
           logging.debug("Catalog %s %s contains version %s of the %s package",
@@ -298,71 +289,8 @@
     return self._rest_client.AddSvr4ToCatalog(self.catrel, arch, osrel, md5_sum)
 
   def _GetSrv4FileMetadata(self, md5_sum):
-    logging.debug("_GetSrv4FileMetadata(%s)", repr(md5_sum))
-    url = self.rest_url + RELEASES_APP + "/srv4/" + md5_sum + "/"
-    c = pycurl.Curl()
-    d = StringIO()
-    h = StringIO()
-    c.setopt(pycurl.URL, url)
-    c.setopt(pycurl.WRITEFUNCTION, d.write)
-    c.setopt(pycurl.HEADERFUNCTION, h.write)
-    c = self._SetAuth(c)
-    if self.debug:
-      c.setopt(c.VERBOSE, 1)
-    c.perform()
-    http_code = c.getinfo(pycurl.HTTP_CODE)
-    logging.debug(
-        "curl getinfo: %s %s %s",
-        type(http_code),
-        http_code,
-        c.getinfo(pycurl.EFFECTIVE_URL))
-    c.close()
-    logging.debug("HTTP code: %s", http_code)
-    if http_code == 401:
-      raise RestCommunicationError("Received HTTP code {0}".format(http_code))
-    successful = (http_code >= 200 and http_code <= 299)
-    metadata = None
-    if successful:
-      metadata = json.loads(d.getvalue())
-    else:
-      logging.debug("Metadata for %s were not found in the database" % repr(md5_sum))
-    return successful, metadata
+    return self._rest_client.GetSrv4FileMetadataForReleases(md5_sum)
 
-  def _PostFile(self, filename):
-    if self.output_to_screen:
-      print "Uploading %s" % repr(filename)
-    md5_sum = self._GetFileMd5sum(filename)
-    c = pycurl.Curl()
-    d = StringIO()
-    h = StringIO()
-    url = self.rest_url + RELEASES_APP + "/srv4/"
-    c.setopt(pycurl.URL, url)
-    c.setopt(pycurl.POST, 1)
-    c = self._SetAuth(c)
-    post_data = [
-        ('srv4_file', (pycurl.FORM_FILE, filename)),
-        ('submit', 'Upload'),
-        ('md5_sum', md5_sum),
-        ('basename', os.path.basename(filename)),
-    ]
-    c.setopt(pycurl.HTTPPOST, post_data)
-    c.setopt(pycurl.WRITEFUNCTION, d.write)
-    c.setopt(pycurl.HEADERFUNCTION, h.write)
-    c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error
-    if self.debug:
-      c.setopt(c.VERBOSE, 1)
-    c.perform()
-    http_code = c.getinfo(pycurl.HTTP_CODE)
-    c.close()
-    if self.debug:
-      logging.debug("*** Headers")
-      logging.debug(h.getvalue())
-      logging.debug("*** Data")
-      logging.debug(d.getvalue())
-    logging.debug("File POST http code: %s", http_code)
-    if http_code >= 400 and http_code <= 499:
-      raise RestCommunicationError("%s - HTTP code: %s" % (url, http_code))
-
   def _CheckpkgSets(self, planned_modifications):
     """Groups packages according to catalogs.
 
@@ -404,6 +332,9 @@
                       % (repr(by_osrel),))
     return sorted_filenames
 
+  def _PluralS(self, number):
+    return 's' if number == 0 or number >= 2 else ''
+
   def _RunCheckpkg(self, checkpkg_sets):
     bin_dir = os.path.dirname(__file__)
     checkpkg_executable = os.path.join(bin_dir, "checkpkg")
@@ -414,8 +345,10 @@
     checks_failed_for_catalogs = []
     args_by_cat = {}
     for arch, osrel in checkpkg_sets:
-      print ("Checking %s package(s) against catalog %s %s %s"
-             % (len(checkpkg_sets[(arch, osrel)]), self.catrel, arch, osrel))
+      number_checked = len(checkpkg_sets[(arch, osrel)])
+      print ("Checking %s package%s against catalog %s %s %s"
+             % (number_checked, self._PluralS(number_checked),
+                self.catrel, arch, osrel))
       md5_sums = []
       basenames = []
       for filename, md5_sum in checkpkg_sets[(arch, osrel)]:
@@ -437,14 +370,14 @@
             (arch, osrel, basenames)
         )
     if checks_failed_for_catalogs:
-      print "Checks failed for catalogs:"
+      print "Checks failed for the following catalogs:"
       for arch, osrel, basenames in checks_failed_for_catalogs:
         print "  - %s %s" % (arch, osrel)
         for basename in basenames:
           print "    %s" % basename
-        print "To see errors, run:"
+        print "To see the errors, run:"
         print " ", " ".join(args_by_cat[(arch, osrel)])
-      print ("Packages have not been submitted to the %s catalog."
+      print ("Your packages have not been submitted to the %s catalog."
              % self.catrel)
     return not checks_failed_for_catalogs
 
@@ -458,10 +391,6 @@
       dest="os_release",
       help="If specified, only uploads to the specified OS release. "
            "Valid values: {0}".format(" ".join(common_constants.OS_RELS)))
-  parser.add_option("--rest-url",
-      dest="rest_url",
-      default=BASE_URL,
-      help="Base URL for REST, e.g. %s" % BASE_URL)
   parser.add_option("--no-filename-check",
       dest="filename_check",
       default=True, action="store_false",
@@ -503,7 +432,7 @@
 
   if os_release and os_release not in common_constants.OS_RELS:
     raise DataError(
-        "OS release %r is not valid. Valid values: %r"
+        "OS release %r is not valid. The valid values are: %r"
         % (os_release, common_constants.OS_RELS))
 
   username, password = rest.GetUsernameAndPassword()

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -6,11 +6,12 @@
 except ImportError:
   import unittest
 
-import csw_upload_pkg
 import mox
-import rest
 import copy
 
+from lib.python import csw_upload_pkg
+from lib.python import rest
+
 GDB_STRUCT_8 = {
     "arch": "sparc",
     "basename": "gdb-7.2,REV=2011.01.21-SunOS5.8-sparc-CSW.pkg.gz",
@@ -95,10 +96,17 @@
 
 class Srv4UploaderUnitTest(mox.MoxTestBase):
 
+  def MockRestClient(self, rest_client_mock):
+    rest.RestClient(password=None, username=None,
+                    pkgdb_url=mox.IsA(str),
+                    releases_url=mox.IsA(str),
+                    ).AndReturn(rest_client_mock)
+
+
   def test_MatchSrv4ToCatalogsSame(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -121,7 +129,7 @@
   def test_MatchSrv4ToCatalogsDifferent(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -144,7 +152,7 @@
     # uploading a 5.10 package.
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.10', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -164,7 +172,7 @@
   def test_MatchSrv4ToCatalogsSameSpecificOsrel(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -172,7 +180,7 @@
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_9)
     self.mox.ReplayAll()
-    su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10")
+    su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10")
     result = su._MatchSrv4ToCatalogs(
         "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz",
         "unstable", "sparc", "SunOS5.9",
@@ -185,7 +193,7 @@
   def test_MatchSrv4ToCatalogsAbsentFromAll(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -208,7 +216,7 @@
   def test_MatchSrv4ToCatalogsSameSpecificOsrelAlreadyPresent(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -216,7 +224,7 @@
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_10)
     self.mox.ReplayAll()
-    su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10")
+    su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10")
     result = su._MatchSrv4ToCatalogs(
         "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz",
         "unstable", "sparc", "SunOS5.9",
@@ -229,7 +237,7 @@
   def test_MatchSrv4ToCatalogsNotPresent(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_9)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -237,7 +245,7 @@
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(None)
     self.mox.ReplayAll()
-    su = csw_upload_pkg.Srv4Uploader(None, None, os_release="SunOS5.10")
+    su = csw_upload_pkg.Srv4Uploader(None, os_release="SunOS5.10")
     result = su._MatchSrv4ToCatalogs(
         "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz",
         "unstable", "sparc", "SunOS5.9",
@@ -250,7 +258,7 @@
   def test_MatchSrv4ToCatalogsFirstNotPresent(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(None)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -271,7 +279,7 @@
   def test_MatchSrv4ToCatalogsSolaris8(self):
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    self.MockRestClient(rest_client_mock)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
         'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_8)
     rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -340,7 +348,10 @@
     }
     rest_client_mock = self.mox.CreateMock(rest.RestClient)
     self.mox.StubOutWithMock(rest, "RestClient")
-    rest.RestClient(None, username=None, password=None).AndReturn(rest_client_mock)
+    rest.RestClient(password=None, username=None,
+                    pkgdb_url=mox.IsA(str),
+                    releases_url=mox.IsA(str),
+                    ).AndReturn(rest_client_mock)
     for i, os_n in enumerate(in_catalog, 3 - len(in_catalog)):
       pkg_struct = pkg_struct_map[os_n]
       rest_client_mock.Srv4ByCatalogAndCatalogname(
@@ -349,7 +360,7 @@
           u'SunOS5.%s' % (i + 9), 'gdb').AndReturn(pkg_struct)
     self.mox.ReplayAll()
     os_release_to_specify = "SunOS5.%s" % osrel_spec if osrel_spec else None
-    su = csw_upload_pkg.Srv4Uploader(None, None, os_release=os_release_to_specify)
+    su = csw_upload_pkg.Srv4Uploader(None, os_release=os_release_to_specify)
     result = su._MatchSrv4ToCatalogs(
         self.BASENAME,
         "unstable", "sparc", "SunOS5.%s" % pkg_osrel,
@@ -401,6 +412,19 @@
         su.SortFilenames,
         wrong_order)
 
+  def testPluralS0(self):
+    su = csw_upload_pkg.Srv4Uploader(None, None)
+    self.assertEqual('s', su._PluralS(0))
+
+  def testPluralS1(self):
+    su = csw_upload_pkg.Srv4Uploader(None, None)
+    self.assertEqual('', su._PluralS(1))
+
+  def testPluralSMany(self):
+    su = csw_upload_pkg.Srv4Uploader(None, None)
+    self.assertEqual('s', su._PluralS(2))
+
+
 class Srv4UploaderIntegrationUnitTest(mox.MoxTestBase):
 
   def testUploadOrder(self):
@@ -416,11 +440,12 @@
     import_metadata_mock = self.mox.StubOutWithMock(su, '_GetFileMd5sum')
     import_metadata_mock = self.mox.StubOutWithMock(su, '_ImportMetadata')
     import_metadata_mock = self.mox.StubOutWithMock(su, '_InsertIntoCatalog')
-    import_metadata_mock = self.mox.StubOutWithMock(su, '_PostFile')
     import_metadata_mock = self.mox.StubOutWithMock(su, '_GetSrv4FileMetadata')
     import_metadata_mock = self.mox.StubOutWithMock(su, '_MatchSrv4ToCatalogs')
     import_metadata_mock = self.mox.StubOutWithMock(su, '_RunCheckpkg')
     rest_mock = self.mox.CreateMock(rest.RestClient)
+    rest_mock.RegisterLevelTwo('md5-2')
+    rest_mock.RegisterLevelTwo('md5-1')
     su._rest_client = rest_mock
 
     # The 5.9 package

Modified: csw/mgar/gar/v2/lib/python/database.py
===================================================================
--- csw/mgar/gar/v2/lib/python/database.py	2014-02-17 15:25:11 UTC (rev 23036)
+++ csw/mgar/gar/v2/lib/python/database.py	2014-02-17 23:25:58 UTC (rev 23037)
@@ -1,36 +1,36 @@
 import socket
 import os
 import sqlobject
-import models as m
 import logging
-import common_constants
-import configuration
 import ConfigParser
 import time
-import system_pkgmap
 
+from lib.python import common_constants
+from lib.python import configuration
+from lib.python import models as m
+
 CONFIG_DB_SCHEMA = "db_schema_version"
 DB_SCHEMA_VERSION = 13L
-TABLES_THAT_NEED_UPDATES = (m.CswFile,)
 
 # This list of tables is sensitive to the order in which tables are created.

@@ 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 rmottola at opencsw.org  Tue Feb 18 00:36:43 2014
From: rmottola at opencsw.org (Riccardo Mottola)
Date: Tue, 18 Feb 2014 00:36:43 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <0A3C3C2D-D2BC-4121-B320-CE9966B00CA8@opencsw.org>
References: <53009CB3.5020106@opencsw.org>
	<83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>
	<5300CF59.1060708@opencsw.org>
	<0A3C3C2D-D2BC-4121-B320-CE9966B00CA8@opencsw.org>
Message-ID: <53029D0B.50801@opencsw.org>

Dagobert Michelsen wrote:
>> I notice that both v4 and v5 are required, it would be perhaps
> What for? If rebuilds are needed just drop a note and we can rebuild them.
>
This is what I get if I attempt a remove:

bash-4.2$ sudo pkgutil -r CSWlibffi4
Solving needed dependencies ...
Looking at installed packages ...
Examining dependencies for:
   CSWlibffi4 (in use)
   CSWlibgcc-s1 (in use)
   CSWcommon (in use)
Nothing to remove.



Riccardo


From rmottola at opencsw.org  Tue Feb 18 00:51:12 2014
From: rmottola at opencsw.org (Riccardo Mottola)
Date: Tue, 18 Feb 2014 00:51:12 +0100
Subject: libffi, missing symbolic link
In-Reply-To: <0A3C3C2D-D2BC-4121-B320-CE9966B00CA8@opencsw.org>
References: <53009CB3.5020106@opencsw.org>
	<83290F6D-9C75-4941-A011-986276DEFAA3@opencsw.org>
	<5300CF59.1060708@opencsw.org>
	<0A3C3C2D-D2BC-4121-B320-CE9966B00CA8@opencsw.org>
Message-ID: <5302A070.5060601@opencsw.org>

Hi,

Dagobert Michelsen wrote:
> I will try out as soon as the weekend ends and let you know! What happened then is that the upgrade did not install the -dev package.
I installed libffi_dev:
bash-4.2$ sudo pkgutil -l | grep ffi
CSWlibffi-dev
CSWlibffi4
CSWlibffi5

however, no link:
bash-4.2$ ls -l /opt/csw/lib/libffi*
lrwxrwxrwx   1 root     root          15 Dec 29 16:39 
/opt/csw/lib/libffi.so.4 -> libffi.so.4.0.1
-rwxr-xr-x   1 root     bin        50156 Sep 27 17:33 
/opt/csw/lib/libffi.so.4.0.1
lrwxrwxrwx   1 root     root          16 Apr  7  2013 
/opt/csw/lib/libffi.so.5 -> libffi.so.5.0.10
-rwxr-xr-x   1 root     bin        25000 Jun 25  2011 
/opt/csw/lib/libffi.so.5.0.10


Riccardo

From wahwah at users.sourceforge.net  Tue Feb 18 10:40:17 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 09:40:17 +0000
Subject: SF.net SVN: gar:[23038] csw/mgar/gar/v2/lib/python
Message-ID: <3fSxrF31ZyzsQ@mail.opencsw.org>

Revision: 23038
          http://sourceforge.net/p/gar/code/23038
Author:   wahwah
Date:     2014-02-18 09:40:16 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
pkgdb: User username and password for the rel app

The releases app requires user authentication.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg2.py
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py
    csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py
    csw/mgar/gar/v2/lib/python/rest.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py	2014-02-17 23:25:58 UTC (rev 23037)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py	2014-02-18 09:40:16 UTC (rev 23038)
@@ -146,9 +146,11 @@
       file_list.append(arg)
 
   config = configuration.GetConfig()
+  username, password = rest.GetUsernameAndPassword()
   rest_client = rest.RestClient(
       pkgdb_url=config.get('rest', 'pkgdb'),
-      releases_url=config.get('rest', 'releases'))
+      releases_url=config.get('rest', 'releases'),
+      username=username, password=password)
 
   if file_list:
     def MakeEntry(file_name):

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-17 23:25:58 UTC (rev 23037)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-18 09:40:16 UTC (rev 23038)
@@ -197,9 +197,12 @@
     self.individual_checks = []
     self.set_checks = []
     config = configuration.GetConfig()
+    username, password = rest.GetUsernameAndPassword()
     self.rest_client = rest.RestClient(
         pkgdb_url=config.get('rest', 'pkgdb'),
-        releases_url=config.get('rest', 'releases'))
+        releases_url=config.get('rest', 'releases'),
+        username=username,
+        password=password)
 
   def _ResetState(self):
     self.errors = []

Modified: csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py
===================================================================
--- csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py	2014-02-17 23:25:58 UTC (rev 23037)
+++ csw/mgar/gar/v2/lib/python/collect_binary_elfinfo.py	2014-02-18 09:40:16 UTC (rev 23038)
@@ -35,9 +35,12 @@
     self.debug = debug
     self._binary_path = binary_path
     self.config = configuration.GetConfig()
+    username, password = rest.GetUsernameAndPassword()
     self.rest_client = rest.RestClient(
         pkgdb_url=self.config.get('rest', 'pkgdb'),
-        releases_url=self.config.get('rest', 'releases'))
+        releases_url=self.config.get('rest', 'releases'),
+        username=username,
+        password=password)
     fd = open(self._binary_path, 'rb')
     self._mmap = mmap.mmap(fd.fileno(), 0, access=mmap.PROT_READ)
     self._elffile = ELFFile(self._mmap)

Modified: csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py
===================================================================
--- csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py	2014-02-17 23:25:58 UTC (rev 23037)
+++ csw/mgar/gar/v2/lib/python/collect_pkg_metadata.py	2014-02-18 09:40:16 UTC (rev 23038)
@@ -86,9 +86,12 @@
     self._binaries = None
     self._file_paths = None
     self.config = configuration.GetConfig()
+    username, password = rest.GetUsernameAndPassword()
     self.rest_client = rest.RestClient(
         pkgdb_url=self.config.get('rest', 'pkgdb'),
-        releases_url=self.config.get('rest', 'releases'))
+        releases_url=self.config.get('rest', 'releases'),
+        username=username,
+        password=password)
 
   def __del__(self):
     self.Cleanup()

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-17 23:25:58 UTC (rev 23037)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-18 09:40:16 UTC (rev 23038)
@@ -237,12 +237,39 @@
       ('md5_sum', md5_sum),
     ])
 
-  @retry_decorator.Retry(tries=4, delay=5,
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY,
                          exceptions=(RestCommunicationError, pycurl.error))
   def GetBlob(self, tag, md5_sum):
     url = self.releases_url + "/blob/%s/%s/" % (tag, md5_sum)
-    data = urllib2.urlopen(url).read()
-    return cjson.decode(data)
+    logging.warning('GetBlob() url=%r', url)
+    c = pycurl.Curl()
+    d = StringIO()
+    h = StringIO()
+    c.setopt(pycurl.URL, str(url))
+    c.setopt(pycurl.WRITEFUNCTION, d.write)
+    c.setopt(pycurl.HEADERFUNCTION, h.write)
+    c = self._SetAuth(c)
+    if self.debug:
+      c.setopt(c.VERBOSE, 1)
+    c.perform()
+    http_code = c.getinfo(pycurl.HTTP_CODE)
+    logging.warning(
+        "curl getinfo: %s %s %s",
+        type(http_code),
+        http_code,
+        c.getinfo(pycurl.EFFECTIVE_URL))
+    c.close()
+    logging.warning("HTTP code: %s", http_code)
+    if http_code == 401:
+      raise RestCommunicationError("Received HTTP code {0}".format(http_code))
+    successful = (http_code >= 200 and http_code <= 299)
+    metadata = None
+    if successful:
+      metadata = cjson.decode(d.getvalue())
+    else:
+      logging.warning("Blob %r for %r was not found in the database"
+                      % (tag, md5_sum))
+    return metadata
 
   def _HttpHeadRequest(self, url):
     """Make a HTTP HEAD request and return the http code."""
@@ -253,6 +280,7 @@
     c.setopt(pycurl.NOPROGRESS, 1)
     c.setopt(pycurl.NOBODY, 1)
     c.setopt(pycurl.HEADER, 1)
+    c = self._SetAuth(c)
     if self.debug:
       c.setopt(c.VERBOSE, 1)
     c.setopt(pycurl.WRITEFUNCTION, d.write)

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 Feb 18 10:40:28 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 09:40:28 +0000
Subject: SF.net SVN: gar:[23039] csw/mgar/gar/v2/lib/python/checkpkg_lib.py
Message-ID: <3fSxrN602Vztx@mail.opencsw.org>

Revision: 23039
          http://sourceforge.net/p/gar/code/23039
Author:   wahwah
Date:     2014-02-18 09:40:25 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
checkpkg: Prepare namedtuples with symbol info

This should be unified under LazyElfinfo.

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-18 09:40:16 UTC (rev 23038)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2014-02-18 09:40:25 UTC (rev 23039)
@@ -163,6 +163,16 @@
     return self.triad_cache[key]
 
 
+def ElfinfoBlobToStruct(elfdump_data):
+  # json doesn't preserve namedtuple so we do some post-processing
+  # to transform symbol info from List to NamedTuple
+  symbols = elfdump_data['symbol table']
+  for idx, symbol_as_list in enumerate(symbols):
+    symbols[idx] = representations.ElfSymInfo(*symbol_as_list)
+
+  return elfdump_data
+
+
 class LazyElfinfo(object):
   """Used at runtime for lazy fetches of elfdump info data."""
 
@@ -171,15 +181,9 @@
 
   def __getitem__(self, md5_sum):
     elfdump_data = self.rest_client.GetBlob('elfdump', md5_sum)
-    # json doesn't preserve namedtuple so we do some post-processing
-    # to transform symbol info from List to NamedTuple
-    symbols = elfdump_data['symbol table']
-    for idx, symbol_as_list in enumerate(symbols):
-      symbols[idx] = representations.ElfSymInfo(*symbol_as_list)
+    return ElfinfoBlobToStruct(elfdump_data)
 
-    return elfdump_data
 
-
 class CheckpkgManagerBase(SqlobjectHelperMixin):
   """Common functions between the older and newer calling functions."""
 
@@ -496,7 +500,8 @@
     self.AddError(checkpkg_tag)
 
   def GetElfdumpInfo(self, md5_sum):
-    return self.rest_client.GetBlob('elfinfo', md5_sum)
+    elfdump_data = self.rest_client.GetBlob('elfdump', md5_sum)
+    return ElfinfoBlobToStruct(elfdump_data)
 
 
 class IndividualCheckInterface(CheckInterfaceBase):

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 Feb 18 10:40:38 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 09:40:38 +0000
Subject: SF.net SVN: gar:[23040] csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <3fSxrb2kC6zyJ@mail.opencsw.org>

Revision: 23040
          http://sourceforge.net/p/gar/code/23040
Author:   wahwah
Date:     2014-02-18 09:40:35 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
checkpkg: Authenticate from build hosts

When running on the build host, checkpkg needs to reach to the login host to
get the credentials.

It's ugly, but it works for now.

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-18 09:40:25 UTC (rev 23039)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-18 09:40:35 UTC (rev 23040)
@@ -19,6 +19,7 @@
 
 from lib.python import configuration
 from lib.python import errors
+from lib.python import shell
 
 
 class ArgumentError(errors.Error):
@@ -530,5 +531,15 @@
       password = af.read().strip()
   except IOError, e:
     logging.warning("Error reading %s: %s", authfile, e)
+
+  if password is None:
+    # This part is specific to OpenCSW buildfarm.
+    args = ['ssh', 'login', 'cat', authfile]
+    ret_code, stdout, stderr = shell.ShellCommand(args)
+    if not ret_code:
+      password = stdout.strip()
+
+  if password is None:
     password = getpass.getpass("{0}'s pkg release password> ".format(username))
+
   return username, password

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 Feb 18 10:40:48 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 09:40:48 +0000
Subject: SF.net SVN: gar:[23041] csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <3fSxrq4r38z133@mail.opencsw.org>

Revision: 23041
          http://sourceforge.net/p/gar/code/23041
Author:   wahwah
Date:     2014-02-18 09:40:44 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
checkpkg: Use a default value for retries

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-18 09:40:35 UTC (rev 23040)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-18 09:40:44 UTC (rev 23041)
@@ -22,6 +22,10 @@
 from lib.python import shell
 
 
+DEFAULT_TRIES = 1
+DEFAULT_RETRY_DELAY = 1
+
+
 class ArgumentError(errors.Error):
   """Wrong arguments passed."""
 
@@ -65,7 +69,7 @@
     self.ValidateMd5(md5_sum)
     return self.GetBlob('pkgstats', md5_sum)
 
-  @retry_decorator.Retry(tries=4, exceptions=(RestCommunicationError, httplib.BadStatusLine))
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, exceptions=(RestCommunicationError, httplib.BadStatusLine))
   def GetCatalogData(self, md5_sum):
     self.ValidateMd5(md5_sum)
     url = self.rest_url + self.PKGDB_APP + "/srv4/%s/catalog-data/" % md5_sum
@@ -216,7 +220,7 @@
       logging.debug("Response: %s %s", http_code, d.getvalue())
     return http_code
 
-  @retry_decorator.Retry(tries=4, delay=5,
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY,
                          exceptions=(RestCommunicationError, pycurl.error))
   def AddSvr4ToCatalog(self, catrel, arch, osrel, md5_sum):
     self.ValidateMd5(md5_sum)
@@ -226,7 +230,7 @@
     logging.debug("AddSvr4ToCatalog: %s", url)
     return self._CurlPut(url, [])
 
-  @retry_decorator.Retry(tries=4, delay=5,
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY,
                          exceptions=(RestCommunicationError, pycurl.error))
   def SaveBlob(self, tag, md5_sum, data):
     url = self.releases_url + "/blob/%s/%s/" % (tag, md5_sum)
@@ -291,7 +295,7 @@
     c.close()
     return http_code
 
-  @retry_decorator.Retry(tries=4, delay=5,
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY,
                          exceptions=(RestCommunicationError, pycurl.error))
   def BlobExists(self, tag, md5_sum):
     url = self.releases_url + "/blob/%s/%s/" % (tag, md5_sum)
@@ -354,7 +358,7 @@
     url = self.releases_url + "/svr4/%s/db-level-1/" % md5_sum
     return self._CurlPut(url, [])
 
-  @retry_decorator.Retry(tries=4, delay=5,
+  @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY,
                          exceptions=(RestCommunicationError, pycurl.error))
   def IsRegisteredLevelTwo(self, md5_sum):
     self.ValidateMd5(md5_sum)

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 Feb 18 11:05:12 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 10:05:12 +0000
Subject: SF.net SVN: gar:[23042] csw/mgar/gar/v2/gar.conf.mk
Message-ID: <3fSyNw2hm1z19y@mail.opencsw.org>

Revision: 23042
          http://sourceforge.net/p/gar/code/23042
Author:   wahwah
Date:     2014-02-18 10:05:11 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
mGAR v2: Set PYTHONPATH based on BUILDTREE

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2014-02-18 09:40:44 UTC (rev 23041)
+++ csw/mgar/gar/v2/gar.conf.mk	2014-02-18 10:05:11 UTC (rev 23042)
@@ -900,6 +900,10 @@
 PYTHON_TEST_TARGET_3_3	=	check
 PYTHON_TEST_TARGET		=	$(PYTHON_TEST_TARGET_$(PYTHON_VERSION))
 
+# BUILDTREE comes from ~/.garrc
+PYTHONPATH = $(BUILDTREE)/.buildsys/v2
+export PYTHONPATH
+
 # Global environment
 export PATH PKG_CONFIG_PATH
 

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 Feb 18 18:55:39 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 18 Feb 2014 17:55:39 +0000
Subject: SF.net SVN: gar:[23043] csw/mgar/pkg/lang-python/sqlobject/trunk
Message-ID: <3fT8qt6vrSz7b@mail.opencsw.org>

Revision: 23043
          http://sourceforge.net/p/gar/code/23043
Author:   wahwah
Date:     2014-02-18 17:55:32 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
lang-python/sqlobject/trunk: version bump to 1.5.1

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

Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile	2014-02-18 10:05:11 UTC (rev 23042)
+++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile	2014-02-18 17:55:32 UTC (rev 23043)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = SQLObject
-VERSION = 1.5.0
+VERSION = 1.5.1
 CATEGORIES = python
 GARTYPE = v2
 DESCRIPTION = Object Relational Manager for Python

Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums	2014-02-18 10:05:11 UTC (rev 23042)
+++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums	2014-02-18 17:55:32 UTC (rev 23043)
@@ -1 +1 @@
-87df4d7ec9f8729d102c519fba633ec1  SQLObject-1.5.0.tar.gz
+0ac4aa31d89ea151ae66266420a1b521  SQLObject-1.5.1.tar.gz

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


From chninkel at users.sourceforge.net  Tue Feb 18 21:40:10 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 18 Feb 2014 20:40:10 +0000
Subject: SF.net SVN: gar:[23044] csw/mgar/pkg/lftp/trunk
Message-ID: <3fTDTb6djLzdx@mail.opencsw.org>

Revision: 23044
          http://sourceforge.net/p/gar/code/23044
Author:   chninkel
Date:     2014-02-18 20:40:07 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
lftp/trunk: updated to 4.4.15

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 17:55:32 UTC (rev 23043)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 20:40:07 UTC (rev 23044)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = lftp
-VERSION = 4.4.14
+VERSION = 4.4.15
 GARTYPE = v2
 
 DESCRIPTION = A sophisticated command-line ftp/http client

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2014-02-18 17:55:32 UTC (rev 23043)
+++ csw/mgar/pkg/lftp/trunk/checksums	2014-02-18 20:40:07 UTC (rev 23044)
@@ -1 +1 @@
-e999f33f5f119b20090664ce3c0a9ffd  lftp-4.4.14.tar.gz
+fd07f97f99c767309660ab1b1ac31a00  lftp-4.4.15.tar.gz

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-02-18 17:55:32 UTC (rev 23043)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-02-18 20:40:07 UTC (rev 23044)
@@ -1,3 +1,9 @@
+lftp (4.4.15,REV=2014.02.18) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 18 Feb 2014 21:38:45 +0100
+
 lftp (4.4.14,REV=2014.01.19) unstable
 
   * New upstream release.

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


From chninkel at users.sourceforge.net  Tue Feb 18 21:42:45 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 18 Feb 2014 20:42:45 +0000
Subject: SF.net SVN: gar:[23045] csw/mgar/pkg/lftp/trunk
Message-ID: <3fTDXr1jx0zkF@mail.opencsw.org>

Revision: 23045
          http://sourceforge.net/p/gar/code/23045
Author:   chninkel
Date:     2014-02-18 20:42:44 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
lftp/trunk: use cswreleasenotes mechanism instead of custom changelog.CSW file

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

Added Paths:
-----------
    csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 20:40:07 UTC (rev 23044)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 20:42:44 UTC (rev 23045)
@@ -43,7 +43,7 @@
 MASTER_SITES = http://lftp.yar.ru/ftp/
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += changelog.CSW
+DISTFILES += CSWlftp.cswreleasenotes
 
 # do some type conversion before munmap call
 # so lftp can be compiled with sun cc 

Copied: csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes (from rev 23044, csw/mgar/pkg/lftp/trunk/files/changelog.CSW)
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes	2014-02-18 20:42:44 UTC (rev 23045)
@@ -0,0 +1,314 @@
+lftp (4.4.15,REV=2014.02.18) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 18 Feb 2014 21:38:45 +0100
+
+lftp (4.4.14,REV=2014.01.19) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 19 Jan 2014 23:05:26 +0100
+
+lftp (4.4.13,REV=2013.11.29) unstable
+
+  * New upstream release.
+  * Removed patch dont_use_csw_getopt_h.patch that is not required anymore
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 29 Nov 2013 21:34:50 +0100
+
+lftp (4.4.9,REV=2013.09.06) unstable
+
+  * New upstream release.
+  * Removed 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch patch
+    that was only mandatory for Solaris 9.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 06 Sep 2013 22:18:55 +0200
+
+lftp (4.4.8,REV=2013.07.10) unstable
+
+  * New upstream release.
+  * Added CSWlibz1 dependency as lftp now support http gzip encoding.
+  * Disabled symbol lazy loading as it makes lftp crash.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 10 Jul 2013 14:14:03 +0200
+
+lftp (4.4.4,REV=2013.03.13) unstable
+
+  * New upstream release.
+  * Switched to gcc as compiler
+  * Added CSWlibgcc-s1 and CSWlibstdc++6 dependencies
+    because of gcc
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 13 Mar 2013 08:08:40 +0100
+
+lftp (4.3.8,REV=2012.08.24) unstable
+
+  * New upstream release.
+  * Enabled direct binding during build.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 19:25:02 +0200
+
+lftp (4.3.6,REV=2012.05.17) unstable
+
+  * Rebuilt against libssl 1.0
+
+ -- Yann Rouillard <yann at opencsw.org>  Thu, 17 May 2012 15:33:02 +0200
+
+lftp (4.3.6,REV=2012.04.20) unstable
+
+  * New upstream release.
+  * Updayed dependancy name: = CSWosslrt -> CSWlibssl0-9-8
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Apr 2012 22:46:45 +0200
+
+lftp (4.3.4,REV=2012.01.21) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Jan 2012 16:34:31 +0100
+
+lftp (4.3.3,REV=2011.11.06) unstable
+
+  * New upstream release.
+  * Removed patches once necessary to compile under Solaris: 
+     sun_cc_no_restrict.patch
+     do_not_use_sun_as_a_variable.patch
+     sun_len_definition.patch
+  * Updated dependancy name:
+  	CSWiconv -> CSWlibiconv2
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 06 Nov 2011 15:16:16 +0100
+
+lftp (4.3.1,REV=2011.07.19) unstable
+
+  * New upstream release.
+  * Updated dependancies names:
+  	CSWgettextrt -> CSWlibintl8
+	CSWreadline -> CSWlibreadline6
+	CSWexpat -> CSWlibexpat1
+  * Removed SUNWspro hardcoded RPATH from binaries.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 19 Jul 2011 00:12:44 +0200
+
+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
+
+lftp (4.0.9,REV=2010.06.25) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 25 Jun 2010 22:19:08 +0200
+
+lftp (4.0.6,REV=2010.03.26) unstable
+
+  * New upstream release.
+  * Applied sun_cc_no_restrict.patch to prevent the configure script
+  from incorrectly thinking that Sun Studio 12 CC supports the __restrict__
+  keyword.
+  * Applied dont_use_csw_getopt_h.patch to prevent lftp from using opencsw
+  getopt.h as it breaks the build.
+  * Switched to gar dynamic prototype.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 26 Mar 2010 22:03:15 +0100
+
+lftp (4.0.5,REV=2009.12.23) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 23 Dec 2009 00:13:55 +0100
+
+lftp (4.0.4,REV=2009.12.02) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Dec 2009 21:47:50 +0100
+
+lftp (4.0.4,REV=2009.12.02) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Dec 2009 21:47:50 +0100
+
+lftp (4.0.3,REV=2009.11.01) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 01 Nov 2009 01:23:45 +0100
+
+lftp (4.0.2,REV=2009.10.11) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 11 Oct 2009 00:45:36 +0200
+
+lftp (3.7.15,REV=2009.07.25) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 25 Jul 2009 13:10:19 +0200
+
+lftp (3.7.14,REV=2009.05.16) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 16 May 2009 15:40:33 +0200
+
+lftp (3.7.13,REV=2009.05.09) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 09 May 2009 17:17:30 +0200
+
+lftp (3.7.11,REV=2009.03.29) unstable
+
+  * Now uses cswpreserveconf class from cswclassutils to handle lftp.conf
+  configuration file.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 29 Mar 2009 16:16:22 +0200
+
+lftp (3.7.11,REV=2009.03.27) unstable
+
+  * Fixed double CSWcommon dependancy.
+
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2009 23:08:42 +0100
+
+lftp (3.7.11,REV=2009.03.21) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Mar 2009 12:55:58 +0100
+
+lftp (3.7.8,REV=2009.02.15) unstable
+
+  * Changed gettext dependancy to follow gettext package split
+  (Closes: #3099).
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 14 Feb 2009 23:53:41 +0100
+
+lftp (3.7.8,REV=2009.01.24) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 24 Jan 2009 16:14:12 +0100
+
+lftp (3.7.7,REV=2008.12.12) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 13 Dec 2008 11:53:59 +0100
+
+lftp (3.7.6,REV=2008.11.30) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Nov 2008 22:43:16 +0100
+   
+lftp (3.7.4,REV=2008.10.04) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 04 Oct 2008 23:41:47 +0200
+   
+lftp (3.7.3,REV=2008.06.02) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Mon, 02 Jun 2008 22:08:32 +0200
+   
+lftp (3.6.3,REV=2008.02.16) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Sat, 16 Feb 2008 10:58:45 +0100
+
+lftp (3.6.2,REV=2008.01.21) unstable
+
+  * New upstream version.
+  * Removed files/xstring_char_cast_bugfix.patch: bug fixed upstream.
+
+ -- Yann Rouillard <yann at blastwave.org>  Mon, 21 Jan 2008 23:54:26 +0100
+
+lftp (3.6.1,REV=2007.12.21) unstable
+
+  * New upstream version.
+  * Added files/xstring_char_cast_bugfix.patch:
+  	workaround a cast problem
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 21 Dec 2007 23:20:29 +0100
+
+lftp (3.5.13,REV=2007.08.24) unstable
+
+  * New upstream version.
+  * Removed static libraries files.
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 24 Aug 2007 01:50:48 +0200
+
+lftp (3.5.12,REV=2007.08.17) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Fri, 17 Aug 2007 20:17:39 +0200
+
+lftp (3.5.11) unstable
+
+  * Depends on openssl_rt rather than openssl.
+
+ -- Yann Rouillard <yann at blastwave.org>  Sat, 28 Jul 2007 17:30:07 +0200
+
+lftp (3.5.11) unstable
+
+   * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Wed, 06 May 2007 04:42:47 +0200
+
+lftp (3.5.10) unstable
+
+   * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Wed, 11 Apr 2007 00:30:58 +0200
+
+lftp (3.5.9) unstable
+
+   * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Mon, 15 Jan 2007 23:48:35 +0100
+
+lftp (3.5.6) unstable
+ 
+   * New upstream version.
+   * Removed MakeRef_macro.patch not necessary anymore.
+ 
+ -- Yann Rouillard <yann at blastwave.org>  Mon,  4 Dec 2006 23:07:36 +0100
+ 
+lftp (3.5.4) unstable
+ 
+   * New upstream version.
+   * Removed sun_cc_compilation_fix.patch not necessary anymore.
+   * Added MakeRef_macro.patch to fixed a incorrect macro call 
+     which caused segmentation fault with sftp protocol.
+ 
+ -- Yann Rouillard <yann at blastwave.org>  Sat, 19 Aug 2006 20:24:04 +0200
+ 
+lftp (3.5.2) unstable
+
+   * New upstream version.
+   * Switched back to Sun Studio (closes: #0001705)
+
+ -- Yann Rouillard <yann at blastwave.org>  Tue,  1 Aug 2006 15:12:31 +0200
+lftp (3.5.1) unstable
+
+   * New upstream version.
+
+ -- Yann Rouillard <yann at blastwave.org>  Tue, 11 Jul 2006 12:25:32 +0200
+
+lftp (3.4.6) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard  <yann at blastwave.org> Fri, 28 Apr 2006 01:17:04 +0200

Deleted: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-02-18 20:40:07 UTC (rev 23044)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2014-02-18 20:42:44 UTC (rev 23045)
@@ -1,314 +0,0 @@
-lftp (4.4.15,REV=2014.02.18) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Tue, 18 Feb 2014 21:38:45 +0100
-
-lftp (4.4.14,REV=2014.01.19) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 19 Jan 2014 23:05:26 +0100
-
-lftp (4.4.13,REV=2013.11.29) unstable
-
-  * New upstream release.
-  * Removed patch dont_use_csw_getopt_h.patch that is not required anymore
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 29 Nov 2013 21:34:50 +0100
-
-lftp (4.4.9,REV=2013.09.06) unstable
-
-  * New upstream release.
-  * Removed 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch patch
-    that was only mandatory for Solaris 9.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 06 Sep 2013 22:18:55 +0200
-
-lftp (4.4.8,REV=2013.07.10) unstable
-
-  * New upstream release.
-  * Added CSWlibz1 dependency as lftp now support http gzip encoding.
-  * Disabled symbol lazy loading as it makes lftp crash.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 10 Jul 2013 14:14:03 +0200
-
-lftp (4.4.4,REV=2013.03.13) unstable
-
-  * New upstream release.
-  * Switched to gcc as compiler
-  * Added CSWlibgcc-s1 and CSWlibstdc++6 dependencies
-    because of gcc
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 13 Mar 2013 08:08:40 +0100
-
-lftp (4.3.8,REV=2012.08.24) unstable
-
-  * New upstream release.
-  * Enabled direct binding during build.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 19:25:02 +0200
-
-lftp (4.3.6,REV=2012.05.17) unstable
-
-  * Rebuilt against libssl 1.0
-
- -- Yann Rouillard <yann at opencsw.org>  Thu, 17 May 2012 15:33:02 +0200
-
-lftp (4.3.6,REV=2012.04.20) unstable
-
-  * New upstream release.
-  * Updayed dependancy name: = CSWosslrt -> CSWlibssl0-9-8
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Apr 2012 22:46:45 +0200
-
-lftp (4.3.4,REV=2012.01.21) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Jan 2012 16:34:31 +0100
-
-lftp (4.3.3,REV=2011.11.06) unstable
-
-  * New upstream release.
-  * Removed patches once necessary to compile under Solaris: 
-     sun_cc_no_restrict.patch
-     do_not_use_sun_as_a_variable.patch
-     sun_len_definition.patch
-  * Updated dependancy name:
-  	CSWiconv -> CSWlibiconv2
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 06 Nov 2011 15:16:16 +0100
-
-lftp (4.3.1,REV=2011.07.19) unstable
-
-  * New upstream release.
-  * Updated dependancies names:
-  	CSWgettextrt -> CSWlibintl8
-	CSWreadline -> CSWlibreadline6
-	CSWexpat -> CSWlibexpat1
-  * Removed SUNWspro hardcoded RPATH from binaries.
-
- -- Yann Rouillard <yann at opencsw.org>  Tue, 19 Jul 2011 00:12:44 +0200
-
-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
-
-lftp (4.0.9,REV=2010.06.25) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 25 Jun 2010 22:19:08 +0200
-
-lftp (4.0.6,REV=2010.03.26) unstable
-
-  * New upstream release.
-  * Applied sun_cc_no_restrict.patch to prevent the configure script
-  from incorrectly thinking that Sun Studio 12 CC supports the __restrict__
-  keyword.
-  * Applied dont_use_csw_getopt_h.patch to prevent lftp from using opencsw
-  getopt.h as it breaks the build.
-  * Switched to gar dynamic prototype.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 26 Mar 2010 22:03:15 +0100
-
-lftp (4.0.5,REV=2009.12.23) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 23 Dec 2009 00:13:55 +0100
-
-lftp (4.0.4,REV=2009.12.02) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Dec 2009 21:47:50 +0100
-
-lftp (4.0.4,REV=2009.12.02) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Dec 2009 21:47:50 +0100
-
-lftp (4.0.3,REV=2009.11.01) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 01 Nov 2009 01:23:45 +0100
-
-lftp (4.0.2,REV=2009.10.11) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 11 Oct 2009 00:45:36 +0200
-
-lftp (3.7.15,REV=2009.07.25) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 25 Jul 2009 13:10:19 +0200
-
-lftp (3.7.14,REV=2009.05.16) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 16 May 2009 15:40:33 +0200
-
-lftp (3.7.13,REV=2009.05.09) unstable
-
-  * New upstream release.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 09 May 2009 17:17:30 +0200
-
-lftp (3.7.11,REV=2009.03.29) unstable
-
-  * Now uses cswpreserveconf class from cswclassutils to handle lftp.conf
-  configuration file.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 29 Mar 2009 16:16:22 +0200
-
-lftp (3.7.11,REV=2009.03.27) unstable
-
-  * Fixed double CSWcommon dependancy.
-
- -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2009 23:08:42 +0100
-
-lftp (3.7.11,REV=2009.03.21) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Mar 2009 12:55:58 +0100
-
-lftp (3.7.8,REV=2009.02.15) unstable
-
-  * Changed gettext dependancy to follow gettext package split
-  (Closes: #3099).
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 14 Feb 2009 23:53:41 +0100
-
-lftp (3.7.8,REV=2009.01.24) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 24 Jan 2009 16:14:12 +0100
-
-lftp (3.7.7,REV=2008.12.12) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Sat, 13 Dec 2008 11:53:59 +0100
-
-lftp (3.7.6,REV=2008.11.30) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Sun, 30 Nov 2008 22:43:16 +0100
-   
-lftp (3.7.4,REV=2008.10.04) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at opencsw.org>  Fri, 04 Oct 2008 23:41:47 +0200
-   
-lftp (3.7.3,REV=2008.06.02) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Mon, 02 Jun 2008 22:08:32 +0200
-   
-lftp (3.6.3,REV=2008.02.16) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Sat, 16 Feb 2008 10:58:45 +0100
-
-lftp (3.6.2,REV=2008.01.21) unstable
-
-  * New upstream version.
-  * Removed files/xstring_char_cast_bugfix.patch: bug fixed upstream.
-
- -- Yann Rouillard <yann at blastwave.org>  Mon, 21 Jan 2008 23:54:26 +0100
-
-lftp (3.6.1,REV=2007.12.21) unstable
-
-  * New upstream version.
-  * Added files/xstring_char_cast_bugfix.patch:
-  	workaround a cast problem
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 21 Dec 2007 23:20:29 +0100
-
-lftp (3.5.13,REV=2007.08.24) unstable
-
-  * New upstream version.
-  * Removed static libraries files.
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 24 Aug 2007 01:50:48 +0200
-
-lftp (3.5.12,REV=2007.08.17) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Fri, 17 Aug 2007 20:17:39 +0200
-
-lftp (3.5.11) unstable
-
-  * Depends on openssl_rt rather than openssl.
-
- -- Yann Rouillard <yann at blastwave.org>  Sat, 28 Jul 2007 17:30:07 +0200
-
-lftp (3.5.11) unstable
-
-   * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Wed, 06 May 2007 04:42:47 +0200
-
-lftp (3.5.10) unstable
-
-   * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Wed, 11 Apr 2007 00:30:58 +0200
-
-lftp (3.5.9) unstable
-
-   * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Mon, 15 Jan 2007 23:48:35 +0100
-
-lftp (3.5.6) unstable
- 
-   * New upstream version.
-   * Removed MakeRef_macro.patch not necessary anymore.
- 
- -- Yann Rouillard <yann at blastwave.org>  Mon,  4 Dec 2006 23:07:36 +0100
- 
-lftp (3.5.4) unstable
- 
-   * New upstream version.
-   * Removed sun_cc_compilation_fix.patch not necessary anymore.
-   * Added MakeRef_macro.patch to fixed a incorrect macro call 
-     which caused segmentation fault with sftp protocol.
- 
- -- Yann Rouillard <yann at blastwave.org>  Sat, 19 Aug 2006 20:24:04 +0200
- 
-lftp (3.5.2) unstable
-
-   * New upstream version.
-   * Switched back to Sun Studio (closes: #0001705)
-
- -- Yann Rouillard <yann at blastwave.org>  Tue,  1 Aug 2006 15:12:31 +0200
-lftp (3.5.1) unstable
-
-   * New upstream version.
-
- -- Yann Rouillard <yann at blastwave.org>  Tue, 11 Jul 2006 12:25:32 +0200
-
-lftp (3.4.6) unstable
-
-  * New upstream version.
-
- -- Yann Rouillard  <yann at blastwave.org> Fri, 28 Apr 2006 01:17:04 +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  Tue Feb 18 23:01:33 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 18 Feb 2014 22:01:33 +0000
Subject: SF.net SVN: gar:[23046] csw/mgar/pkg/lftp/trunk/Makefile
Message-ID: <3fTGHX02zFzxx@mail.opencsw.org>

Revision: 23046
          http://sourceforge.net/p/gar/code/23046
Author:   chninkel
Date:     2014-02-18 22:01:31 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
lftp/trunk: remove old post-merge target not necessary anymore

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 20:42:44 UTC (rev 23045)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2014-02-18 22:01:31 UTC (rev 23046)
@@ -91,7 +91,3 @@
 #	cd $(WORKSRC) && autoconf
 #	@$(MAKECOOKIE)
 
-post-merge:
-	@ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW
-	@$(MAKECOOKIE)
-

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


From cgrzemba at users.sourceforge.net  Wed Feb 19 10:28:23 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 19 Feb 2014 09:28:23 +0000
Subject: SF.net SVN: gar:[23047] csw/mgar/pkg/lang-python/south/trunk
Message-ID: <3fTYX23814zZv@mail.opencsw.org>

Revision: 23047
          http://sourceforge.net/p/gar/code/23047
Author:   cgrzemba
Date:     2014-02-19 09:28:22 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
lang-python/south/trunk: Update version 0.8.4

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

Modified: csw/mgar/pkg/lang-python/south/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/south/trunk/Makefile	2014-02-18 22:01:31 UTC (rev 23046)
+++ csw/mgar/pkg/lang-python/south/trunk/Makefile	2014-02-19 09:28:22 UTC (rev 23047)
@@ -3,7 +3,8 @@
 # $Id$
 
 NAME = south
-VERSION = 0.7.3
+MASTER_NAME = South
+VERSION = 0.8.4
 CATEGORIES = python
 GARTYPE = v2
 
@@ -11,8 +12,11 @@
 define BLURB
 endef
 
-MASTER_SITES = http://www.aeracode.org/releases/south/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+MASTER_SITE_DIR = $(shell echo $(MASTER_NAME) | cut -c 1)
+MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(MASTER_NAME)/
+# MASTER_SITES = http://www.aeracode.org/releases/south/
+DISTFILES  = $(MASTER_NAME)-$(VERSION).tar.gz
+DISTNAME = $(MASTER_NAME)-$(VERSION)
 
 VENDOR_URL = http://south.aeracode.org/
 
@@ -21,6 +25,8 @@
 PACKAGES += CSWpy-south
 ARCHALL_CSWpy-south = 1
 
-DISTNAME = south
+include gar/category.mk
 
-include gar/category.mk
+post-extract: 
+	[ ! -f $(WORKSRC)/LICENSE ] && echo "http://www.apache.org/licenses/" > $(WORKSRC)/LICENSE
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/lang-python/south/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/south/trunk/checksums	2014-02-18 22:01:31 UTC (rev 23046)
+++ csw/mgar/pkg/lang-python/south/trunk/checksums	2014-02-19 09:28:22 UTC (rev 23047)
@@ -1 +1 @@
-693a2a7a57b29c49bc177fe951e04767  south-0.7.3.tar.gz
+ccd6ebadd3e2c8c6ef16d771632f7840  South-0.8.4.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  Wed Feb 19 11:39:49 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 19 Feb 2014 10:39:49 +0000
Subject: SF.net SVN: gar:[23048] csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <3fTb6Q4jHVzlS@mail.opencsw.org>

Revision: 23048
          http://sourceforge.net/p/gar/code/23048
Author:   wahwah
Date:     2014-02-19 10:39:48 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
checkpkg: Update references to data structures

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

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2014-02-19 09:28:22 UTC (rev 23047)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2014-02-19 10:39:48 UTC (rev 23048)
@@ -898,9 +898,10 @@
     return
   spotted_a_py_file = False
   for pkgmap_entry in pkg_data["pkgmap"]:
-    if not pkgmap_entry["path"]:
+    pkgmap_entry = representations.PkgmapEntry._make(pkgmap_entry)
+    if not pkgmap_entry.path:
       continue
-    if py_file_re.match(pkgmap_entry["path"]):
+    if py_file_re.match(pkgmap_entry.path):
       spotted_a_py_file = True
       break
   if not spotted_a_py_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  Wed Feb 19 11:39:59 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 19 Feb 2014 10:39:59 +0000
Subject: SF.net SVN: gar:[23049] csw/mgar/gar/v2/lib/python
Message-ID: <3fTb6g0Mhmzpr@mail.opencsw.org>

Revision: 23049
          http://sourceforge.net/p/gar/code/23049
Author:   wahwah
Date:     2014-02-19 10:39:59 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
csw-upload-pkg: Update RESTful URLs in rest.py

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

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-19 10:39:48 UTC (rev 23048)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-19 10:39:59 UTC (rev 23049)
@@ -437,7 +437,6 @@
 
   username, password = rest.GetUsernameAndPassword()
   uploader = Srv4Uploader(args,
-                          options.rest_url,
                           os_release=os_release,
                           debug=options.debug,
                           username=username,

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-19 10:39:48 UTC (rev 23048)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-19 10:39:59 UTC (rev 23049)
@@ -50,7 +50,7 @@
 
   def GetPkgByMd5(self, md5_sum):
     self.ValidateMd5(md5_sum)
-    url = self.releases_url + "/srv4/%s/" % md5_sum
+    url = self.pkgdb_url + "/srv4/%s/" % md5_sum
     logging.debug("GetPkgByMd5(): GET %s", url)
     try:
       data = urllib2.urlopen(url).read()
@@ -72,7 +72,7 @@
   @retry_decorator.Retry(tries=DEFAULT_TRIES, exceptions=(RestCommunicationError, httplib.BadStatusLine))
   def GetCatalogData(self, md5_sum):
     self.ValidateMd5(md5_sum)
-    url = self.rest_url + self.PKGDB_APP + "/srv4/%s/catalog-data/" % md5_sum
+    url = self.pkgdb_url "/srv4/%s/catalog-data/" % md5_sum
     try:
       data = urllib2.urlopen(url).read()
       return cjson.decode(data)
@@ -382,7 +382,7 @@
     return self._CurlPut(url, [])
 
   def GetCatalogForGeneration(self, catrel, arch, osrel):
-    url = (self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/for-generation/"
+    url = (self.pkgdb_url + "/catalogs/%s/%s/%s/for-generation/"
            % (catrel, arch, osrel))
     logging.debug("GetCatalogForGeneration(): url=%r", url)
     data = urllib2.urlopen(url).read()
@@ -406,8 +406,7 @@
 
   def GetCatalogTimingInformation(self, catrel, arch, osrel):
     url = (
-      self.rest_url
-      + self.PKGDB_APP
+      self.pkgdb_url
       + "/catalogs/%s/%s/%s/timing/" % (catrel, arch, osrel))
     data = urllib2.urlopen(url).read()
     return cjson.decode(data)
@@ -451,12 +450,11 @@
     return successful, metadata
 
   def PostFile(self, filename, md5_sum):
-    if self.output_to_screen:
-      print "Uploading %s" % repr(filename)
+    logging.info("Uploading %s" % repr(filename))
     c = pycurl.Curl()
     d = StringIO()
     h = StringIO()
-    url = self.rest_url + RELEASES_APP + "/srv4/"
+    url = self.releases_url + "/srv4/"
     c.setopt(pycurl.URL, url)
     c.setopt(pycurl.POST, 1)
     c = self._SetAuth(c)

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


From cgrzemba at users.sourceforge.net  Wed Feb 19 12:35:56 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 19 Feb 2014 11:35:56 +0000
Subject: SF.net SVN: gar:[23050] csw/mgar/gar/v2/lib/python
Message-ID: <3fTcM90wJJz1Jj@mail.opencsw.org>

Revision: 23050
          http://sourceforge.net/p/gar/code/23050
Author:   cgrzemba
Date:     2014-02-19 11:35:52 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
add ssh options for batch mode, add missing plus sign

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

Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-19 10:39:59 UTC (rev 23049)
+++ csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-19 11:35:52 UTC (rev 23050)
@@ -16,21 +16,21 @@
 catalog_keys = ['catalogname','version','pkgname','file_basename',
                     'md5sum','size','deps','category','i_deps']
 
-def SplitPkgList(pkglist):
-      if not pkglist:
+def xxxSplitPkgList(pkglist):
+    if not pkglist:
         pkglist = ()
-      elif pkglist == "none":
+    elif pkglist == "none":
         pkglist = ()
-      else:
-        pkglist = tuple(pkglist.split("|"))
-      return pkglist
+    else:
+       pkglist = tuple(pkglist.split("|"))
+    return pkglist
 
 def convToDict(catlst):
     catdict = []
     for entry in catlst:
         del entry[9]
-	entry[6] = SplitPkgList(entry[6])
-	entry[8] = SplitPkgList(entry[8])
+	entry[6] = catalog.SplitPkgList(entry[6])
+	entry[8] = catalog.SplitPkgList(entry[8])
         catdict.append(dict(zip(catalog_keys,entry)))
     return catdict
 

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-19 10:39:59 UTC (rev 23049)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-19 11:35:52 UTC (rev 23050)
@@ -72,7 +72,7 @@
   @retry_decorator.Retry(tries=DEFAULT_TRIES, exceptions=(RestCommunicationError, httplib.BadStatusLine))
   def GetCatalogData(self, md5_sum):
     self.ValidateMd5(md5_sum)
-    url = self.pkgdb_url "/srv4/%s/catalog-data/" % md5_sum
+    url = self.pkgdb_url + "/srv4/%s/catalog-data/" % md5_sum
     try:
       data = urllib2.urlopen(url).read()
       return cjson.decode(data)
@@ -536,7 +536,7 @@
 
   if password is None:
     # This part is specific to OpenCSW buildfarm.
-    args = ['ssh', 'login', 'cat', authfile]
+    args = ['ssh', '-o BatchMode=yes', '-o StrictHostKeyChecking=no', 'login', 'cat', authfile]
     ret_code, stdout, stderr = shell.ShellCommand(args)
     if not ret_code:
       password = stdout.strip()

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


From cgrzemba at users.sourceforge.net  Wed Feb 19 13:01:31 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 19 Feb 2014 12:01:31 +0000
Subject: SF.net SVN: gar:[23051] csw/mgar/gar/v2/lib/python/compare_catalog.py
Message-ID: <3fTcwh4SxGz1Qd@mail.opencsw.org>

Revision: 23051
          http://sourceforge.net/p/gar/code/23051
Author:   cgrzemba
Date:     2014-02-19 12:01:28 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
revert, commited accidentally

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

Modified: csw/mgar/gar/v2/lib/python/compare_catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-19 11:35:52 UTC (rev 23050)
+++ csw/mgar/gar/v2/lib/python/compare_catalog.py	2014-02-19 12:01:28 UTC (rev 23051)
@@ -16,21 +16,21 @@
 catalog_keys = ['catalogname','version','pkgname','file_basename',
                     'md5sum','size','deps','category','i_deps']
 
-def xxxSplitPkgList(pkglist):
-    if not pkglist:
+def SplitPkgList(pkglist):
+      if not pkglist:
         pkglist = ()
-    elif pkglist == "none":
+      elif pkglist == "none":
         pkglist = ()
-    else:
-       pkglist = tuple(pkglist.split("|"))
-    return pkglist
+      else:
+        pkglist = tuple(pkglist.split("|"))
+      return pkglist
 
 def convToDict(catlst):
     catdict = []
     for entry in catlst:
         del entry[9]
-	entry[6] = catalog.SplitPkgList(entry[6])
-	entry[8] = catalog.SplitPkgList(entry[8])
+	entry[6] = SplitPkgList(entry[6])
+	entry[8] = SplitPkgList(entry[8])
         catdict.append(dict(zip(catalog_keys,entry)))
     return catdict
 

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


From lblume at users.sourceforge.net  Wed Feb 19 15:15:29 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Wed, 19 Feb 2014 14:15:29 +0000
Subject: SF.net SVN: gar:[23052]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <3fTgvF2yqVzJL@mail.opencsw.org>

Revision: 23052
          http://sourceforge.net/p/gar/code/23052
Author:   lblume
Date:     2014-02-19 14:15:26 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Add -lm during linking - maybe

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-19 12:01:28 UTC (rev 23051)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-19 14:15:26 UTC (rev 23052)
@@ -75,6 +75,9 @@
 EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCOMPILER))
 ###
 
+EXTRA_LINKER_FLAGS = -lm
+
+
 # The Solaris 11 build uses -xO4 by default
 OPT_FLAGS_SOS12_32 = -xO4
 OPT_FLAGS_SOS12_64 = -xO4

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 Feb 19 22:12:47 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 19 Feb 2014 21:12:47 +0000
Subject: SF.net SVN: gar:[23053] csw/mgar/gar/v2
Message-ID: <3fTs8w0GCkz1Gn@mail.opencsw.org>

Revision: 23053
          http://sourceforge.net/p/gar/code/23053
Author:   wahwah
Date:     2014-02-19 21:12:45 +0000 (Wed, 19 Feb 2014)
Log Message:
-----------
csw-upload-pkg: Remove the symlink

Add csw-upload-pkg as a wrapper

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

Added Paths:
-----------
    csw/mgar/gar/v2/bin/csw-upload-pkg

Removed Paths:
-------------
    csw/mgar/gar/v2/bin/csw-upload-pkg

Deleted: csw/mgar/gar/v2/bin/csw-upload-pkg
===================================================================
--- csw/mgar/gar/v2/bin/csw-upload-pkg	2014-02-19 14:15:26 UTC (rev 23052)
+++ csw/mgar/gar/v2/bin/csw-upload-pkg	2014-02-19 21:12:45 UTC (rev 23053)
@@ -1 +0,0 @@
-link ../lib/python/csw_upload_pkg.py
\ No newline at end of file

Added: csw/mgar/gar/v2/bin/csw-upload-pkg
===================================================================
--- csw/mgar/gar/v2/bin/csw-upload-pkg	                        (rev 0)
+++ csw/mgar/gar/v2/bin/csw-upload-pkg	2014-02-19 21:12:45 UTC (rev 23053)
@@ -0,0 +1,8 @@
+#!/opt/csw/bin/bash
+
+set -e
+set -u
+
+basedir=$(dirname $0)/..
+export PYTHONPATH=$basedir
+exec /opt/csw/bin/python2.6 "$basedir/lib/python/csw_upload_pkg.py" "$@"


Property changes on: csw/mgar/gar/v2/bin/csw-upload-pkg
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-19 14:15:26 UTC (rev 23052)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2014-02-19 21:12:45 UTC (rev 23053)
@@ -337,7 +337,7 @@
 
   def _RunCheckpkg(self, checkpkg_sets):
     bin_dir = os.path.dirname(__file__)
-    checkpkg_executable = os.path.join(bin_dir, "checkpkg")
+    checkpkg_executable = os.path.join(bin_dir, "checkpkg2.py")
     assert os.path.exists(checkpkg_executable), (
         "Could not find %s. Make sure that the checkpkg executable is "
         "available \n"

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


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

Revision: 23054
          http://sourceforge.net/p/gar/code/23054
Author:   lblume
Date:     2014-02-20 16:40:36 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Add override

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-19 21:12:45 UTC (rev 23053)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-02-20 16:40:36 UTC (rev 23054)
@@ -136,6 +136,8 @@
 PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r18 += CSWlibmysqlclient18
+# Appears required by recent chkpkg changes, may be a bug
+CHECKPKG_OVERRIDES_CSWlibmysqlclient-r18 += surplus-dependency|CSWlibmysqlclient18
 
 # Defining the client programs, which are going to pick up the 32- and 64-bit
 # binaries, symbolic links, isaexec stuff and man pages.

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


From jake_goerzen at users.sourceforge.net  Thu Feb 20 19:39:25 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 20 Feb 2014 18:39:25 +0000
Subject: SF.net SVN: gar:[23055] csw/mgar/pkg/freeciv/trunk
Message-ID: <3fVPjP6x5Xz1FT@mail.opencsw.org>

Revision: 23055
          http://sourceforge.net/p/gar/code/23055
Author:   jake_goerzen
Date:     2014-02-20 18:39:23 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
freeciv: update to 2.4.2

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

Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2014-02-20 16:40:36 UTC (rev 23054)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2014-02-20 18:39:23 UTC (rev 23055)
@@ -1,5 +1,5 @@
 NAME = freeciv
-VERSION = 2.4.1
+VERSION = 2.4.2
 GARTYPE = v2
 
 DESCRIPTION = Free turn-based multiplayer strategy game

Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums	2014-02-20 16:40:36 UTC (rev 23054)
+++ csw/mgar/pkg/freeciv/trunk/checksums	2014-02-20 18:39:23 UTC (rev 23055)
@@ -1 +1 @@
-9f280f320be0d597a29efe040f1b0025  freeciv-2.4.1.tar.bz2
+4bf03bbe7084d3e23739f1e5b2ccc529  freeciv-2.4.2.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 Feb 20 20:57:19 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 20 Feb 2014 19:57:19 +0000
Subject: SF.net SVN: gar:[23056]
	csw/mgar/pkg/apache2/branches/apache24/Makefile
Message-ID: <3fVRRL3mFJz1Py@mail.opencsw.org>

Revision: 23056
          http://sourceforge.net/p/gar/code/23056
Author:   dmichelsen
Date:     2014-02-20 19:57:18 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
apache2/branches/apache24: Enable mod_proxy_html as requested in #5152

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-20 18:39:23 UTC (rev 23055)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-20 19:57:18 UTC (rev 23056)
@@ -90,6 +90,8 @@
 CONFIGURE_ARGS += --enable-privileges
 CONFIGURE_ARGS += --enable-vhost-alias
 CONFIGURE_ARGS += --with-ssl=$(prefix)
+# As requested in https://www.opencsw.org/mantis/view.php?id=5152
+CONFIGURE_ARGS += --enable-proxy-html
 
 # Fixup target variables
 APACHE_ROOT   = $(DESTDIR)$(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  Fri Feb 21 10:25:37 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 21 Feb 2014 09:25:37 +0000
Subject: SF.net SVN: gar:[23057] csw/mgar/pkg/tmux/trunk
Message-ID: <3fVnPR73Jsz10S@mail.opencsw.org>

Revision: 23057
          http://sourceforge.net/p/gar/code/23057
Author:   dmichelsen
Date:     2014-02-21 09:25:37 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
tmux/trunk: Update to 1.9, yeahsvn diff Makefile \o/

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

Removed Paths:
-------------
    csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch
    csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch
    csw/mgar/pkg/tmux/trunk/files/0002-Use-lockf-instead-of-flock-as-it-is-POSIX-compliant.patch
    csw/mgar/pkg/tmux/trunk/files/0003-Provide-replacement-for-cfmakeraw.patch
    csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk
    csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff
    csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2014-02-20 19:57:18 UTC (rev 23056)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2014-02-21 09:25:37 UTC (rev 23057)
@@ -1,16 +1,14 @@
 NAME = tmux
-VERSION = 1.8
+VERSION = 1.9
 GARTYPE = v2
 
 DESCRIPTION = Terminal Multiplexer
 
 MASTER_SITES = $(SF_MIRRORS)
-MASTER_SITES += http://sourceforge.net/code-snapshots/git/u/u/u/dmichelsen/tmux.git/
-DISTNAME = tmux-tmux-code-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d
+#MASTER_SITES += http://sourceforge.net/code-snapshots/git/u/u/u/dmichelsen/tmux.git/
+#DISTNAME = tmux-tmux-code-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d
 DISTFILES  = $(DISTNAME).tar.gz
 
-#PATCHFILES += 0001-Modifications-for-Solaris-to-use-fcntl-instead-of-fl.patch
-
 VENDOR_URL = http://tmux.sourceforge.net
 
 BUILD_DEP_PKGS = CSWlibevent-dev
@@ -35,6 +33,6 @@
 
 include gar/category.mk
 
-post-extract:
+xxxpost-extract:
 	cd $(WORKSRC) && ./autogen.sh
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2014-02-20 19:57:18 UTC (rev 23056)
+++ csw/mgar/pkg/tmux/trunk/checksums	2014-02-21 09:25:37 UTC (rev 23057)
@@ -1 +1 @@
-458620f74df261000af1de60469230d7  tmux-tmux-code-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.tar.gz
+5f5ed0f03a666279264da45b60075600  tmux-1.9.tar.gz

Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch	2014-02-20 19:57:18 UTC (rev 23056)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch	2014-02-21 09:25:37 UTC (rev 23057)
@@ -1,26 +0,0 @@
-From cf90a6dc2d12ebab373935cad8078ba6da87c57f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 16 Apr 2013 13:47:14 +0200
-Subject: [PATCH 1/3] Include of paths.h if its presence has been detected
-
----
- tmux.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tmux.c b/tmux.c
-index e6de5cf..cb1dbb3 100644
---- a/tmux.c
-+++ b/tmux.c
-@@ -23,7 +23,9 @@
- #include <event.h>
- #include <fcntl.h>
- #include <locale.h>
-+#if HAVE_PATHS_H
- #include <paths.h>
-+#endif
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-1.8.1.4
-

Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch	2014-02-20 19:57:18 UTC (rev 23056)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch	2014-02-21 09:25:37 UTC (rev 23057)
@@ -1,12374 +0,0 @@
-From 5547c378f07ecb7b64e2c0f8a0fec345c75873c4 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 21 Apr 2013 10:24:49 +0200
-Subject: [PATCH] Make location of tmux.conf relative to sysconfdir
-
----
- configure.ac |    2 +
- tmux.1       | 3808 ----------------------------------------------------------
- tmux.1.in    | 3808 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- tmux.h       | 2352 ------------------------------------
- tmux.h.in    | 2352 ++++++++++++++++++++++++++++++++++++
- 5 files changed, 6162 insertions(+), 6160 deletions(-)
- delete mode 100644 tmux.1
- create mode 100644 tmux.1.in
- delete mode 100644 tmux.h
- create mode 100644 tmux.h.in
-
-diff --git a/configure.ac b/configure.ac
-index f00937f..0163450 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -479,3 +479,5 @@ AM_CONDITIONAL(IS_UNKNOWN, test "x$PLATFORM" = xunknown)
- 
- # autoconf should create a Makefile. A shock!
- AC_OUTPUT(Makefile)
-+AC_OUTPUT(tmux.1)
-+AC_OUTPUT(tmux.h)
-diff --git a/tmux.1 b/tmux.1
-deleted file mode 100644
-index 98bf957..0000000
---- a/tmux.1
-+++ /dev/null
-@@ -1,3808 +0,0 @@
--.\" $Id$
--.\"
--.\" Copyright (c) 2007 Nicholas Marriott <nicm at users.sourceforge.net>
--.\"
--.\" Permission to use, copy, modify, and distribute this software for any
--.\" purpose with or without fee is hereby granted, provided that the above
--.\" copyright notice and this permission notice appear in all copies.
--.\"
--.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
--.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
--.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
--.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
--.\" WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
--.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
--.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--.\"
--.Dd $Mdocdate: March 25 2013 $
--.Dt TMUX 1
--.Os
--.Sh NAME
--.Nm tmux
--.Nd terminal multiplexer
--.Sh SYNOPSIS
--.Nm tmux
--.Bk -words
--.Op Fl 28lCquvV
--.Op Fl c Ar shell-command
--.Op Fl f Ar file
--.Op Fl L Ar socket-name
--.Op Fl S Ar socket-path
--.Op Ar command Op Ar flags
--.Ek
--.Sh DESCRIPTION
--.Nm
--is a terminal multiplexer:
--it enables a number of terminals to be created, accessed, and
--controlled from a single screen.
--.Nm
--may be detached from a screen
--and continue running in the background,
--then later reattached.
--.Pp
--When
--.Nm
--is started it creates a new
--.Em session
--with a single
--.Em window
--and displays it on screen.
--A status line at the bottom of the screen
--shows information on the current session
--and is used to enter interactive commands.
--.Pp
--A session is a single collection of
--.Em pseudo terminals
--under the management of
--.Nm .
--Each session has one or more
--windows linked to it.
--A window occupies the entire screen
--and may be split into rectangular panes,
--each of which is a separate pseudo terminal
--(the
--.Xr pty 4
--manual page documents the technical details of pseudo terminals).
--Any number of
--.Nm
--instances may connect to the same session,
--and any number of windows may be present in the same session.
--Once all sessions are killed,
--.Nm
--exits.
--.Pp
--Each session is persistent and will survive accidental disconnection
--(such as
--.Xr ssh 1
--connection timeout) or intentional detaching (with the
--.Ql C-b d
--key strokes).
--.Nm
--may be reattached using:
--.Pp
--.Dl $ tmux attach
--.Pp
--In
--.Nm ,
--a session is displayed on screen by a
--.Em client
--and all sessions are managed by a single
--.Em server .
--The server and each client are separate processes which communicate through a
--socket in
--.Pa /tmp .
--.Pp
--The options are as follows:
--.Bl -tag -width "XXXXXXXXXXXX"
--.It Fl 2
--Force
--.Nm
--to assume the terminal supports 256 colours.
--.It Fl C
--Start in control mode.
--Given twice
--.Xo ( Fl CC ) Xc
--disables echo.
--.It Fl c Ar shell-command
--Execute
--.Ar shell-command
--using the default shell.
--If necessary, the
--.Nm
--server will be started to retrieve the
--.Ic default-shell
--option.
--This option is for compatibility with
--.Xr sh 1
--when
--.Nm
--is used as a login shell.
--.It Fl f Ar file
--Specify an alternative configuration file.
--By default,
--.Nm
--loads the system configuration file from
--.Pa /etc/tmux.conf ,
--if present, then looks for a user configuration file at
--.Pa ~/.tmux.conf .
--.Pp
--The configuration file is a set of
--.Nm
--commands which are executed in sequence when the server is first started.
--.Nm
--loads configuration files once when the server process has started.
--The
--.Ic source-file
--command may be used to load a file later.
--.Pp
--.Nm
--shows any error messages from commands in configuration files in the first
--session created, and continues to process the rest of the configuration file.
--.It Fl L Ar socket-name
--.Nm
--stores the server socket in a directory under
--.Ev TMUX_TMPDIR ,
--.Ev TMPDIR
--if it is unset, or
--.Pa /tmp
--if both are unset.
--The default socket is named
--.Em default .
--This option allows a different socket name to be specified, allowing several
--independent
--.Nm
--servers to be run.
--Unlike
--.Fl S
--a full path is not necessary: the sockets are all created in the same
--directory.
--.Pp
--If the socket is accidentally removed, the
--.Dv SIGUSR1
--signal may be sent to the
--.Nm
--server process to recreate it.
--.It Fl l
--Behave as a login shell.
--This flag currently has no effect and is for compatibility with other shells
--when using tmux as a login shell.
--.It Fl q
--Set the
--.Ic quiet
--server option to prevent the server sending various informational messages.
--.It Fl S Ar socket-path
--Specify a full alternative path to the server socket.
--If
--.Fl S
--is specified, the default socket directory is not used and any
--.Fl L
--flag is ignored.
--.It Fl u
--.Nm
--attempts to guess if the terminal is likely to support UTF-8 by checking the
--first of the
--.Ev LC_ALL ,
--.Ev LC_CTYPE
--and
--.Ev LANG
--environment variables to be set for the string "UTF-8".
--This is not always correct: the
--.Fl u
--flag explicitly informs
--.Nm
--that UTF-8 is supported.
--.Pp
--If the server is started from a client passed
--.Fl u
--or where UTF-8 is detected, the
--.Ic utf8
--and
--.Ic status-utf8
--options are enabled in the global window and session options respectively.
--.It Fl v
--Request verbose logging.
--This option may be specified multiple times for increasing verbosity.
--Log messages will be saved into
--.Pa tmux-client-PID.log
--and
--.Pa tmux-server-PID.log
--files in the current directory, where
--.Em PID
--is the PID of the server or client process.
--.It Fl V
--Report the
--.Nm
--version.
--.It Ar command Op Ar flags
--This specifies one of a set of commands used to control
--.Nm ,
--as described in the following sections.
--If no commands are specified, the
--.Ic new-session
--command is assumed.
--.El
--.Sh KEY BINDINGS
--.Nm
--may be controlled from an attached client by using a key combination of a
--prefix key,
--.Ql C-b
--(Ctrl-b) by default, followed by a command key.
--.Pp
--The default command key bindings are:
--.Pp
--.Bl -tag -width "XXXXXXXXXX" -offset indent -compact
--.It C-b
--Send the prefix key (C-b) through to the application.
--.It C-o
--Rotate the panes in the current window forwards.
--.It C-z
--Suspend the
--.Nm
--client.
--.It !
--Break the current pane out of the window.
--.It \&"
--Split the current pane into two, top and bottom.
--.It #
--List all paste buffers.
--.It $
--Rename the current session.
--.It %
--Split the current pane into two, left and right.
--.It &
--Kill the current window.
--.It '
--Prompt for a window index to select.
--.It ,
--Rename the current window.
--.It -
--Delete the most recently copied buffer of text.
--.It .
--Prompt for an index to move the current window.
--.It 0 to 9
--Select windows 0 to 9.
--.It :
--Enter the
--.Nm
--command prompt.
--.It ;
--Move to the previously active pane.
--.It =
--Choose which buffer to paste interactively from a list.
--.It \&?
--List all key bindings.
--.It D
--Choose a client to detach.
--.It \&[
--Enter copy mode to copy text or view the history.
--.It \&]
--Paste the most recently copied buffer of text.
--.It c
--Create a new window.
--.It d
--Detach the current client.
--.It f
--Prompt to search for text in open windows.
--.It i
--Display some information about the current window.
--.It l
--Move to the previously selected window.
--.It n
--Change to the next window.
--.It o
--Select the next pane in the current window.
--.It p
--Change to the previous window.
--.It q
--Briefly display pane indexes.
--.It r
--Force redraw of the attached client.
--.It s
--Select a new session for the attached client interactively.
--.It L
--Switch the attached client back to the last session.
--.It t
--Show the time.
--.It w
--Choose the current window interactively.
--.It x
--Kill the current pane.
--.It {
--Swap the current pane with the previous pane.
--.It }
--Swap the current pane with the next pane.
--.It ~
--Show previous messages from
--.Nm ,
--if any.
--.It Page Up
--Enter copy mode and scroll one page up.
--.It Up, Down
--.It Left, Right
--Change to the pane above, below, to the left, or to the right of the current
--pane.
--.It M-1 to M-5
--Arrange panes in one of the five preset layouts: even-horizontal,
--even-vertical, main-horizontal, main-vertical, or tiled.
--.It M-n
--Move to the next window with a bell or activity marker.
--.It M-o
--Rotate the panes in the current window backwards.
--.It M-p
--Move to the previous window with a bell or activity marker.
--.It C-Up, C-Down
--.It C-Left, C-Right
--Resize the current pane in steps of one cell.
--.It M-Up, M-Down
--.It M-Left, M-Right
--Resize the current pane in steps of five cells.
--.El
--.Pp
--Key bindings may be changed with the
--.Ic bind-key
--and
--.Ic unbind-key
--commands.
--.Sh COMMANDS
--This section contains a list of the commands supported by
--.Nm .
--Most commands accept the optional
--.Fl t
--argument with one of
--.Ar target-client ,
--.Ar target-session
--.Ar target-window ,
--or
--.Ar target-pane .
--These specify the client, session, window or pane which a command should affect.
--.Ar target-client
--is the name of the
--.Xr pty 4
--file to which the client is connected, for example either of
--.Pa /dev/ttyp1
--or
--.Pa ttyp1
--for the client attached to
--.Pa /dev/ttyp1 .
--If no client is specified, the current client is chosen, if possible, or an
--error is reported.
--Clients may be listed with the
--.Ic list-clients
--command.
--.Pp
--.Ar target-session
--is the session id prefixed with a $, the name of a session (as listed by the
--.Ic list-sessions
--command), or the name of a client with the same syntax as
--.Ar target-client ,
--in which case the session attached to the client is used.
--When looking for the session name,
--.Nm
--initially searches for an exact match; if none is found, the session names
--are checked for any for which
--.Ar target-session
--is a prefix or for which it matches as an
--.Xr fnmatch 3
--pattern.
--If a single match is found, it is used as the target session; multiple matches
--produce an error.
--If a session is omitted, the current session is used if available; if no
--current session is available, the most recently used is chosen.
--.Pp
--.Ar target-window
--specifies a window in the form
--.Em session Ns \&: Ns Em window .
--.Em session
--follows the same rules as for
--.Ar target-session ,
--and
--.Em window
--is looked for in order: as a window index, for example mysession:1;
--as a window ID, such as @1;
--as an exact window name, such as mysession:mywindow; then as an
--.Xr fnmatch 3
--pattern or the start of a window name, such as mysession:mywin* or
--mysession:mywin.
--An empty window name specifies the next unused index if appropriate (for
--example the
--.Ic new-window
--and
--.Ic link-window
--commands)
--otherwise the current window in
--.Em session
--is chosen.
--The special character
--.Ql \&!
--uses the last (previously current) window,
--.Ql ^
--selects the highest numbered window,
--.Ql $
--selects the lowest numbered window, and
--.Ql +
--and
--.Ql -
--select the next window or the previous window by number.
--When the argument does not contain a colon,
--.Nm
--first attempts to parse it as window; if that fails, an attempt is made to
--match a session.
--.Pp
--.Ar target-pane
--takes a similar form to
--.Ar target-window
--but with the optional addition of a period followed by a pane index, for
--example: mysession:mywindow.1.
--If the pane index is omitted, the currently active pane in the specified
--window is used.
--If neither a colon nor period appears,
--.Nm
--first attempts to use the argument as a pane index; if that fails, it is looked
--up as for
--.Ar target-window .
--A
--.Ql +
--or
--.Ql -
--indicate the next or previous pane index, respectively.
--One of the strings
--.Em top ,
--.Em bottom ,
--.Em left ,
--.Em right ,
--.Em top-left ,
--.Em top-right ,
--.Em bottom-left
--or
--.Em bottom-right
--may be used instead of a pane index.
--.Pp
--The special characters
--.Ql +
--and
--.Ql -
--may be followed by an offset, for example:
--.Bd -literal -offset indent
--select-window -t:+2
--.Ed
--.Pp
--When dealing with a session that doesn't contain sequential window indexes,
--they will be correctly skipped.
--.Pp
--.Nm
--also gives each pane created in a server an identifier consisting of a
--.Ql %
--and a number, starting from zero.
--A pane's identifier is unique for the life of the
--.Nm
--server and is passed to the child process of the pane in the
--.Ev TMUX_PANE
--environment variable.
--It may be used alone to target a pane or the window containing it.
--.Pp
--.Ar shell-command
--arguments are
--.Xr sh 1
--commands.
--These must be passed as a single item, which typically means quoting them, for
--example:
--.Bd -literal -offset indent
--new-window 'vi /etc/passwd'
--.Ed
--.Pp
--.Ar command
--.Op Ar arguments
--refers to a
--.Nm
--command, passed with the command and arguments separately, for example:
--.Bd -literal -offset indent
--bind-key F1 set-window-option force-width 81
--.Ed
--.Pp
--Or if using
--.Xr sh 1 :
--.Bd -literal -offset indent
--$ tmux bind-key F1 set-window-option force-width 81
--.Ed
--.Pp
--Multiple commands may be specified together as part of a
--.Em command sequence .
--Each command should be separated by spaces and a semicolon;
--commands are executed sequentially from left to right and
--lines ending with a backslash continue on to the next line,
--except when escaped by another backslash.
--A literal semicolon may be included by escaping it with a backslash (for
--example, when specifying a command sequence to
--.Ic bind-key ) .
--.Pp
--Example
--.Nm
--commands include:
--.Bd -literal -offset indent
--refresh-client -t/dev/ttyp2
--
--rename-session -tfirst newname
--
--set-window-option -t:0 monitor-activity on
--
--new-window ; split-window -d
--
--bind-key R source-file ~/.tmux.conf \e; \e
--	display-message "source-file done"
--.Ed
--.Pp
--Or from
--.Xr sh 1 :
--.Bd -literal -offset indent
--$ tmux kill-window -t :1
--
--$ tmux new-window \e; split-window -d
--
--$ tmux new-session -d 'vi /etc/passwd' \e; split-window -d \e; attach
--.Ed
--.Sh CLIENTS AND SESSIONS
--The
--.Nm
--server manages clients, sessions, windows and panes.
--Clients are attached to sessions to interact with them, either
--when they are created with the
--.Ic new-session
--command, or later with the
--.Ic attach-session
--command.
--Each session has one or more windows
--.Em linked
--into it.
--Windows may be linked to multiple sessions and are made up of one or
--more panes,
--each of which contains a pseudo terminal.
--Commands for creating, linking and otherwise manipulating windows
--are covered
--in the
--.Sx WINDOWS AND PANES
--section.
--.Pp
--The following commands are available to manage clients and sessions:
--.Bl -tag -width Ds
--.It Xo Ic attach-session
--.Op Fl dr
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic attach )
--If run from outside
--.Nm ,
--create a new client in the current terminal and attach it to
--.Ar target-session .
--If used from inside, switch the current client.
--If
--.Fl d
--is specified, any other clients attached to the session are detached.
--.Fl r
--signifies the client is read-only (only keys bound to the
--.Ic detach-client
--or
--.Ic switch-client
--commands have any effect)
--.Pp
--If no server is started,
--.Ic attach-session
--will attempt to start it; this will fail unless sessions are created in the
--configuration file.
--.Pp
--The
--.Ar target-session
--rules for
--.Ic attach-session
--are slightly adjusted: if
--.Nm
--needs to select the most recently used session, it will prefer the most
--recently used
--.Em unattached
--session.
--.It Xo Ic detach-client
--.Op Fl P
--.Op Fl a
--.Op Fl s Ar target-session
--.Op Fl t Ar target-client
--.Xc
--.D1 (alias: Ic detach )
--Detach the current client if bound to a key, the client specified with
--.Fl t ,
--or all clients currently attached to the session specified by
--.Fl s .
--The
--.Fl a
--option kills all but the client given with
--.Fl t .
--If
--.Fl P
--is given, send SIGHUP to the parent process of the client, typically causing it
--to exit.
--.It Ic has-session Op Fl t Ar target-session
--.D1 (alias: Ic has )
--Report an error and exit with 1 if the specified session does not exist.
--If it does exist, exit with 0.
--.It Ic kill-server
--Kill the
--.Nm
--server and clients and destroy all sessions.
--.It Ic kill-session
--.Op Fl a
--.Op Fl t Ar target-session
--Destroy the given session, closing any windows linked to it and no other
--sessions, and detaching all clients attached to it.
--If
--.Fl a
--is given, all sessions but the specified one is killed.
--.It Xo Ic list-clients
--.Op Fl F Ar format
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic lsc )
--List all clients attached to the server.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--If
--.Ar target-session
--is specified, list only clients connected to that session.
--.It Ic list-commands
--.D1 (alias: Ic lscm )
--List the syntax of all commands supported by
--.Nm .
--.It Ic list-sessions Op Fl F Ar format
--.D1 (alias: Ic ls )
--List all sessions managed by the server.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--.It Ic lock-client Op Fl t Ar target-client
--.D1 (alias: Ic lockc )
--Lock
--.Ar target-client ,
--see the
--.Ic lock-server
--command.
--.It Ic lock-session Op Fl t Ar target-session
--.D1 (alias: Ic locks )
--Lock all clients attached to
--.Ar target-session .
--.It Xo Ic new-session
--.Op Fl AdDP
--.Op Fl F Ar format
--.Op Fl n Ar window-name
--.Op Fl s Ar session-name
--.Op Fl t Ar target-session
--.Op Fl x Ar width
--.Op Fl y Ar height
--.Op Ar shell-command
--.Xc
--.D1 (alias: Ic new )
--Create a new session with name
--.Ar session-name .
--.Pp
--The new session is attached to the current terminal unless
--.Fl d
--is given.
--.Ar window-name
--and
--.Ar shell-command
--are the name of and shell command to execute in the initial window.
--If
--.Fl d
--is used,
--.Fl x
--and
--.Fl y
--specify the size of the initial window (80 by 24 if not given).
--.Pp
--If run from a terminal, any
--.Xr termios 4
--special characters are saved and used for new windows in the new session.
--.Pp
--The
--.Fl A
--flag makes
--.Ic new-session
--behave like
--.Ic attach-session
--if
--.Ar session-name
--already exists; in the case,
--.Fl D
--behaves like
--.Fl d
--to
--.Ic attach-session .
--.Pp
--If
--.Fl t
--is given, the new session is
--.Em grouped
--with
--.Ar target-session .
--This means they share the same set of windows - all windows from
--.Ar target-session
--are linked to the new session and any subsequent new windows or windows being
--closed are applied to both sessions.
--The current and previous window and any session options remain independent and
--either session may be killed without affecting the other.
--Giving
--.Fl n
--or
--.Ar shell-command
--are invalid if
--.Fl t
--is used.
--.Pp
--The
--.Fl P
--option prints information about the new session after it has been created.
--By default, it uses the format
--.Ql #{session_name}:
--but a different format may be specified with
--.Fl F .
--.It Xo Ic refresh-client
--.Op Fl S
--.Op Fl t Ar target-client
--.Xc
--.D1 (alias: Ic refresh )
--Refresh the current client if bound to a key, or a single client if one is given
--with
--.Fl t .
--If
--.Fl S
--is specified, only update the client's status bar.
--.It Xo Ic rename-session
--.Op Fl t Ar target-session
--.Ar new-name
--.Xc
--.D1 (alias: Ic rename )
--Rename the session to
--.Ar new-name .
--.It Xo Ic show-messages
--.Op Fl t Ar target-client
--.Xc
--.D1 (alias: Ic showmsgs )
--Any messages displayed on the status line are saved in a per-client message
--log, up to a maximum of the limit set by the
--.Ar message-limit
--session option for the session attached to that client.
--This command displays the log for
--.Ar target-client .
--.It Ic source-file Ar path
--.D1 (alias: Ic source )
--Execute commands from
--.Ar path .
--.It Ic start-server
--.D1 (alias: Ic start )
--Start the
--.Nm
--server, if not already running, without creating any sessions.
--.It Xo Ic suspend-client
--.Op Fl t Ar target-client
--.Xc
--.D1 (alias: Ic suspendc )
--Suspend a client by sending
--.Dv SIGTSTP
--(tty stop).
--.It Xo Ic switch-client
--.Op Fl lnpr
--.Op Fl c Ar target-client
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic switchc )
--Switch the current session for client
--.Ar target-client
--to
--.Ar target-session .
--If
--.Fl l ,
--.Fl n
--or
--.Fl p
--is used, the client is moved to the last, next or previous session
--respectively.
--.Fl r
--toggles whether a client is read-only (see the
--.Ic attach-session
--command).
--.El
--.Sh WINDOWS AND PANES
--A
--.Nm
--window may be in one of several modes.
--The default permits direct access to the terminal attached to the window.
--The other is copy mode, which permits a section of a window or its
--history to be copied to a
--.Em paste buffer
--for later insertion into another window.
--This mode is entered with the
--.Ic copy-mode
--command, bound to
--.Ql \&[
--by default.
--It is also entered when a command that produces output, such as
--.Ic list-keys ,
--is executed from a key binding.
--.Pp
--The keys available depend on whether emacs or vi mode is selected
--(see the
--.Ic mode-keys
--option).
--The following keys are supported as appropriate for the mode:
--.Bl -column "FunctionXXXXXXXXXXXXXXXXX" "viXXXXXXXXXX" "emacs" -offset indent
--.It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
--.It Li "Back to indentation" Ta "^" Ta "M-m"
--.It Li "Bottom of history" Ta "G" Ta "M-<"
--.It Li "Clear selection" Ta "Escape" Ta "C-g"
--.It Li "Copy selection" Ta "Enter" Ta "M-w"
--.It Li "Cursor down" Ta "j" Ta "Down"
--.It Li "Cursor left" Ta "h" Ta "Left"
--.It Li "Cursor right" Ta "l" Ta "Right"
--.It Li "Cursor to bottom line" Ta "L" Ta ""
--.It Li "Cursor to middle line" Ta "M" Ta "M-r"
--.It Li "Cursor to top line" Ta "H" Ta "M-R"
--.It Li "Cursor up" Ta "k" Ta "Up"
--.It Li "Delete entire line" Ta "d" Ta "C-u"
--.It Li "Delete/Copy to end of line" Ta "D" Ta "C-k"
--.It Li "End of line" Ta "$" Ta "C-e"
--.It Li "Go to line" Ta ":" Ta "g"
--.It Li "Half page down" Ta "C-d" Ta "M-Down"
--.It Li "Half page up" Ta "C-u" Ta "M-Up"
--.It Li "Jump forward" Ta "f" Ta "f"
--.It Li "Jump to forward" Ta "t" Ta ""
--.It Li "Jump backward" Ta "F" Ta "F"
--.It Li "Jump to backward" Ta "T" Ta ""
--.It Li "Jump again" Ta ";" Ta ";"
--.It Li "Jump again in reverse" Ta "," Ta ","
--.It Li "Next page" Ta "C-f" Ta "Page down"
--.It Li "Next space" Ta "W" Ta ""
--.It Li "Next space, end of word" Ta "E" Ta ""
--.It Li "Next word" Ta "w" Ta ""
--.It Li "Next word end" Ta "e" Ta "M-f"
--.It Li "Paste buffer" Ta "p" Ta "C-y"
--.It Li "Previous page" Ta "C-b" Ta "Page up"
--.It Li "Previous word" Ta "b" Ta "M-b"
--.It Li "Previous space" Ta "B" Ta ""
--.It Li "Quit mode" Ta "q" Ta "Escape"
--.It Li "Rectangle toggle" Ta "v" Ta "R"
--.It Li "Scroll down" Ta "C-Down or C-e" Ta "C-Down"
--.It Li "Scroll up" Ta "C-Up or C-y" Ta "C-Up"
--.It Li "Search again" Ta "n" Ta "n"
--.It Li "Search again in reverse" Ta "N" Ta "N"
--.It Li "Search backward" Ta "?" Ta "C-r"
--.It Li "Search forward" Ta "/" Ta "C-s"
--.It Li "Start of line" Ta "0" Ta "C-a"
--.It Li "Start selection" Ta "Space" Ta "C-Space"
--.It Li "Top of history" Ta "g" Ta "M->"
--.It Li "Transpose characters" Ta "" Ta "C-t"
--.El
--.Pp
--The next and previous word keys use space and the
--.Ql - ,
--.Ql _
--and
--.Ql @
--characters as word delimiters by default, but this can be adjusted by
--setting the
--.Em word-separators
--session option.
--Next word moves to the start of the next word, next word end to the end of the
--next word and previous word to the start of the previous word.
--The three next and previous space keys work similarly but use a space alone as
--the word separator.
--.Pp
--The jump commands enable quick movement within a line.
--For instance, typing
--.Ql f
--followed by
--.Ql /
--will move the cursor to the next
--.Ql /
--character on the current line.
--A
--.Ql \&;
--will then jump to the next occurrence.
--.Pp
--Commands in copy mode may be prefaced by an optional repeat count.
--With vi key bindings, a prefix is entered using the number keys; with
--emacs, the Alt (meta) key and a number begins prefix entry.
--For example, to move the cursor forward by ten words, use
--.Ql M-1 0 M-f
--in emacs mode, and
--.Ql 10w
--in vi.
--.Pp
--When copying the selection, the repeat count indicates the buffer index to
--replace, if used.
--.Pp
--Mode key bindings are defined in a set of named tables:
--.Em vi-edit
--and
--.Em emacs-edit
--for keys used when line editing at the command prompt;
--.Em vi-choice
--and
--.Em emacs-choice
--for keys used when choosing from lists (such as produced by the
--.Ic choose-window
--command); and
--.Em vi-copy
--and
--.Em emacs-copy
--used in copy mode.
--The tables may be viewed with the
--.Ic list-keys
--command and keys modified or removed with
--.Ic bind-key
--and
--.Ic unbind-key .
--One command accepts an argument,
--.Ic copy-pipe ,
--which copies the selection and pipes it to a command.
--For example the following will bind
--.Ql C-q
--to copy the selection into
--.Pa /tmp
--as well as the paste buffer:
--.Bd -literal -offset indent
--bind-key -temacs-copy C-q copy-pipe "cat >/tmp/out"
--.Ed
--.Pp
--The paste buffer key pastes the first line from the top paste buffer on the
--stack.
--.Pp
--The synopsis for the
--.Ic copy-mode
--command is:
--.Bl -tag -width Ds
--.It Xo Ic copy-mode
--.Op Fl u
--.Op Fl t Ar target-pane
--.Xc
--Enter copy mode.
--The
--.Fl u
--option scrolls one page up.
--.El
--.Pp
--Each window displayed by
--.Nm
--may be split into one or more
--.Em panes ;
--each pane takes up a certain area of the display and is a separate terminal.
--A window may be split into panes using the
--.Ic split-window
--command.
--Windows may be split horizontally (with the
--.Fl h
--flag) or vertically.
--Panes may be resized with the
--.Ic resize-pane
--command (bound to
--.Ql C-up ,
--.Ql C-down
--.Ql C-left
--and
--.Ql C-right
--by default), the current pane may be changed with the
--.Ic select-pane
--command and the
--.Ic rotate-window
--and
--.Ic swap-pane
--commands may be used to swap panes without changing their position.
--Panes are numbered beginning from zero in the order they are created.
--.Pp
--A number of preset
--.Em layouts
--are available.
--These may be selected with the
--.Ic select-layout
--command or cycled with
--.Ic next-layout
--(bound to
--.Ql Space
--by default); once a layout is chosen, panes within it may be moved and resized
--as normal.
--.Pp
--The following layouts are supported:
--.Bl -tag -width Ds
--.It Ic even-horizontal
--Panes are spread out evenly from left to right across the window.
--.It Ic even-vertical
--Panes are spread evenly from top to bottom.
--.It Ic main-horizontal
--A large (main) pane is shown at the top of the window and the remaining panes
--are spread from left to right in the leftover space at the bottom.
--Use the
--.Em main-pane-height
--window option to specify the height of the top pane.
--.It Ic main-vertical
--Similar to
--.Ic main-horizontal
--but the large pane is placed on the left and the others spread from top to
--bottom along the right.
--See the
--.Em main-pane-width
--window option.
--.It Ic tiled
--Panes are spread out as evenly as possible over the window in both rows and
--columns.
--.El
--.Pp
--In addition,
--.Ic select-layout
--may be used to apply a previously used layout - the
--.Ic list-windows
--command displays the layout of each window in a form suitable for use with
--.Ic select-layout .
--For example:
--.Bd -literal -offset indent
--$ tmux list-windows
--0: ksh [159x48]
--    layout: bb62,159x48,0,0{79x48,0,0,79x48,80,0}
--$ tmux select-layout bb62,159x48,0,0{79x48,0,0,79x48,80,0}
--.Ed
--.Pp
--.Nm
--automatically adjusts the size of the layout for the current window size.
--Note that a layout cannot be applied to a window with more panes than that
--from which the layout was originally defined.
--.Pp
--Commands related to windows and panes are as follows:
--.Bl -tag -width Ds
--.It Xo Ic break-pane
--.Op Fl dP
--.Op Fl F Ar format
--.Op Fl t Ar target-pane
--.Xc
--.D1 (alias: Ic breakp )
--Break
--.Ar target-pane
--off from its containing window to make it the only pane in a new window.
--If
--.Fl d
--is given, the new window does not become the current window.
--The
--.Fl P
--option prints information about the new window after it has been created.
--By default, it uses the format
--.Ql #{session_name}:#{window_index}
--but a different format may be specified with
--.Fl F .
--.It Xo Ic capture-pane
--.Op Fl aepPq
--.Op Fl b Ar buffer-index
--.Op Fl E Ar end-line
--.Op Fl S Ar start-line
--.Op Fl t Ar target-pane
--.Xc
--.D1 (alias: Ic capturep )
--Capture the contents of a pane.
--If
--.Fl p
--is given, the output goes to stdout, otherwise to the buffer specified with
--.Fl b
--or a new buffer if omitted.
--If
--.Fl a
--is given, the alternate screen is used, and the history is not accessible.
--If no alternate screen exists, an error will be returned unless
--.Fl q
--is given.
--If
--.Fl e
--is given, the output includes escape sequences for text and background
--attributes.
--.Fl C
--also escapes non-printable characters as octal \exxx.
--.Fl J
--joins wrapped lines and preserves trailing spaces at each line's end.
--.Fl P
--captures only any output that the pane has received that is the beginning of an
--as-yet incomplete escape sequence.
--.Pp
--.Fl S
--and
--.Fl E
--specify the starting and ending line numbers, zero is the first line of the
--visible pane and negative numbers are lines in the history.
--The default is to capture only the visible contents of the pane.
--.It Xo
--.Ic choose-client
--.Op Fl F Ar format
--.Op Fl t Ar target-window
--.Op Ar template
--.Xc
--Put a window into client choice mode, allowing a client to be selected
--interactively from a list.
--After a client is chosen,
--.Ql %%
--is replaced by the client
--.Xr pty 4
--path in
--.Ar template
--and the result executed as a command.
--If
--.Ar template
--is not given, "detach-client -t '%%'" is used.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Xo
--.Ic choose-list
--.Op Fl l Ar items
--.Op Fl t Ar target-window
--.Op Ar template
--.Xc
--Put a window into list choice mode, allowing
--.Ar items
--to be selected.
--.Ar items
--can be a comma-separated list to display more than one item.
--If an item has spaces, that entry must be quoted.
--After an item is chosen,
--.Ql %%
--is replaced by the chosen item in the
--.Ar template
--and the result is executed as a command.
--If
--.Ar template
--is not given, "run-shell '%%'" is used.
--.Ar items
--also accepts format specifiers.
--For the meaning of this see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Xo
--.Ic choose-session
--.Op Fl F Ar format
--.Op Fl t Ar target-window
--.Op Ar template
--.Xc
--Put a window into session choice mode, where a session may be selected
--interactively from a list.
--When one is chosen,
--.Ql %%
--is replaced by the session name in
--.Ar template
--and the result executed as a command.
--If
--.Ar template
--is not given, "switch-client -t '%%'" is used.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Xo
--.Ic choose-tree
--.Op Fl suw
--.Op Fl b Ar session-template
--.Op Fl c Ar window-template
--.Op Fl S Ar format
--.Op Fl W Ar format
--.Op Fl t Ar target-window
--.Xc
--Put a window into tree choice mode, where either sessions or windows may be
--selected interactively from a list.
--By default, windows belonging to a session are indented to show their
--relationship to a session.
--.Pp
--Note that the
--.Ic choose-window
--and
--.Ic choose-session
--commands are wrappers around
--.Ic choose-tree .
--.Pp
--If
--.Fl s
--is given, will show sessions.
--If
--.Fl w
--is given, will show windows.
--.Pp
--By default, the tree is collapsed and sessions must be expanded to windows
--with the right arrow key.
--The
--.Fl u
--option will start with all sessions expanded instead.
--.Pp
--If
--.Fl b
--is given, will override the default session command.
--Note that
--.Ql %%
--can be used and will be replaced with the session name.
--The default option if not specified is "switch-client -t '%%'".
--If
--.Fl c
--is given, will override the default window command.
--Like
--.Fl b ,
--.Ql %%
--can be used and will be replaced with the session name and window index.
--When a window is chosen from the list, the session command is run before the
--window command.
--.Pp
--If
--.Fl S
--is given will display the specified format instead of the default session
--format.
--If
--.Fl W
--is given will display the specified format instead of the default window
--format.
--For the meaning of the
--.Fl s
--and
--.Fl w
--options, see the
--.Sx FORMATS
--section.
--.Pp
--This command works only if at least one client is attached.
--.It Xo
--.Ic choose-window
--.Op Fl F Ar format
--.Op Fl t Ar target-window
--.Op Ar template
--.Xc
--Put a window into window choice mode, where a window may be chosen
--interactively from a list.
--After a window is selected,
--.Ql %%
--is replaced by the session name and window index in
--.Ar template
--and the result executed as a command.
--If
--.Ar template
--is not given, "select-window -t '%%'" is used.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Ic display-panes Op Fl t Ar target-client
--.D1 (alias: Ic displayp)
--Display a visible indicator of each pane shown by
--.Ar target-client .
--See the
--.Ic display-panes-time ,
--.Ic display-panes-colour ,
--and
--.Ic display-panes-active-colour
--session options.
--While the indicator is on screen, a pane may be selected with the
--.Ql 0
--to
--.Ql 9
--keys.
--.It Xo Ic find-window
--.Op Fl CNT
--.Op Fl F Ar format
--.Op Fl t Ar target-window
--.Ar match-string
--.Xc
--.D1 (alias: Ic findw )
--Search for the
--.Xr fnmatch 3
--pattern
--.Ar match-string
--in window names, titles, and visible content (but not history).
--The flags control matching behavior:
--.Fl C
--matches only visible window contents,
--.Fl N
--matches only the window name and
--.Fl T
--matches only the window title.
--The default is
--.Fl CNT .
--If only one window is matched, it'll be automatically selected,
--otherwise a choice list is shown.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Xo Ic join-pane
--.Op Fl bdhv
--.Oo Fl l
--.Ar size |
--.Fl p Ar percentage Oc
--.Op Fl s Ar src-pane
--.Op Fl t Ar dst-pane
--.Xc
--.D1 (alias: Ic joinp )
--Like
--.Ic split-window ,
--but instead of splitting
--.Ar dst-pane
--and creating a new pane, split it and move
--.Ar src-pane
--into the space.
--This can be used to reverse
--.Ic break-pane .
--The
--.Fl b
--option causes
--.Ar src-pane
--to be joined to left of or above
--.Ar dst-pane .
--.It Xo Ic kill-pane
--.Op Fl a
--.Op Fl t Ar target-pane
--.Xc
--.D1 (alias: Ic killp )
--Destroy the given pane.
--If no panes remain in the containing window, it is also destroyed.
--The
--.Fl a
--option kills all but the pane given with
--.Fl t .
--.It Xo Ic kill-window
--.Op Fl a
--.Op Fl t Ar target-window
--.Xc
--.D1 (alias: Ic killw )
--Kill the current window or the window at
--.Ar target-window ,
--removing it from any sessions to which it is linked.
--The
--.Fl a
--option kills all but the window given with
--.Fl t .
--.It Ic last-pane Op Fl t Ar target-window
--.D1 (alias: Ic lastp )
--Select the last (previously selected) pane.
--.It Ic last-window Op Fl t Ar target-session
--.D1 (alias: Ic last )
--Select the last (previously selected) window.
--If no
--.Ar target-session
--is specified, select the last window of the current session.
--.It Xo Ic link-window
--.Op Fl dk
--.Op Fl s Ar src-window
--.Op Fl t Ar dst-window
--.Xc
--.D1 (alias: Ic linkw )
--Link the window at
--.Ar src-window
--to the specified
--.Ar dst-window .
--If
--.Ar dst-window
--is specified and no such window exists, the
--.Ar src-window
--is linked there.
--If
--.Fl k
--is given and
--.Ar dst-window
--exists, it is killed, otherwise an error is generated.
--If
--.Fl d
--is given, the newly linked window is not selected.
--.It Xo Ic list-panes
--.Op Fl as
--.Op Fl F Ar format
--.Op Fl t Ar target
--.Xc
--.D1 (alias: Ic lsp )
--If
--.Fl a
--is given,
--.Ar target
--is ignored and all panes on the server are listed.
--If
--.Fl s
--is given,
--.Ar target
--is a session (or the current session).
--If neither is given,
--.Ar target
--is a window (or the current window).
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--.It Xo Ic list-windows
--.Op Fl a
--.Op Fl F Ar format
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic lsw )
--If
--.Fl a
--is given, list all windows on the server.
--Otherwise, list windows in the current session or in
--.Ar target-session .
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--.It Xo Ic move-pane
--.Op Fl bdhv
--.Oo Fl l
--.Ar size |
--.Fl p Ar percentage Oc
--.Op Fl s Ar src-pane
--.Op Fl t Ar dst-pane
--.Xc
--.D1 (alias: Ic movep )
--Like
--.Ic join-pane ,
--but
--.Ar src-pane
--and
--.Ar dst-pane
--may belong to the same window.
--.It Xo Ic move-window
--.Op Fl rdk
--.Op Fl s Ar src-window
--.Op Fl t Ar dst-window
--.Xc
--.D1 (alias: Ic movew )
--This is similar to
--.Ic link-window ,
--except the window at
--.Ar src-window
--is moved to
--.Ar dst-window .
--With
--.Fl r ,
--all windows in the session are renumbered in sequential order, respecting
--the
--.Ic base-index
--option.
--.It Xo Ic new-window
--.Op Fl adkP
--.Op Fl c Ar start-directory
--.Op Fl F Ar format
--.Op Fl n Ar window-name
--.Op Fl t Ar target-window
--.Op Ar shell-command
--.Xc
--.D1 (alias: Ic neww )
--Create a new window.
--With
--.Fl a ,
--the new window is inserted at the next index up from the specified
--.Ar target-window ,
--moving windows up if necessary,
--otherwise
--.Ar target-window
--is the new window location.
--.Pp
--If
--.Fl d
--is given, the session does not make the new window the current window.
--.Ar target-window
--represents the window to be created; if the target already exists an error is
--shown, unless the
--.Fl k
--flag is used, in which case it is destroyed.
--.Ar shell-command
--is the command to execute.
--If
--.Ar shell-command
--is not specified, the value of the
--.Ic default-command
--option is used.
--.Fl c
--specifies the working directory in which the new window is created.
--It may have an absolute path or one of the following values (or a subdirectory):
--.Bl -column "XXXXXXXXXXXX" "XXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
--.It Li "Empty string" Ta "Current pane's directory"
--.It Li "~" Ta "User's home directory"
--.It Li "-" Ta "Where session was started"
--.It Li "." Ta "Where server was started"
--.El
--.Pp
--When the shell command completes, the window closes.
--See the
--.Ic remain-on-exit
--option to change this behaviour.
--.Pp
--The
--.Ev TERM
--environment variable must be set to
--.Dq screen
--for all programs running
--.Em inside
--.Nm .
--New windows will automatically have
--.Dq TERM=screen
--added to their environment, but care must be taken not to reset this in shell
--start-up files.
--.Pp
--The
--.Fl P
--option prints information about the new window after it has been created.
--By default, it uses the format
--.Ql #{session_name}:#{window_index}
--but a different format may be specified with
--.Fl F .
--.It Ic next-layout Op Fl t Ar target-window
--.D1 (alias: Ic nextl )
--Move a window to the next layout and rearrange the panes to fit.
--.It Xo Ic next-window
--.Op Fl a
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic next )
--Move to the next window in the session.
--If
--.Fl a
--is used, move to the next window with an alert.
--.It Xo Ic pipe-pane
--.Op Fl o
--.Op Fl t Ar target-pane
--.Op Ar shell-command
--.Xc
--.D1 (alias: Ic pipep )
--Pipe any output sent by the program in
--.Ar target-pane
--to a shell command.
--A pane may only be piped to one command at a time, any existing pipe is
--closed before
--.Ar shell-command
--is executed.
--The
--.Ar shell-command
--string may contain the special character sequences supported by the
--.Ic status-left
--option.
--If no
--.Ar shell-command
--is given, the current pipe (if any) is closed.
--.Pp
--The
--.Fl o
--option only opens a new pipe if no previous pipe exists, allowing a pipe to
--be toggled with a single key, for example:
--.Bd -literal -offset indent
--bind-key C-p pipe-pane -o 'cat >>~/output.#I-#P'
--.Ed
--.It Xo Ic previous-layout
--.Op Fl t Ar target-window
--.Xc
--.D1 (alias: Ic prevl )
--Move to the previous layout in the session.
--.It Xo Ic previous-window
--.Op Fl a
--.Op Fl t Ar target-session
--.Xc
--.D1 (alias: Ic prev )
--Move to the previous window in the session.
--With
--.Fl a ,
--move to the previous window with an alert.
--.It Xo Ic rename-window
--.Op Fl t Ar target-window
--.Ar new-name
--.Xc
--.D1 (alias: Ic renamew )
--Rename the current window, or the window at
--.Ar target-window
--if specified, to
--.Ar new-name .
--.It Xo Ic resize-pane
--.Op Fl DLRUZ
--.Op Fl t Ar target-pane
--.Op Fl x Ar width
--.Op Fl y Ar height
--.Op Ar adjustment
--.Xc
--.D1 (alias: Ic resizep )
--Resize a pane, up, down, left or right by
--.Ar adjustment
--with
--.Fl U ,
--.Fl D ,
--.Fl L
--or
--.Fl R ,
--or
--to an absolute size
--with
--.Fl x
--or
--.Fl y .
--The
--.Ar adjustment
--is given in lines or cells (the default is 1).
--.Pp
--With
--.Fl Z ,
--the active pane is toggled between zoomed (occupying the whole of the window)
--and unzoomed (its normal position in the layout).
--.It Xo Ic respawn-pane
--.Op Fl k
--.Op Fl t Ar target-pane
--.Op Ar shell-command
--.Xc
--.D1 (alias: Ic respawnp )
--Reactivate a pane in which the command has exited (see the
--.Ic remain-on-exit
--window option).
--If
--.Ar shell-command
--is not given, the command used when the pane was created is executed.
--The pane must be already inactive, unless
--.Fl k
--is given, in which case any existing command is killed.
--.It Xo Ic respawn-window
--.Op Fl k
--.Op Fl t Ar target-window
--.Op Ar shell-command
--.Xc
--.D1 (alias: Ic respawnw )
--Reactivate a window in which the command has exited (see the
--.Ic remain-on-exit
--window option).
--If
--.Ar shell-command
--is not given, the command used when the window was created is executed.
--The window must be already inactive, unless
--.Fl k
--is given, in which case any existing command is killed.
--.It Xo Ic rotate-window
--.Op Fl DU
--.Op Fl t Ar target-window
--.Xc
--.D1 (alias: Ic rotatew )
--Rotate the positions of the panes within a window, either upward (numerically
--lower) with
--.Fl U
--or downward (numerically higher).
--.It Xo Ic select-layout
--.Op Fl np
--.Op Fl t Ar target-window
--.Op Ar layout-name
--.Xc
--.D1 (alias: Ic selectl )
--Choose a specific layout for a window.
--If
--.Ar layout-name
--is not given, the last preset layout used (if any) is reapplied.
--.Fl n
--and
--.Fl p
--are equivalent to the
--.Ic next-layout
--and
--.Ic previous-layout
--commands.
--.It Xo Ic select-pane
--.Op Fl lDLRU
--.Op Fl t Ar target-pane
--.Xc
--.D1 (alias: Ic selectp )
--Make pane
--.Ar target-pane
--the active pane in window
--.Ar target-window .
--If one of
--.Fl D ,
--.Fl L ,
--.Fl R ,
--or
--.Fl U
--is used, respectively the pane below, to the left, to the right, or above the
--target pane is used.
--.Fl l
--is the same as using the
--.Ic last-pane
--command.
--.It Xo Ic select-window
--.Op Fl lnpT
--.Op Fl t Ar target-window
--.Xc
--.D1 (alias: Ic selectw )
--Select the window at
--.Ar target-window .
--.Fl l ,
--.Fl n
--and
--.Fl p
--are equivalent to the
--.Ic last-window ,
--.Ic next-window
--and
--.Ic previous-window
--commands.
--If
--.Fl T
--is given and the selected window is already the current window,
--the command behaves like
--.Ic last-window .
--.It Xo Ic split-window
--.Op Fl dhvP
--.Op Fl c Ar start-directory
--.Oo Fl l
--.Ar size |
--.Fl p Ar percentage Oc
--.Op Fl t Ar target-pane
--.Op Ar shell-command
--.Op Fl F Ar format
--.Xc
--.D1 (alias: Ic splitw )
--Create a new pane by splitting
--.Ar target-pane :
--.Fl h
--does a horizontal split and
--.Fl v
--a vertical split; if neither is specified,
--.Fl v
--is assumed.
--The
--.Fl l
--and
--.Fl p
--options specify the size of the new pane in lines (for vertical split) or in
--cells (for horizontal split), or as a percentage, respectively.
--All other options have the same meaning as for the
--.Ic new-window
--command.
--.It Xo Ic swap-pane
--.Op Fl dDU
--.Op Fl s Ar src-pane
--.Op Fl t Ar dst-pane
--.Xc
--.D1 (alias: Ic swapp )
--Swap two panes.
--If
--.Fl U
--is used and no source pane is specified with
--.Fl s ,
--.Ar dst-pane
--is swapped with the previous pane (before it numerically);
--.Fl D
--swaps with the next pane (after it numerically).
--.Fl d
--instructs
--.Nm
--not to change the active pane.
--.It Xo Ic swap-window
--.Op Fl d
--.Op Fl s Ar src-window
--.Op Fl t Ar dst-window
--.Xc
--.D1 (alias: Ic swapw )
--This is similar to
--.Ic link-window ,
--except the source and destination windows are swapped.
--It is an error if no window exists at
--.Ar src-window .
--.It Xo Ic unlink-window
--.Op Fl k
--.Op Fl t Ar target-window
--.Xc
--.D1 (alias: Ic unlinkw )
--Unlink
--.Ar target-window .
--Unless
--.Fl k
--is given, a window may be unlinked only if it is linked to multiple sessions -
--windows may not be linked to no sessions;
--if
--.Fl k
--is specified and the window is linked to only one session, it is unlinked and
--destroyed.
--.El
--.Sh KEY BINDINGS
--.Nm
--allows a command to be bound to most keys, with or without a prefix key.
--When specifying keys, most represent themselves (for example
--.Ql A
--to
--.Ql Z ) .
--Ctrl keys may be prefixed with
--.Ql C-
--or
--.Ql ^ ,
--and Alt (meta) with
--.Ql M- .
--In addition, the following special key names are accepted:
--.Em Up ,
--.Em Down ,
--.Em Left ,
--.Em Right ,
--.Em BSpace ,
--.Em BTab ,
--.Em DC
--(Delete),
--.Em End ,
--.Em Enter ,
--.Em Escape ,
--.Em F1
--to
--.Em F20 ,
--.Em Home ,
--.Em IC
--(Insert),
--.Em NPage/PageDown/PgDn ,
--.Em PPage/PageUp/PgUp ,
--.Em Space ,
--and
--.Em Tab .
--Note that to bind the
--.Ql \&"
--or
--.Ql '
--keys, quotation marks are necessary, for example:
--.Bd -literal -offset indent
--bind-key '"' split-window
--bind-key "'" new-window
--.Ed
--.Pp
--Commands related to key bindings are as follows:
--.Bl -tag -width Ds
--.It Xo Ic bind-key
--.Op Fl cnr
--.Op Fl t Ar key-table
--.Ar key Ar command Op Ar arguments
--.Xc
--.D1 (alias: Ic bind )
--Bind key
--.Ar key
--to
--.Ar command .
--By default (without
--.Fl t )
--the primary key bindings are modified (those normally activated with the prefix
--key); in this case, if
--.Fl n
--is specified, it is not necessary to use the prefix key,
--.Ar command
--is bound to
--.Ar key
--alone.
--The
--.Fl r
--flag indicates this key may repeat, see the
--.Ic repeat-time
--option.
--.Pp
--If
--.Fl t
--is present,
--.Ar key
--is bound in
--.Ar key-table :
--the binding for command mode with
--.Fl c
--or for normal mode without.
--To view the default bindings and possible commands, see the
--.Ic list-keys
--command.
--.It Ic list-keys Op Fl t Ar key-table
--.D1 (alias: Ic lsk )
--List all key bindings.
--Without
--.Fl t
--the primary key bindings - those executed when preceded by the prefix key -
--are printed.
--.Pp
--With
--.Fl t ,
--the key bindings in
--.Ar key-table
--are listed; this may be one of:
--.Em vi-edit ,
--.Em emacs-edit ,
--.Em vi-choice ,
--.Em emacs-choice ,
--.Em vi-copy
--or
--.Em emacs-copy .
--.It Xo Ic send-keys
--.Op Fl lR
--.Op Fl t Ar target-pane
--.Ar key Ar ...
--.Xc
--.D1 (alias: Ic send )
--Send a key or keys to a window.
--Each argument
--.Ar key
--is the name of the key (such as
--.Ql C-a
--or
--.Ql npage
--) to send; if the string is not recognised as a key, it is sent as a series of
--characters.
--The
--.Fl l
--flag disables key name lookup and sends the keys literally.
--All arguments are sent sequentially from first to last.
--The
--.Fl R
--flag causes the terminal state to be reset.
--.It Xo Ic send-prefix
--.Op Fl 2
--.Op Fl t Ar target-pane
--.Xc
--Send the prefix key, or with
--.Fl 2
--the secondary prefix key, to a window as if it was pressed.
--.It Xo Ic unbind-key
--.Op Fl acn
--.Op Fl t Ar key-table
--.Ar key
--.Xc
--.D1 (alias: Ic unbind )
--Unbind the command bound to
--.Ar key .
--Without
--.Fl t
--the primary key bindings are modified; in this case, if
--.Fl n
--is specified, the command bound to
--.Ar key
--without a prefix (if any) is removed.
--If
--.Fl a
--is present, all key bindings are removed.
--.Pp
--If
--.Fl t
--is present,
--.Ar key
--in
--.Ar key-table
--is unbound: the binding for command mode with
--.Fl c
--or for normal mode without.
--.El
--.Sh OPTIONS
--The appearance and behaviour of
--.Nm
--may be modified by changing the value of various options.
--There are three types of option:
--.Em server options ,
--.Em session options
--and
--.Em window options .
--.Pp
--The
--.Nm
--server has a set of global options which do not apply to any particular
--window or session.
--These are altered with the
--.Ic set-option
--.Fl s
--command, or displayed with the
--.Ic show-options
--.Fl s
--command.
--.Pp
--In addition, each individual session may have a set of session options, and
--there is a separate set of global session options.
--Sessions which do not have a particular option configured inherit the value
--from the global session options.
--Session options are set or unset with the
--.Ic set-option
--command and may be listed with the
--.Ic show-options
--command.
--The available server and session options are listed under the
--.Ic set-option
--command.
--.Pp
--Similarly, a set of window options is attached to each window, and there is
--a set of global window options from which any unset options are inherited.
--Window options are altered with the
--.Ic set-window-option
--command and can be listed with the
--.Ic show-window-options
--command.
--All window options are documented with the
--.Ic set-window-option
--command.
--.Pp
--.Nm
--also supports user options which are prefixed with a
--.Ql \&@ .
--User options may have any name, so long as they are prefixed with
--.Ql \&@ ,
--and be set to any string.
--For example
--.Bd -literal -offset indent
--$ tmux setw -q @foo "abc123"
--$ tmux showw -v @foo
--abc123
--.Ed
--.Pp
--Commands which set options are as follows:
--.Bl -tag -width Ds
--.It Xo Ic set-option
--.Op Fl agoqsuw
--.Op Fl t Ar target-session | Ar target-window
--.Ar option Ar value
--.Xc
--.D1 (alias: Ic set )
--Set a window option with
--.Fl w
--(equivalent to the
--.Ic set-window-option
--command),
--a server option with
--.Fl s ,
--otherwise a session option.
--.Pp
--If
--.Fl g
--is specified, the global session or window option is set.
--With
--.Fl a ,
--and if the option expects a string,
--.Ar value
--is appended to the existing setting.
--The
--.Fl u
--flag unsets an option, so a session inherits the option from the global
--options.
--It is not possible to unset a global option.
--.Pp
--The
--.Fl o
--flag prevents setting an option that is already set.
--.Pp
--The
--.Fl q
--flag suppresses the informational message (as if the
--.Ic quiet
--server option was set).
--.Pp
--Available window options are listed under
--.Ic set-window-option .
--.Pp
--.Ar value
--depends on the option and may be a number, a string, or a flag (on, off, or
--omitted to toggle).
--.Pp
--Available server options are:
--.Bl -tag -width Ds
--.It Ic buffer-limit Ar number
--Set the number of buffers; as new buffers are added to the top of the stack,
--old ones are removed from the bottom if necessary to maintain this maximum
--length.
--.It Ic escape-time Ar time
--Set the time in milliseconds for which
--.Nm
--waits after an escape is input to determine if it is part of a function or meta
--key sequences.
--The default is 500 milliseconds.
--.It Xo Ic exit-unattached
--.Op Ic on | off
--.Xc
--If enabled, the server will exit when there are no attached clients.
--.It Xo Ic quiet
--.Op Ic on | off
--.Xc
--Enable or disable the display of various informational messages (see also the
--.Fl q
--command line flag).
--.It Xo Ic set-clipboard
--.Op Ic on | off
--.Xc
--Attempt to set the terminal clipboard content using the
--\ee]52;...\e007
--.Xr xterm 1
--escape sequences.
--This option is on by default if there is an
--.Em \&Ms
--entry in the
--.Xr terminfo 5
--description for the client terminal.
--Note that this feature needs to be enabled in
--.Xr xterm 1
--by setting the resource:
--.Bd -literal -offset indent
--disallowedWindowOps: 20,21,SetXprop
--.Ed
--.Pp
--Or changing this property from the
--.Xr xterm 1
--interactive menu when required.
--.El
--.Pp
--Available session options are:
--.Bl -tag -width Ds
--.It Ic assume-paste-time Ar milliseconds
--If keys are entered faster than one in
--.Ar milliseconds ,
--they are assumed to have been pasted rather than typed and
--.Nm
--key bindings are not processed.
--The default is one millisecond and zero disables.
--.It Ic base-index Ar index
--Set the base index from which an unused index should be searched when a new
--window is created.
--The default is zero.
--.It Xo Ic bell-action
--.Op Ic any | none | current
--.Xc
--Set action on window bell.
--.Ic any
--means a bell in any window linked to a session causes a bell in the current
--window of that session,
--.Ic none
--means all bells are ignored and
--.Ic current
--means only bells in windows other than the current window are ignored.
--.It Xo Ic bell-on-alert
--.Op Ic on | off
--.Xc
--If on, ring the terminal bell when an alert
--occurs.
--.It Ic default-command Ar shell-command
--Set the command used for new windows (if not specified when the window is
--created) to
--.Ar shell-command ,
--which may be any
--.Xr sh 1
--command.
--The default is an empty string, which instructs
--.Nm
--to create a login shell using the value of the
--.Ic default-shell
--option.
--.It Ic default-path Ar path
--Set the default working directory for new panes.
--If empty (the default), the working directory is determined from the process
--running in the active pane, from the command line environment or from the
--working directory where the session was created.
--Otherwise the same options are available as for the
--.Fl c
--flag to
--.Ic new-window .
--.It Ic default-shell Ar path
--Specify the default shell.
--This is used as the login shell for new windows when the
--.Ic default-command
--option is set to empty, and must be the full path of the executable.
--When started
--.Nm
--tries to set a default value from the first suitable of the
--.Ev SHELL
--environment variable, the shell returned by
--.Xr getpwuid 3 ,
--or
--.Pa /bin/sh .
--This option should be configured when
--.Nm
--is used as a login shell.
--.It Ic default-terminal Ar terminal
--Set the default terminal for new windows created in this session - the
--default value of the
--.Ev TERM
--environment variable.
--For
--.Nm
--to work correctly, this
--.Em must
--be set to
--.Ql screen
--or a derivative of it.
--.It Xo Ic destroy-unattached
--.Op Ic on | off
--.Xc
--If enabled and the session is no longer attached to any clients, it is
--destroyed.
--.It Xo Ic detach-on-destroy
--.Op Ic on | off
--.Xc
--If on (the default), the client is detached when the session it is attached to
--is destroyed.
--If off, the client is switched to the most recently active of the remaining
--sessions.
--.It Ic display-panes-active-colour Ar colour
--Set the colour used by the
--.Ic display-panes
--command to show the indicator for the active pane.
--.It Ic display-panes-colour Ar colour
--Set the colour used by the
--.Ic display-panes
--command to show the indicators for inactive panes.
--.It Ic display-panes-time Ar time
--Set the time in milliseconds for which the indicators shown by the
--.Ic display-panes
--command appear.
--.It Ic display-time Ar time
--Set the amount of time for which status line messages and other on-screen
--indicators are displayed.
--.Ar time
--is in milliseconds.
--.It Ic history-limit Ar lines
--Set the maximum number of lines held in window history.
--This setting applies only to new windows - existing window histories are not
--resized and retain the limit at the point they were created.
--.It Ic lock-after-time Ar number
--Lock the session (like the
--.Ic lock-session
--command) after
--.Ar number
--seconds of inactivity, or the entire server (all sessions) if the
--.Ic lock-server
--option is set.
--The default is not to lock (set to 0).
--.It Ic lock-command Ar shell-command
--Command to run when locking each client.
--The default is to run
--.Xr lock 1
--with
--.Fl np .
--.It Xo Ic lock-server
--.Op Ic on | off
--.Xc
--If this option is
--.Ic on
--(the default),
--instead of each session locking individually as each has been
--idle for
--.Ic lock-after-time ,
--the entire server will lock after
--.Em all
--sessions would have locked.
--This has no effect as a session option; it must be set as a global option.
--.It Ic message-attr Ar attributes
--Set status line message attributes, where
--.Ar attributes
--is either
--.Ic none
--or a comma-delimited list of one or more of:
--.Ic bright
--(or
--.Ic bold ) ,
--.Ic dim ,
--.Ic underscore ,
--.Ic blink ,
--.Ic reverse ,
--.Ic hidden ,
--or
--.Ic italics .
--.It Ic message-bg Ar colour
--Set status line message background colour, where
--.Ar colour
--is one of:
--.Ic black ,
--.Ic red ,
--.Ic green ,
--.Ic yellow ,
--.Ic blue ,
--.Ic magenta ,
--.Ic cyan ,
--.Ic white ,
--aixterm bright variants (if supported:
--.Ic brightred ,
--.Ic brightgreen ,
--and so on),
--.Ic colour0
--to
--.Ic colour255
--from the 256-colour set,
--.Ic default ,
--or a hexadecimal RGB string such as
--.Ql #ffffff ,
--which chooses the closest match from the default 256-colour set.
--.It Ic message-command-attr Ar attributes
--Set status line message attributes when in command mode.
--.It Ic message-command-bg Ar colour
--Set status line message background colour when in command mode.
--.It Ic message-command-fg Ar colour
--Set status line message foreground colour when in command mode.
--.It Ic message-fg Ar colour
--Set status line message foreground colour.
--.It Ic message-limit Ar number
--Set the number of error or information messages to save in the message log for
--each client.
--The default is 20.
--.It Xo Ic mouse-resize-pane
--.Op Ic on | off
--.Xc
--If on,
--.Nm
--captures the mouse and allows panes to be resized by dragging on their borders.
--.It Xo Ic mouse-select-pane
--.Op Ic on | off
--.Xc
--If on,
--.Nm
--captures the mouse and when a window is split into multiple panes the mouse may
--be used to select the current pane.
--The mouse click is also passed through to the application as normal.
--.It Xo Ic mouse-select-window
--.Op Ic on | off
--.Xc
--If on, clicking the mouse on a window name in the status line will select that
--window.
--.It Xo Ic mouse-utf8
--.Op Ic on | off
--.Xc
--If enabled, request mouse input as UTF-8 on UTF-8 terminals.
--.It Ic pane-active-border-bg Ar colour
--.It Ic pane-active-border-fg Ar colour
--Set the pane border colour for the currently active pane.
--.It Ic pane-border-bg Ar colour
--.It Ic pane-border-fg Ar colour
--Set the pane border colour for panes aside from the active pane.
--.It Ic prefix Ar key
--Set the key accepted as a prefix key.
--.It Ic prefix2 Ar key
--Set a secondary key accepted as a prefix key.
--.It Xo Ic renumber-windows
--.Op Ic on | off
--.Xc
--If on, when a window is closed in a session, automatically renumber the other
--windows in numerical order.
--This respects the
--.Ic base-index
--option if it has been set.
--If off, do not renumber the windows.
--.It Ic repeat-time Ar time
--Allow multiple commands to be entered without pressing the prefix-key again
--in the specified
--.Ar time
--milliseconds (the default is 500).
--Whether a key repeats may be set when it is bound using the
--.Fl r
--flag to
--.Ic bind-key .
--Repeat is enabled for the default keys bound to the
--.Ic resize-pane
--command.
--.It Xo Ic set-remain-on-exit
--.Op Ic on | off
--.Xc
--Set the
--.Ic remain-on-exit
--window option for any windows first created in this session.
--When this option is true, windows in which the running program has
--exited do not close, instead remaining open but inactivate.
--Use the
--.Ic respawn-window
--command to reactivate such a window, or the
--.Ic kill-window
--command to destroy it.
--.It Xo Ic set-titles
--.Op Ic on | off
--.Xc
--Attempt to set the client terminal title using the
--.Em tsl
--and
--.Em fsl
--.Xr terminfo 5
--entries if they exist.
--.Nm
--automatically sets these to the \ee]2;...\e007 sequence if
--the terminal appears to be an xterm.
--This option is off by default.
--Note that elinks
--will only attempt to set the window title if the STY environment
--variable is set.
--.It Ic set-titles-string Ar string
--String used to set the window title if
--.Ic set-titles
--is on.
--Character sequences are replaced as for the
--.Ic status-left
--option.
--.It Xo Ic status
--.Op Ic on | off
--.Xc
--Show or hide the status line.
--.It Ic status-attr Ar attributes
--Set status line attributes.
--.It Ic status-bg Ar colour
--Set status line background colour.
--.It Ic status-fg Ar colour
--Set status line foreground colour.
--.It Ic status-interval Ar interval
--Update the status bar every
--.Ar interval
--seconds.
--By default, updates will occur every 15 seconds.
--A setting of zero disables redrawing at interval.
--.It Xo Ic status-justify
--.Op Ic left | centre | right
--.Xc
--Set the position of the window list component of the status line: left, centre
--or right justified.
--.It Xo Ic status-keys
--.Op Ic vi | emacs
--.Xc
--Use vi or emacs-style
--key bindings in the status line, for example at the command prompt.
--The default is emacs, unless the
--.Ev VISUAL
--or
--.Ev EDITOR
--environment variables are set and contain the string
--.Ql vi .
--.It Ic status-left Ar string
--Display
--.Ar string
--to the left of the status bar.
--.Ar string
--will be passed through
--.Xr strftime 3
--before being used.
--By default, the session name is shown.
--.Ar string
--may contain any of the following special character sequences:
--.Bl -column "Character pair" "Replaced with" -offset indent
--.It Sy "Character pair" Ta Sy "Replaced with"
--.It Li "#(shell-command)" Ta "First line of the command's output"
--.It Li "#[attributes]" Ta "Colour or attribute change"
--.It Li "#H" Ta "Hostname of local host"
--.It Li "#h" Ta "Hostname of local host without the domain name"
--.It Li "#F" Ta "Current window flag"
--.It Li "#I" Ta "Current window index"
--.It Li "#D" Ta "Current pane unique identifier"
--.It Li "#P" Ta "Current pane index"
--.It Li "#S" Ta "Session name"
--.It Li "#T" Ta "Current pane title"
--.It Li "#W" Ta "Current window name"
--.It Li "##" Ta "A literal" Ql #
--.El
--.Pp
--The #(shell-command) form executes
--.Ql shell-command
--and inserts the first line of its output.
--Note that shell commands are only executed once at the interval specified by
--the
--.Ic status-interval
--option: if the status line is redrawn in the meantime, the previous result is
--used.
--Shell commands are executed with the
--.Nm
--global environment set (see the
--.Sx ENVIRONMENT
--section).
--.Pp
--For details on how the names and titles can be set see the
--.Sx "NAMES AND TITLES"
--section.
--.Pp
--#[attributes] allows a comma-separated list of attributes to be specified,
--these may be
--.Ql fg=colour
--to set the foreground colour,
--.Ql bg=colour
--to set the background colour, the name of one of the attributes (listed under
--the
--.Ic message-attr
--option) to turn an attribute on, or an attribute prefixed with
--.Ql no
--to turn one off, for example
--.Ic nobright .
--Examples are:
--.Bd -literal -offset indent
--#(sysctl vm.loadavg)
--#[fg=yellow,bold]#(apm -l)%%#[default] [#S]
--.Ed
--.Pp
--Where appropriate, special character sequences may be prefixed with a number to
--specify the maximum length, for example
--.Ql #24T .
--.Pp
--By default, UTF-8 in
--.Ar string
--is not interpreted, to enable UTF-8, use the
--.Ic status-utf8
--option.
--.It Ic status-left-attr Ar attributes
--Set the attribute of the left part of the status line.
--.It Ic status-left-bg Ar colour
--Set the background colour of the left part of the status line.
--.It Ic status-left-fg Ar colour
--Set the foreground colour of the left part of the status line.
--.It Ic status-left-length Ar length
--Set the maximum
--.Ar length
--of the left component of the status bar.
--The default is 10.
--.It Xo Ic status-position
--.Op Ic top | bottom
--.Xc
--Set the position of the status line.
--.It Ic status-right Ar string
--Display
--.Ar string
--to the right of the status bar.
--By default, the current window title in double quotes, the date and the time
--are shown.
--As with
--.Ic status-left ,
--.Ar string
--will be passed to
--.Xr strftime 3 ,
--character pairs are replaced, and UTF-8 is dependent on the
--.Ic status-utf8
--option.
--.It Ic status-right-attr Ar attributes
--Set the attribute of the right part of the status line.
--.It Ic status-right-bg Ar colour
--Set the background colour of the right part of the status line.
--.It Ic status-right-fg Ar colour
--Set the foreground colour of the right part of the status line.
--.It Ic status-right-length Ar length
--Set the maximum
--.Ar length
--of the right component of the status bar.
--The default is 40.
--.It Xo Ic status-utf8
--.Op Ic on | off
--.Xc
--Instruct
--.Nm
--to treat top-bit-set characters in the
--.Ic status-left
--and
--.Ic status-right
--strings as UTF-8; notably, this is important for wide characters.
--This option defaults to off.
--.It Ic terminal-overrides Ar string
--Contains a list of entries which override terminal descriptions read using
--.Xr terminfo 5 .
--.Ar string
--is a comma-separated list of items each a colon-separated string made up of a
--terminal type pattern (matched using
--.Xr fnmatch 3 )
--and a set of
--.Em name=value
--entries.
--.Pp
--For example, to set the
--.Ql clear
--.Xr terminfo 5
--entry to
--.Ql \ee[H\ee[2J
--for all terminal types and the
--.Ql dch1
--entry to
--.Ql \ee[P
--for the
--.Ql rxvt
--terminal type, the option could be set to the string:
--.Bd -literal -offset indent
--"*:clear=\ee[H\ee[2J,rxvt:dch1=\ee[P"
--.Ed
--.Pp
--The terminal entry value is passed through
--.Xr strunvis 3
--before interpretation.
--The default value forcibly corrects the
--.Ql colors
--entry for terminals which support 88 or 256 colours:
--.Bd -literal -offset indent
--"*88col*:colors=88,*256col*:colors=256,xterm*:XT"
--.Ed
--.It Ic update-environment Ar variables
--Set a space-separated string containing a list of environment variables to be
--copied into the session environment when a new session is created or an
--existing session is attached.
--Any variables that do not exist in the source environment are set to be
--removed from the session environment (as if
--.Fl r
--was given to the
--.Ic set-environment
--command).
--The default is
--"DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID
--XAUTHORITY".
--.It Xo Ic visual-activity
--.Op Ic on | off
--.Xc
--If on, display a status line message when activity occurs in a window
--for which the
--.Ic monitor-activity
--window option is enabled.
--.It Xo Ic visual-bell
--.Op Ic on | off
--.Xc
--If this option is on, a message is shown on a bell instead of it being passed
--through to the terminal (which normally makes a sound).
--Also see the
--.Ic bell-action
--option.
--.It Xo Ic visual-content
--.Op Ic on | off
--.Xc
--Like
--.Ic visual-activity ,
--display a message when content is present in a window
--for which the
--.Ic monitor-content
--window option is enabled.
--.It Xo Ic visual-silence
--.Op Ic on | off
--.Xc
--If
--.Ic monitor-silence
--is enabled, prints a message after the interval has expired on a given window.
--.It Ic word-separators Ar string
--Sets the session's conception of what characters are considered word
--separators, for the purposes of the next and previous word commands in
--copy mode.
--The default is
--.Ql \ -_@ .
--.El
--.It Xo Ic set-window-option
--.Op Fl agoqu
--.Op Fl t Ar target-window
--.Ar option Ar value
--.Xc
--.D1 (alias: Ic setw )
--Set a window option.
--The
--.Fl a ,
--.Fl g ,
--.Fl o ,
--.Fl q
--and
--.Fl u
--flags work similarly to the
--.Ic set-option
--command.
--.Pp
--Supported window options are:
--.Pp
--.Bl -tag -width Ds -compact
--.It Xo Ic aggressive-resize
--.Op Ic on | off
--.Xc
--Aggressively resize the chosen window.
--This means that
--.Nm
--will resize the window to the size of the smallest session for which it is the
--current window, rather than the smallest session to which it is attached.
--The window may resize when the current window is changed on another sessions;
--this option is good for full-screen programs which support
--.Dv SIGWINCH
--and poor for interactive programs such as shells.
--.Pp
--.It Xo Ic allow-rename
--.Op Ic on | off
--.Xc
--Allow programs to change the window name using a terminal escape
--sequence (\\033k...\\033\\\\).
--The default is on.
--.Pp
--.It Xo Ic alternate-screen
--.Op Ic on | off
--.Xc
--This option configures whether programs running inside
--.Nm
--may use the terminal alternate screen feature, which allows the
--.Em smcup
--and
--.Em rmcup
--.Xr terminfo 5
--capabilities.
--The alternate screen feature preserves the contents of the window when an
--interactive application starts and restores it on exit, so that any output
--visible before the application starts reappears unchanged after it exits.
--The default is on.
--.Pp
--.It Xo Ic automatic-rename
--.Op Ic on | off
--.Xc
--Control automatic window renaming.
--When this setting is enabled,
--.Nm
--will attempt - on supported platforms - to rename the window to reflect the
--command currently running in it.
--This flag is automatically disabled for an individual window when a name
--is specified at creation with
--.Ic new-window
--or
--.Ic new-session ,
--or later with
--.Ic rename-window ,
--or with a terminal escape sequence.
--It may be switched off globally with:
--.Bd -literal -offset indent
--set-window-option -g automatic-rename off
--.Ed
--.Pp
--.It Ic c0-change-interval Ar interval
--.It Ic c0-change-trigger Ar trigger
--These two options configure a simple form of rate limiting for a pane.
--If
--.Nm
--sees more than
--.Ar trigger
--C0 sequences that modify the screen (for example, carriage returns, linefeeds
--or backspaces) in one millisecond, it will stop updating the pane immediately and
--instead redraw it entirely every
--.Ar interval
--milliseconds.
--This helps to prevent fast output (such as
--.Xr yes 1
--overwhelming the terminal).
--The default is a trigger of 250 and an interval of 100.
--A trigger of zero disables the rate limiting.
--.Pp
--.It Ic clock-mode-colour Ar colour
--Set clock colour.
--.Pp
--.It Xo Ic clock-mode-style
--.Op Ic 12 | 24
--.Xc
--Set clock hour format.
--.Pp
--.It Ic force-height Ar height
--.It Ic force-width Ar width
--Prevent
--.Nm
--from resizing a window to greater than
--.Ar width
--or
--.Ar height .
--A value of zero restores the default unlimited setting.
--.Pp
--.It Ic main-pane-height Ar height
--.It Ic main-pane-width Ar width
--Set the width or height of the main (left or top) pane in the
--.Ic main-horizontal
--or
--.Ic main-vertical
--layouts.
--.Pp
--.It Ic mode-attr Ar attributes
--Set window modes attributes.
--.Pp
--.It Ic mode-bg Ar colour
--Set window modes background colour.
--.Pp
--.It Ic mode-fg Ar colour
--Set window modes foreground colour.
--.Pp
--.It Xo Ic mode-keys
--.Op Ic vi | emacs
--.Xc
--Use vi or emacs-style key bindings in copy and choice modes.
--As with the
--.Ic status-keys
--option, the default is emacs, unless
--.Ev VISUAL
--or
--.Ev EDITOR
--contains
--.Ql vi .
--.Pp
--.It Xo Ic mode-mouse
--.Op Ic on | off | copy-mode
--.Xc
--Mouse state in modes.
--If on, the mouse may be used to enter copy mode and copy a selection by
--dragging, to enter copy mode and scroll with the mouse wheel, or to select an
--option in choice mode.
--If set to
--.Em copy-mode ,
--the mouse behaves as set to on, but cannot be used to enter copy
--mode.
--.Pp
--.It Xo Ic monitor-activity
--.Op Ic on | off
--.Xc
--Monitor for activity in the window.
--Windows with activity are highlighted in the status line.
--.Pp
--.It Ic monitor-content Ar match-string
--Monitor content in the window.
--When
--.Xr fnmatch 3
--pattern
--.Ar match-string
--appears in the window, it is highlighted in the status line.
--.Pp
--.It Xo Ic monitor-silence
--.Op Ic interval
--.Xc
--Monitor for silence (no activity) in the window within
--.Ic interval
--seconds.
--Windows that have been silent for the interval are highlighted in the
--status line.
--An interval of zero disables the monitoring.
--.Pp
--.It Ic other-pane-height Ar height
--Set the height of the other panes (not the main pane) in the
--.Ic main-horizontal
--layout.
--If this option is set to 0 (the default), it will have no effect.
--If both the
--.Ic main-pane-height
--and
--.Ic other-pane-height
--options are set, the main pane will grow taller to make the other panes the
--specified height, but will never shrink to do so.
--.Pp
--.It Ic other-pane-width Ar width
--Like
--.Ic other-pane-height ,
--but set the width of other panes in the
--.Ic main-vertical
--layout.
--.Pp
--.It Ic pane-base-index Ar index
--Like
--.Ic base-index ,
--but set the starting index for pane numbers.
--.Pp
--.It Xo Ic remain-on-exit
--.Op Ic on | off
--.Xc
--A window with this flag set is not destroyed when the program running in it
--exits.
--The window may be reactivated with the
--.Ic respawn-window
--command.
--.Pp
--.It Xo Ic synchronize-panes
--.Op Ic on | off
--.Xc
--Duplicate input to any pane to all other panes in the same window (only
--for panes that are not in any special mode).
--.Pp
--.It Xo Ic utf8
--.Op Ic on | off
--.Xc
--Instructs
--.Nm
--to expect UTF-8 sequences to appear in this window.
--.Pp
--.It Ic window-status-bell-attr Ar attributes
--Set status line attributes for windows which have a bell alert.
--.Pp
--.It Ic window-status-bell-bg Ar colour
--Set status line background colour for windows with a bell alert.
--.Pp
--.It Ic window-status-bell-fg Ar colour
--Set status line foreground colour for windows with a bell alert.
--.Pp
--.It Ic window-status-content-attr Ar attributes
--Set status line attributes for windows which have a content alert.
--.Pp
--.It Ic window-status-content-bg Ar colour
--Set status line background colour for windows with a content alert.
--.Pp
--.It Ic window-status-content-fg Ar colour
--Set status line foreground colour for windows with a content alert.
--.Pp
--.It Ic window-status-activity-attr Ar attributes
--Set status line attributes for windows which have an activity (or silence) alert.
--.Pp
--.It Ic window-status-activity-bg Ar colour
--Set status line background colour for windows with an activity alert.
--.Pp
--.It Ic window-status-activity-fg Ar colour
--Set status line foreground colour for windows with an activity alert.
--.Pp
--.It Ic window-status-attr Ar attributes
--Set status line attributes for a single window.
--.Pp
--.It Ic window-status-bg Ar colour
--Set status line background colour for a single window.
--.Pp
--.It Ic window-status-current-attr Ar attributes
--Set status line attributes for the currently active window.
--.Pp
--.It Ic window-status-current-bg Ar colour
--Set status line background colour for the currently active window.
--.Pp
--.It Ic window-status-current-fg Ar colour
--Set status line foreground colour for the currently active window.
--.Pp
--.It Ic window-status-current-format Ar string
--Like
--.Ar window-status-format ,
--but is the format used when the window is the current window.
--.Pp
--.It Ic window-status-last-attr Ar attributes
--Set status line attributes for the last active window.
--.Pp
--.It Ic window-status-last-bg Ar colour
--Set status line background colour for the last active window.
--.Pp
--.It Ic window-status-last-fg Ar colour
--Set status line foreground colour for the last active window.
--.Pp
--.It Ic window-status-fg Ar colour
--Set status line foreground colour for a single window.
--.Pp
--.It Ic window-status-format Ar string
--Set the format in which the window is displayed in the status line window list.
--See the
--.Ar status-left
--option for details of special character sequences available.
--The default is
--.Ql #I:#W#F .
--.Pp
--.It Ic window-status-separator Ar string
--Sets the separator drawn between windows in the status line.
--The default is a single space character.
--.Pp
--.It Xo Ic xterm-keys
--.Op Ic on | off
--.Xc
--If this option is set,
--.Nm
--will generate
--.Xr xterm 1 -style
--function key sequences; these have a number included to indicate modifiers such
--as Shift, Alt or Ctrl.
--The default is off.
--.Pp
--.It Xo Ic wrap-search
--.Op Ic on | off
--.Xc
--If this option is set, searches will wrap around the end of the pane contents.
--The default is on.
--.El
--.It Xo Ic show-options
--.Op Fl gqsvw
--.Op Fl t Ar target-session | Ar target-window
--.Op Ar option
--.Xc
--.D1 (alias: Ic show )
--Show the window options (or a single window option if given) with
--.Fl w
--(equivalent to
--.Ic show-window-options ) ,
--the server options with
--.Fl s ,
--otherwise the session options for
--.Ar target session .
--Global session or window options are listed if
--.Fl g
--is used.
--.Fl v
--shows only the option value, not the name.
--If
--.Fl q
--is set, no error will be returned if
--.Ar option
--is unset.
--.It Xo Ic show-window-options
--.Op Fl gv
--.Op Fl t Ar target-window
--.Op Ar option
--.Xc
--.D1 (alias: Ic showw )
--List the window options or a single option for
--.Ar target-window ,
--or the global window options if
--.Fl g
--is used.
--.Fl v
--shows only the option value, not the name.
--.El
--.Sh FORMATS
--Certain commands accept the
--.Fl F
--flag with a
--.Ar format
--argument.
--This is a string which controls the output format of the command.
--Special character sequences are replaced as documented under the
--.Ic status-left
--option and an additional long form is accepted.
--Replacement variables are enclosed in
--.Ql #{
--and
--.Ql } ,
--for example
--.Ql #{session_name}
--is equivalent to
--.Ql #S .
--Conditionals are also accepted by prefixing with
--.Ql \&?
--and separating two alternatives with a comma;
--if the specified variable exists and is not zero, the first alternative
--is chosen, otherwise the second is used.
--For example
--.Ql #{?session_attached,attached,not attached}
--will include the string
--.Ql attached
--if the session is attached and the string
--.Ql not attached
--if it is unattached.
--.Pp
--The following variables are available, where appropriate:
--.Bl -column "session_created_string" "Replaced with" -offset indent
--.It Sy "Variable name" Ta Sy "Replaced with"
--.It Li "alternate_on" Ta "If pane is in alternate screen"
--.It Li "alternate_saved_x" Ta "Saved cursor X in alternate screen"
--.It Li "alternate_saved_y" Ta "Saved cursor Y in alternate screen"
--.It Li "buffer_sample" Ta "First 50 characters from the specified buffer"
--.It Li "buffer_size" Ta "Size of the specified buffer in bytes"
--.It Li "client_activity" Ta "Integer time client last had activity"
--.It Li "client_activity_string" Ta "String time client last had activity"
--.It Li "client_created" Ta "Integer time client created"
--.It Li "client_created_string" Ta "String time client created"
--.It Li "client_cwd" Ta "Working directory of client"
--.It Li "client_height" Ta "Height of client"
--.It Li "client_last_session" Ta "Name of the client's last session"
--.It Li "client_prefix" Ta "1 if prefix key has been pressed"
--.It Li "client_readonly" Ta "1 if client is readonly"
--.It Li "client_session" Ta "Name of the client's session"
--.It Li "client_termname" Ta "Terminal name of client"
--.It Li "client_tty" Ta "Pseudo terminal of client"
--.It Li "client_utf8" Ta "1 if client supports utf8"
--.It Li "client_width" Ta "Width of client"
--.It Li "cursor_flag" Ta "Pane cursor flag"
--.It Li "cursor_x" Ta "Cursor X position in pane"
--.It Li "cursor_y" Ta "Cursor Y position in pane"
--.It Li "history_bytes" Ta "Number of bytes in window history"
--.It Li "history_limit" Ta "Maximum window history lines"
--.It Li "history_size" Ta "Size of history in bytes"
--.It Li "host" Ta "Hostname of local host"
--.It Li "insert_flag" Ta "Pane insert flag"
--.It Li "keypad_cursor_flag" Ta "Pane keypad cursor flag"
--.It Li "keypad_flag" Ta "Pane keypad flag"
--.It Li "line" Ta "Line number in the list"
--.It Li "mouse_any_flag" Ta "Pane mouse any flag"
--.It Li "mouse_button_flag" Ta "Pane mouse button flag"
--.It Li "mouse_standard_flag" Ta "Pane mouse standard flag"
--.It Li "mouse_utf8_flag" Ta "Pane mouse UTF-8 flag"
--.It Li "pane_active" Ta "1 if active pane"
--.It Li "pane_current_command" Ta "Current command if available"
--.It Li "pane_current_path" Ta "Current path if available"
--.It Li "pane_dead" Ta "1 if pane is dead"
--.It Li "pane_height" Ta "Height of pane"
--.It Li "pane_id" Ta "Unique pane ID"
--.It Li "pane_in_mode" Ta "If pane is in a mode"
--.It Li "pane_index" Ta "Index of pane"
--.It Li "pane_pid" Ta "PID of first process in pane"
--.It Li "pane_start_command" Ta "Command pane started with"
--.It Li "pane_start_path" Ta "Path pane started with"
--.It Li "pane_tabs" Ta "Pane tab positions"
--.It Li "pane_title" Ta "Title of pane"
--.It Li "pane_tty" Ta "Pseudo terminal of pane"
--.It Li "pane_width" Ta "Width of pane"
--.It Li "saved_cursor_x" Ta "Saved cursor X in pane"
--.It Li "saved_cursor_y" Ta "Saved cursor Y in pane"
--.It Li "scroll_region_lower" Ta "Bottom of scroll region in pane"
--.It Li "scroll_region_upper" Ta "Top of scroll region in pane"
--.It Li "session_attached" Ta "1 if session attached"
--.It Li "session_created" Ta "Integer time session created"
--.It Li "session_created_string" Ta "String time session created"
--.It Li "session_group" Ta "Number of session group"
--.It Li "session_grouped" Ta "1 if session in a group"
--.It Li "session_height" Ta "Height of session"
--.It Li "session_id" Ta "Unique session ID"
--.It Li "session_name" Ta "Name of session"
--.It Li "session_width" Ta "Width of session"
--.It Li "session_windows" Ta "Number of windows in session"
--.It Li "window_active" Ta "1 if window active"
--.It Li "window_find_matches" Ta "Matched data from the find-window command if available"
--.It Li "window_flags" Ta "Window flags"
--.It Li "window_height" Ta "Height of window"
--.It Li "window_id" Ta "Unique window ID"
--.It Li "window_index" Ta "Index of window"
--.It Li "window_layout" Ta "Window layout description"
--.It Li "window_name" Ta "Name of window"
--.It Li "window_panes" Ta "Number of panes in window"
--.It Li "window_width" Ta "Width of window"
--.It Li "wrap_flag" Ta "Pane wrap flag"
--.El
--.Sh NAMES AND TITLES
--.Nm
--distinguishes between names and titles.
--Windows and sessions have names, which may be used to specify them in targets
--and are displayed in the status line and various lists: the name is the
--.Nm
--identifier for a window or session.
--Only panes have titles.
--A pane's title is typically set by the program running inside the pane and
--is not modified by
--.Nm .
--It is the same mechanism used to set for example the
--.Xr xterm 1
--window title in an
--.Xr X 7
--window manager.
--Windows themselves do not have titles - a window's title is the title of its
--active pane.
--.Nm
--itself may set the title of the terminal in which the client is running, see
--the
--.Ic set-titles
--option.
--.Pp
--A session's name is set with the
--.Ic new-session
--and
--.Ic rename-session
--commands.
--A window's name is set with one of:
--.Bl -enum -width Ds
--.It
--A command argument (such as
--.Fl n
--for
--.Ic new-window
--or
--.Ic new-session ) .
--.It
--An escape sequence:
--.Bd -literal -offset indent
--$ printf '\e033kWINDOW_NAME\e033\e\e'
--.Ed
--.It
--Automatic renaming, which sets the name to the active command in the window's
--active pane.
--See the
--.Ic automatic-rename
--option.
--.El
--.Pp
--When a pane is first created, its title is the hostname.
--A pane's title can be set via the OSC title setting sequence, for example:
--.Bd -literal -offset indent
--$ printf '\e033]2;My Title\e033\e\e'
--.Ed
--.Sh ENVIRONMENT
--When the server is started,
--.Nm
--copies the environment into the
--.Em global environment ;
--in addition, each session has a
--.Em session environment .
--When a window is created, the session and global environments are merged.
--If a variable exists in both, the value from the session environment is used.
--The result is the initial environment passed to the new process.
--.Pp
--The
--.Ic update-environment
--session option may be used to update the session environment from the client
--when a new session is created or an old reattached.
--.Nm
--also initialises the
--.Ev TMUX
--variable with some internal information to allow commands to be executed
--from inside, and the
--.Ev TERM
--variable with the correct terminal setting of
--.Ql screen .
--.Pp
--Commands to alter and view the environment are:
--.Bl -tag -width Ds
--.It Xo Ic set-environment
--.Op Fl gru
--.Op Fl t Ar target-session
--.Ar name Op Ar value
--.Xc
--.D1 (alias: Ic setenv )
--Set or unset an environment variable.
--If
--.Fl g
--is used, the change is made in the global environment; otherwise, it is applied
--to the session environment for
--.Ar target-session .
--The
--.Fl u
--flag unsets a variable.
--.Fl r
--indicates the variable is to be removed from the environment before starting a
--new process.
--.It Xo Ic show-environment
--.Op Fl g
--.Op Fl t Ar target-session
--.Op Ar variable
--.Xc
--.D1 (alias: Ic showenv )
--Display the environment for
--.Ar target-session
--or the global environment with
--.Fl g .
--If
--.Ar variable
--is omitted, all variables are shown.
--Variables removed from the environment are prefixed with
--.Ql - .
--.El
--.Sh STATUS LINE
--.Nm
--includes an optional status line which is displayed in the bottom line of each
--terminal.
--By default, the status line is enabled (it may be disabled with the
--.Ic status
--session option) and contains, from left-to-right: the name of the current
--session in square brackets; the window list; the title of the active pane
--in double quotes; and the time and date.
--.Pp
--The status line is made of three parts: configurable left and right sections
--(which may contain dynamic content such as the time or output from a shell
--command, see the
--.Ic status-left ,
--.Ic status-left-length ,
--.Ic status-right ,
--and
--.Ic status-right-length
--options below), and a central window list.
--By default, the window list shows the index, name and (if any) flag of the
--windows present in the current session in ascending numerical order.
--It may be customised with the
--.Ar window-status-format
--and
--.Ar window-status-current-format
--options.
--The flag is one of the following symbols appended to the window name:
--.Bl -column "Symbol" "Meaning" -offset indent
--.It Sy "Symbol" Ta Sy "Meaning"
--.It Li "*" Ta "Denotes the current window."
--.It Li "-" Ta "Marks the last window (previously selected)."
--.It Li "#" Ta "Window is monitored and activity has been detected."
--.It Li "!" Ta "A bell has occurred in the window."
--.It Li "+" Ta "Window is monitored for content and it has appeared."
--.It Li "~" Ta "The window has been silent for the monitor-silence interval."
--.It Li "Z" Ta "The window's active pane is zoomed."
--.El
--.Pp
--The # symbol relates to the
--.Ic monitor-activity
--and + to the
--.Ic monitor-content
--window options.
--The window name is printed in inverted colours if an alert (bell, activity or
--content) is present.
--.Pp
--The colour and attributes of the status line may be configured, the entire
--status line using the
--.Ic status-attr ,
--.Ic status-fg
--and
--.Ic status-bg
--session options and individual windows using the
--.Ic window-status-attr ,
--.Ic window-status-fg
--and
--.Ic window-status-bg
--window options.
--.Pp
--The status line is automatically refreshed at interval if it has changed, the
--interval may be controlled with the
--.Ic status-interval
--session option.
--.Pp
--Commands related to the status line are as follows:
--.Bl -tag -width Ds
--.It Xo Ic command-prompt
--.Op Fl I Ar inputs
--.Op Fl p Ar prompts
--.Op Fl t Ar target-client
--.Op Ar template
--.Xc
--Open the command prompt in a client.
--This may be used from inside
--.Nm
--to execute commands interactively.
--.Pp
--If
--.Ar template
--is specified, it is used as the command.
--If present,
--.Fl I
--is a comma-separated list of the initial text for each prompt.
--If
--.Fl p
--is given,
--.Ar prompts
--is a comma-separated list of prompts which are displayed in order; otherwise
--a single prompt is displayed, constructed from
--.Ar template
--if it is present, or
--.Ql \&:
--if not.
--.Pp
--Both
--.Ar inputs
--and
--.Ar prompts
--may contain the special character sequences supported by the
--.Ic status-left
--option.
--.Pp
--Before the command is executed, the first occurrence of the string
--.Ql %%
--and all occurrences of
--.Ql %1
--are replaced by the response to the first prompt, the second
--.Ql %%
--and all
--.Ql %2
--are replaced with the response to the second prompt, and so on for further
--prompts.
--Up to nine prompt responses may be replaced
--.Po
--.Ql %1
--to
--.Ql %9
--.Pc .
--.It Xo Ic confirm-before
--.Op Fl p Ar prompt
--.Op Fl t Ar target-client
--.Ar command
--.Xc
--.D1 (alias: Ic confirm )
--Ask for confirmation before executing
--.Ar command .
--If
--.Fl p
--is given,
--.Ar prompt
--is the prompt to display; otherwise a prompt is constructed from
--.Ar command .
--It may contain the special character sequences supported by the
--.Ic status-left
--option.
--.Pp
--This command works only from inside
--.Nm .
--.It Xo Ic display-message
--.Op Fl p
--.Op Fl c Ar target-client
--.Op Fl t Ar target-pane
--.Op Ar message
--.Xc
--.D1 (alias: Ic display )
--Display a message.
--If
--.Fl p
--is given, the output is printed to stdout, otherwise it is displayed in the
--.Ar target-client
--status line.
--The format of
--.Ar message
--is described in the
--.Sx FORMATS
--section; information is taken from
--.Ar target-pane
--if
--.Fl t
--is given, otherwise the active pane for the session attached to
--.Ar target-client .
--.El
--.Sh BUFFERS
--.Nm
--maintains a stack of
--.Em paste buffers .
--Up to the value of the
--.Ic buffer-limit
--option are kept; when a new buffer is added, the buffer at the bottom of the
--stack is removed.
--Buffers may be added using
--.Ic copy-mode
--or the
--.Ic set-buffer
--command, and pasted into a window using the
--.Ic paste-buffer
--command.
--.Pp
--A configurable history buffer is also maintained for each window.
--By default, up to 2000 lines are kept; this can be altered with the
--.Ic history-limit
--option (see the
--.Ic set-option
--command above).
--.Pp
--The buffer commands are as follows:
--.Bl -tag -width Ds
--.It Xo
--.Ic choose-buffer
--.Op Fl F Ar format
--.Op Fl t Ar target-window
--.Op Ar template
--.Xc
--Put a window into buffer choice mode, where a buffer may be chosen
--interactively from a list.
--After a buffer is selected,
--.Ql %%
--is replaced by the buffer index in
--.Ar template
--and the result executed as a command.
--If
--.Ar template
--is not given, "paste-buffer -b '%%'" is used.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--This command works only if at least one client is attached.
--.It Ic clear-history Op Fl t Ar target-pane
--.D1 (alias: Ic clearhist )
--Remove and free the history for the specified pane.
--.It Ic delete-buffer Op Fl b Ar buffer-index
--.D1 (alias: Ic deleteb )
--Delete the buffer at
--.Ar buffer-index ,
--or the top buffer if not specified.
--.It Xo Ic list-buffers
--.Op Fl F Ar format
--.Xc
--.D1 (alias: Ic lsb )
--List the global buffers.
--For the meaning of the
--.Fl F
--flag, see the
--.Sx FORMATS
--section.
--.It Xo Ic load-buffer
--.Op Fl b Ar buffer-index
--.Ar path
--.Xc
--.D1 (alias: Ic loadb )
--Load the contents of the specified paste buffer from
--.Ar path .
--.It Xo Ic paste-buffer
--.Op Fl dpr
--.Op Fl b Ar buffer-index
--.Op Fl s Ar separator
--.Op Fl t Ar target-pane
--.Xc
--.D1 (alias: Ic pasteb )
--Insert the contents of a paste buffer into the specified pane.
--If not specified, paste into the current one.
--With
--.Fl d ,
--also delete the paste buffer from the stack.
--When output, any linefeed (LF) characters in the paste buffer are replaced with
--a separator, by default carriage return (CR).
--A custom separator may be specified using the
--.Fl s
--flag.
--The
--.Fl r
--flag means to do no replacement (equivalent to a separator of LF).
--If
--.Fl p
--is specified, paste bracket control codes are inserted around the
--buffer if the application has requested bracketed paste mode.
--.It Xo Ic save-buffer
--.Op Fl a
--.Op Fl b Ar buffer-index
--.Ar path
--.Xc
--.D1 (alias: Ic saveb )
--Save the contents of the specified paste buffer to
--.Ar path .
--The
--.Fl a
--option appends to rather than overwriting the file.
--.It Xo Ic set-buffer
--.Op Fl b Ar buffer-index
--.Ar data
--.Xc
--.D1 (alias: Ic setb )
--Set the contents of the specified buffer to
--.Ar data .
--.It Xo Ic show-buffer
--.Op Fl b Ar buffer-index
--.Xc
--.D1 (alias: Ic showb )
--Display the contents of the specified buffer.
--.El
--.Sh MISCELLANEOUS
--Miscellaneous commands are as follows:
--.Bl -tag -width Ds
--.It Ic clock-mode Op Fl t Ar target-pane
--Display a large clock.
--.It Xo Ic if-shell
--.Op Fl b
--.Op Fl t Ar target-pane
--.Ar shell-command command
--.Op Ar command
--.Xc
--.D1 (alias: Ic if )
--Execute the first
--.Ar command
--if
--.Ar shell-command
--returns success or the second
--.Ar command
--otherwise.
--Before being executed, shell-command is expanded using the rules specified in the
--.Sx FORMATS
--section, including those relevant to
--.Ar target-pane .
--With
--.Fl b ,
--.Ar shell-command
--is run in the background.
--.It Ic lock-server
--.D1 (alias: Ic lock )
--Lock each client individually by running the command specified by the
--.Ic lock-command
--option.
--.It Xo Ic run-shell
--.Fl b
--.Op Fl t Ar target-pane
--.Ar shell-command
--.Xc
--.D1 (alias: Ic run )
--Execute
--.Ar shell-command
--in the background without creating a window.
--Before being executed, shell-command is expanded using the rules specified in
--the
--.Sx FORMATS
--section.
--With
--.Fl b ,
--the command is run in the background.
--After it finishes, any output to stdout is displayed in copy mode (in the pane
--specified by
--.Fl t
--or the current pane if omitted).
--If the command doesn't return success, the exit status is also displayed.
--.It Ic server-info
--.D1 (alias: Ic info )
--Show server information and terminal details.
--.It Xo Ic wait-for
--.Fl LSU
--.Ar channel
--.Xc
--.D1 (alias: Ic wait )
--When used without options, prevents the client from exiting until woken using
--.Ic wait-for
--.Fl S
--with the same channel.
--When
--.Fl L
--is used, the channel is locked and any clients that try to lock the same
--channel are made to wait until the channel is unlocked with
--.Ic wait-for
--.Fl U .
--This command only works from outside
--.Nm .
--.El
--.Sh TERMINFO EXTENSIONS
--.Nm
--understands some extensions to
--.Xr terminfo 5 :
--.Bl -tag -width Ds
--.It Em Cc , Cr
--Set the cursor colour.
--The first takes a single string argument and is used to set the colour;
--the second takes no arguments and restores the default cursor colour.
--If set, a sequence such as this may be used
--to change the cursor colour from inside
--.Nm :
--.Bd -literal -offset indent
--$ printf '\e033]12;red\e033\e\e'
--.Ed
--.It Em Cs , Csr
--Change the cursor style.
--If set, a sequence such as this may be used
--to change the cursor to an underline:
--.Bd -literal -offset indent
--$ printf '\e033[4 q'
--.Ed
--.Pp
--If
--.Em Csr
--is set, it will be used to reset the cursor style instead
--of
--.Em Cs .
--.It Em \&Ms
--This sequence can be used by
--.Nm
--to store the current buffer in the host terminal's selection (clipboard).
--See the
--.Em set-clipboard
--option above and the
--.Xr xterm 1
--man page.
--.El
--.Sh CONTROL MODE
--.Nm
--offers a textual interface called
--.Em control mode .
--This allows applications to communicate with
--.Nm
--using a simple text-only protocol.
--.Pp
--In control mode, a client sends
--.Nm
--commands or command sequences terminated by newlines on standard input.
--Each command will produce one block of output on standard output.
--An output block consists of a
--.Em %begin
--line followed by the output (which may be empty).
--The output block ends with a
--.Em %end
--or
--.Em %error .
--.Em %begin
--and matching
--.Em %end
--or
--.Em %error
--have two arguments: an integer time (as seconds from epoch) and command number.
--For example:
--.Bd -literal -offset indent
--%begin 1363006971 2
--0: ksh* (1 panes) [80x24] [layout b25f,80x24,0,0,2] @2 (active)
--%end 1363006971 2
--.Ed
--.Pp
--In control mode,
--.Nm
--outputs notifications.
--A notification will never occur inside an output block.
--.Pp
--The following notifications are defined:
--.Bl -tag -width Ds
--.It Ic %exit Op Ar reason
--The
--.Nm
--client is exiting immediately, either because it is not attached to any session
--or an error occurred.
--If present,
--.Ar reason
--describes why the client exited.
--.It Ic %layout-change Ar window-id Ar window-layout
--The layout of a window with ID
--.Ar window-id
--changed.
--The new layout is
--.Ar window-layout .
--.It Ic %output Ar pane-id Ar value
--A window pane produced output.
--.Ar value
--escapes non-printable characters and backslash as octal \\xxx.
--.It Ic %session-changed Ar session-id Ar name
--The client is now attached to the session with ID
--.Ar session-id ,
--which is named
--.Ar name .
--.It Ic %session-renamed Ar name
--The current session was renamed to
--.Ar name .
--.It Ic %sessions-changed
--A session was created or destroyed.
--.It Ic %unlinked-window-add Ar window-id
--The window with ID
--.Ar window-id
--was created but is not linked to the current session.
--.It Ic %window-add Ar window-id
--The window with ID
--.Ar window-id
--was linked to the current session.
--.It Ic %window-close Ar window-id
--The window with ID
--.Ar window-id
--closed.
--.It Ic %window-renamed Ar window-id Ar name
--The window with ID
--.Ar window-id
--was renamed to
--.Ar name .
--.El
--.Sh FILES
--.Bl -tag -width "/etc/tmux.confXXX" -compact
--.It Pa ~/.tmux.conf
--Default
--.Nm
--configuration file.
--.It Pa /etc/tmux.conf

@@ 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  Fri Feb 21 11:30:13 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 21 Feb 2014 10:30:13 +0000
Subject: SF.net SVN: gar:[23058] csw/mgar/pkg/lang-python/pycurl/trunk
Message-ID: <3fVppR1Bz6z18q@mail.opencsw.org>

Revision: 23058
          http://sourceforge.net/p/gar/code/23058
Author:   dmichelsen
Date:     2014-02-21 10:30:12 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
lang-python/pycurl/trunk: Update to 7.19.3.1 and python version modulation

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

Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-21 09:25:37 UTC (rev 23057)
+++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-21 10:30:12 UTC (rev 23058)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = pycurl
-VERSION = 7.19.0
+VERSION = 7.19.3.1
 CATEGORIES = python
 GARTYPE = v2
 
@@ -16,11 +16,9 @@
 DISTFILES += $(DISTNAME).tar.gz
 
 # Taken from http://src.opensolaris.org/source/xref/userland/src/components/python/pycurl/patches/pycurl-mondo.patch
-PATCHFILES += pycurl-mondo.patch
+#PATCHFILES += pycurl-mondo.patch
 PATCHDIRLEVEL = 0
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 VENDOR_URL = http://pycurl.sourceforge.net/
 
 PACKAGES += CSWpy-curl
@@ -35,7 +33,12 @@
 CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pycurl/INSTALL
 CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/share|root/opt/csw/share/doc/pycurl/ChangeLog
 
+# Tests have problems ATM, disable while checkpkg is debugged
+SKIPTEST ?= 1
+
 TEST_SCRIPTS = $(WORKSRC)/Makefile
 TEST_TARGET = test
+TEST_ARGS += SHELL=/usr/bin/bash PYTHON=$(PYTHON_EXECUTABLE)
 
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/pycurl/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pycurl/trunk/checksums	2014-02-21 09:25:37 UTC (rev 23057)
+++ csw/mgar/pkg/lang-python/pycurl/trunk/checksums	2014-02-21 10:30:12 UTC (rev 23058)
@@ -1 +1 @@
-919d58fe37e69fe87ce4534d8b6a1c7b  pycurl-7.19.0.tar.gz
+6df8fa7fe8b680d93248da1f8d4fcd12  pycurl-7.19.3.1.tar.gz

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


From dmichelsen at users.sourceforge.net  Fri Feb 21 16:59:05 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 21 Feb 2014 15:59:05 +0000
Subject: SF.net SVN: gar:[23059]
	csw/mgar/pkg/apache2/branches/apache24/Makefile
Message-ID: <3fVy5t236dzFd@mail.opencsw.org>

Revision: 23059
          http://sourceforge.net/p/gar/code/23059
Author:   dmichelsen
Date:     2014-02-21 15:59:04 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
apache2/branches/apache24: Add override and reorder to standard

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-21 10:30:12 UTC (rev 23058)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-21 15:59:04 UTC (rev 23059)
@@ -13,18 +13,16 @@
   best around in terms of functionality, efficiency, security and speed.
 endef
 
-# Source location
 MASTER_SITES  = http://www.eu.apache.org/dist/httpd/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswapache24
 
-# work around dumb checkpkg not recognizing the license file ...
+PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+
+VENDOR_URL = http://httpd.apache.org/
 LICENSE = LICENSE
 
-# Visitor information
-SPKG_SOURCEURL = http://httpd.apache.org/
-
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += cswapache24
-
 PACKAGES = CSWapache24
 SPKG_DESC_CSWapache24 = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2
@@ -48,8 +46,8 @@
 SPKG_DESC_CSWapache24-dev = The Apache 2.4 Development Files
 PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL)
 
-PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
-PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+# This is a fallback
+CHECKPKG_OVERRIDES_CSWapache24-dev += file-with-bad-content|/usr/local|root/opt/csw/include/apache2/httpd.h
 
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 

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


From dmichelsen at users.sourceforge.net  Sat Feb 22 10:58:30 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 22 Feb 2014 09:58:30 +0000
Subject: SF.net SVN: gar:[23060] csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
Message-ID: <3fWQ3X4fkRz1RT@mail.opencsw.org>

Revision: 23060
          http://sourceforge.net/p/gar/code/23060
Author:   dmichelsen
Date:     2014-02-22 09:58:29 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
lang-python/pycurl/trunk: Add dependencies

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

Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-21 15:59:04 UTC (rev 23059)
+++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-22 09:58:29 UTC (rev 23060)
@@ -25,10 +25,19 @@
 SPKG_DESC_CSWpy-curl = PycURL is a Python interface to libcurl
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibidn11
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibpython2-7-1-0
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibz1
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibgcc-s1
 
+# These are essentially from libcurl4_feature and are not needed by default
+CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWlibcares2
+CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWliblber2-4-2
+CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWlibrtmp0
+CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWlibssh2-1
+CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWlibldap2-4-2
+
 # These are docs only
 CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pycurl/INSTALL
 CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/share|root/opt/csw/share/doc/pycurl/ChangeLog

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


From dmichelsen at users.sourceforge.net  Sat Feb 22 11:03:49 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 22 Feb 2014 10:03:49 +0000
Subject: SF.net SVN: gar:[23061] csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
Message-ID: <3fWQ9T3Ln1z5s@mail.opencsw.org>

Revision: 23061
          http://sourceforge.net/p/gar/code/23061
Author:   dmichelsen
Date:     2014-02-22 10:03:46 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
lang-python/pycurl/trunk: Add overrides

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

Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-22 09:58:29 UTC (rev 23060)
+++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile	2014-02-22 10:03:46 UTC (rev 23061)
@@ -31,6 +31,10 @@
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibgcc-s1
 
+# These are indirect dependencies which are stripped with -z ignore but not on sparc
+CHECKPKG_OVERRIDES_CSWpy-curl += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpy-curl += surplus-dependency|CSWlibidn11
+
 # These are essentially from libcurl4_feature and are not needed by default
 CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWlibcares2
 CHECKPKG_OVERRIDES_CSWpy-curl += missing-dependency|CSWliblber2-4-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  Sat Feb 22 11:25:38 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 22 Feb 2014 10:25:38 +0000
Subject: SF.net SVN: gar:[23062] csw/mgar/pkg/mod_proxy_html/trunk
Message-ID: <3fWQfm0WgqzBb@mail.opencsw.org>

Revision: 23062
          http://sourceforge.net/p/gar/code/23062
Author:   dmichelsen
Date:     2014-02-22 10:25:36 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
mod_proxy_html/trunk: Update to latest standards, previous recipes package was never released

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

Added Paths:
-----------
    csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall
    csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove

Removed Paths:
-------------
    csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend
    csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec

Modified: csw/mgar/pkg/mod_proxy_html/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/Makefile	2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/Makefile	2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,6 +1,5 @@
 NAME = mod_proxy_html
-VERSION = 2.5.2
-GARTYPE = v1
+VERSION = 3.1.2
 
 DESCRIPTION = Apache 2 output filter to rewrite HTML links
 define BLURB
@@ -12,28 +11,46 @@
 endef
 
 MASTER_SITES = http://apache.webthing.com/mod_proxy_html/
-DISTFILES  = $(NAME)-$(VERSION).c
-DISTFILES += $(call admfiles,CSWap2modproxyhtml,depend)
+DISTNAME = $(NAME)
+DISTFILES += $(DISTNAME).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).c
+VENDOR_URL = http://apache.webthing.com/mod_proxy_html/
 
-BUILD_DEP_PKGS = CSWapache2-devel CSWapache2 CSWlibxml2
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
 
-WORKSRC = $(WORKDIR)
+PACKAGES += CSWap2-mod-proxy-html
+SPKG_DESC_CSWap2-mod-proxy-html = Apache 2 output filter to rewrite HTML links
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWap2-mod-proxy-html += CSWapache2
 
+# Apache paths
+AP2_ROOT      = $(prefix)/apache2
+AP2_LIBEXEC   = $(AP2_ROOT)/libexec
+AP2_EXTRACONF = $(AP2_ROOT)/etc/extra
+AP2_SBIN      = $(AP2_ROOT)/sbin
+APXS          = $(AP2_SBIN)/apxs
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF += $(AP2_EXTRACONF)/proxy_html.conf
+
 include gar/category.mk
 
 build-custom:
-	$(prefix)/apache2/sbin/apxs -c -I$(includedir)/libxml2/ $(WORKSRC)/mod_proxy_html-2.5.2.c
+	cd $(WORKSRC) && $(APXS) -I. -I$(includedir)/libxml2 -c mod_proxy_html.c
+	cd $(WORKSRC) && $(APXS) -I. -I$(includedir)/libxml2 -c mod_xml2enc.c
 	@$(MAKECOOKIE)
 
 install-custom:
-	@-mkdir -p $(DESTDIR)$(prefix)/apache2/libexec
-	cp $(WORKSRC)/.libs/mod_proxy_html-2.5.2.so $(DESTDIR)$(prefix)/apache2/libexec
+	mkdir -p $(DESTDIR)$(AP2_LIBEXEC)
+	cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_proxy_html.la
+	cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_xml2enc.la
+	ginstall -d $(DESTDIR)$(AP2_EXTRACONF)
+	ginstall -m 0644 $(WORKSRC)/proxy_html.conf $(DESTDIR)$(AP2_EXTRACONF)/proxy_html.conf
+	ginstall -d $(DESTDIR)$(docdir)/ap2_mod_proxy_html
+	ginstall -m 0644 $(WORKSRC)/README $(DESTDIR)$(docdir)/ap2_mod_proxy_html/README
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/mod_proxy_html/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/checksums	2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/checksums	2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,3 +1 @@
-6d38fbcd58e6e5cac246da3d1fcd22f4  download/mod_proxy_html-2.5.2.c
-bdf8321fb4906cb5773286c1071def0c  download/CSWap2modproxyhtml.gspec
-cf5dc2bedf26e739694f566db17fe6e3  download/CSWap2modproxyhtml.depend
+d6497b48d2bffc4150472472004618c3  mod_proxy_html.tar.bz2

Copied: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall (from rev 23055, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall)
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.postinstall	2014-02-22 10:25:36 UTC (rev 23062)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    proxy_html mod_proxy_html.so
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+    xml2enc mod_xml2enc.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_proxy_html and mod_xml2enc are enabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Copied: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove (from rev 23055, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.preremove)
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove	                        (rev 0)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2-mod-proxy-html.preremove	2014-02-22 10:25:36 UTC (rev 23062)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    proxy_html mod_proxy_html.so
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+    xml2enc mod_xml2enc.so
+
+cat <<END
+
+NOTICE: mod_proxy_html and mod_xml2enc are disabled in httpd.conf but the server was not restarted.
+        Please check your configuration and restart apache.
+
+END
+
+exit 0

Deleted: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend	2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.depend	2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,2 +0,0 @@
-P CSWlibxml2 libxml2 - XML Parser Library
-P CSWapache2 apache2 - Apache 2.2 web server

Deleted: csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec
===================================================================
--- csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec	2014-02-22 10:03:46 UTC (rev 23061)
+++ csw/mgar/pkg/mod_proxy_html/trunk/files/CSWap2modproxyhtml.gspec	2014-02-22 10:25:36 UTC (rev 23062)
@@ -1,6 +0,0 @@
-%var       bitname mod_proxy_html
-%var       pkgname CSWap2modproxyhtml
-%include   url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright 
-source code is licensed under the GNU General Public License (GPL) Version 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  Sat Feb 22 11:45:59 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 22 Feb 2014 10:45:59 +0000
Subject: SF.net SVN: gar:[23063] csw/mgar/pkg/php5/branches
Message-ID: <3fWR6L41n6zMP@mail.opencsw.org>

Revision: 23063
          http://sourceforge.net/p/gar/code/23063
Author:   dmichelsen
Date:     2014-02-22 10:45:57 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
php5/branches/php-5.5.x: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
    csw/mgar/pkg/php5/branches/php-5.5.x/checksums

Added Paths:
-----------
    csw/mgar/pkg/php5/branches/php-5.5.x/
    csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
    csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch
    csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch
    csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch

Removed Paths:
-------------
    csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old

Index: csw/mgar/pkg/php5/branches/php-5.5.x
===================================================================
--- csw/mgar/pkg/php5/trunk	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x	2014-02-22 10:45:57 UTC (rev 23063)

Property changes on: csw/mgar/pkg/php5/branches/php-5.5.x
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile	2014-02-22 10:45:57 UTC (rev 23063)
@@ -1,8 +1,6 @@
-NAME     = php5
-VERSION  = 5.3.25
+NAME = php
+VERSION = 5.5.7
 GARTYPE = v2
-SF_PROJECT  = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
-DISTNAME    = $(SF_PROJECT)-$(VERSION)
 
 DESCRIPTION = A high-level scripting language.
 define BLURB
@@ -31,13 +29,15 @@
 # at least for a decent echo used during build.
 PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
 
-VENDOR_URL     = http://www.php.net/
-MASTER_SITES   = http://us.php.net/distributions/
+MASTER_SITES += http://de1.php.net/distributions/
+# SF_PROJECT  = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
+
 EXTRA_INSTALL_ENV   = INSTALL_ROOT=$(DESTDIR)
 
+VENDOR_URL = http://www.php.net/
 LICENSE = LICENSE
 
-DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += $(DISTNAME).tar.xz
 DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
 DISTFILES += CSWphp5.cswreleasenotes
 DISTFILES += CSWap2-modphp5.cswreleasenotes
@@ -45,12 +45,19 @@
 DISTFILES += CSWap2-modphp5.preremove
 DISTFILES += httpd-php5.conf
 
-PATCHFILES += 0001-Strip-usr-ucblib-references.patch
+# PATCHFILES += 0001-Strip-usr-ucblib-references.patch
 PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch
 
+# TBD: Where specifically do these come from?
+PATCHFILES += 0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
+PATCHFILES += 0002-Undef-ES-on-Solaris.patch
+
+PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch
+PATCHFILES += 0005-Remove-another-Wno.patch
+
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
 BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg
-BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWlibgdbm-dev CSWlibgmp10
+BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib-dev CSWlibgdbm-dev CSWlibgmp10
 BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel
 BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev
 BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7
@@ -68,13 +75,13 @@
 MIGRATE_DEST_DIR = $(sysconfdir)
 
 define php5_subpackage
-PACKAGES += CSWphp5-$(1)
-CATALOGNAME_CSWphp5-$(1) ?= php5_$(1)
-SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2)
-OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1)
-PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
-CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5
+PACKAGES += CSWphp5-$(subst _,-,$(1))
+CATALOGNAME_CSWphp5-$(subst _,-,$(1)) ?= php5_$(subst -,_,$(1))
+SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5
+RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5 $(2)
+OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1))
+PKGFILES_CSWphp5-$(subst _,-,$(1)) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
+CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
 endef
 
 PACKAGES = CSWphp5
@@ -212,10 +219,20 @@
 $(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2))
 $(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0))
 $(eval $(call php5_subpackage,zip,CSWlibz1))
+$(eval $(call php5_subpackage,ibm_db2,))
 
+# Use reinplacement until this is fixed:
+#   https://bugs.php.net/bug.php?id=66298
+REINPLACEMENTS += dos
+REINPLACE_MATCH_dos = \r$$
+REINPLACE_WITH_dos = 
+REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c
+
 EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
 EXTRA_LIB = /opt/csw/postgresql/lib
 
+# GARCOMPILER = GNU
+
 # We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so,
 # using CC as linker would have made this automatic.
 SUBDIR64-sparc = v9
@@ -225,6 +242,22 @@
 NOISALIST = 1
 STRIP_LIBTOOL = 1
 
+EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE
+EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB
+EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE
+EXTRA_CONFIGURE_EXPORTS += DB2DIR
+
+# This is needed for DB2 module
+CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include
+CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib
+CONFIGURE_ENV_DB2INSTANCE = db2inst1
+CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1
+
+EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB)
+
+# We need CMSG_SPACE
+EXTRA_CPPFLAGS  += -D_XPG4_2 -D__EXTENSIONS__
+
 sysconfdir = /etc$(prefix)/php5
 
 CONFIGURE_ARGS += --prefix=$(prefix)/php5
@@ -280,6 +313,7 @@
 CONFIGURE_ARGS += --with-gdbm=$(prefix)
 CONFIGURE_ARGS += --with-gettext=shared,$(prefix)
 CONFIGURE_ARGS += --with-gmp=shared,$(prefix)
+CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib
 CONFIGURE_ARGS += --with-iconv=shared,$(prefix)
 CONFIGURE_ARGS += --with-imap-ssl=$(prefix)
 CONFIGURE_ARGS += --with-imap=shared,$(prefix)
@@ -379,9 +413,9 @@
 
 post-merge:
 	@echo " ==> Fixing php.ini: adding loadable session.so support"
-	@( cd $(PKGROOT)/$(sysconfdir)/; \
+	@-( cd $(PKGROOT)/$(sysconfdir)/; \
 		perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; )
-	@( cd $(PKGROOT)/$(sysconfdir)/; \
+	@-( cd $(PKGROOT)/$(sysconfdir)/; \
 		perl -pi -e 's/extension=bz2.so/extension=ctype.so\n;extension=bz2.so/' php.ini.CSW; )
 	@echo " ==> Fixing php.ini: adding loadable ctype.so support"
 	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old
===================================================================
--- csw/mgar/pkg/php5/trunk/checkpkg.old	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old	2014-02-22 10:45:57 UTC (rev 23063)
@@ -1,23 +0,0 @@
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
-CHECKPKG_OVERRIDES_CSWphp5 += license-missing|/opt/csw/share/doc/php5/license
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache2/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php-cgi
-
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/libexec/libphp5.so|CSWap2modphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache/libexec/libphp5.so|CSWmodphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/etc/extra/httpd-php5.conf.CSW|CSWap2modphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5devel += action-class-only-in-pkginfo|none
-CHECKPKG_OVERRIDES_CSWphp5devel += catalogname-does-not-match-pkgname|pkgname=CSWphp5devel|catalogname=php5_devel|expected-catalogname=php5devel
-CHECKPKG_OVERRIDES_CSWphp5devel += license-missing|/opt/csw/share/doc/php5_devel/license

Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums	2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums	2014-02-22 10:45:57 UTC (rev 23063)
@@ -1 +1 @@
-347625ed7fbf2fe1f1c70b0f879fee2a  php-5.3.25.tar.bz2
+0c02437f661105221e99a301a5275a41  php-5.5.7.tar.xz

Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch	2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From c452bab41f87cebf7da533d967973b28046dd92c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 14 Dec 2013 22:50:22 +0100
+Subject: [PATCH] Undef disturbing definition of SS on Solaris
+
+---
+ ext/hash/hash_ripemd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/hash/hash_ripemd.c b/ext/hash/hash_ripemd.c
+index c7c53c6..02786c7 100644
+--- a/ext/hash/hash_ripemd.c
++++ b/ext/hash/hash_ripemd.c
+@@ -172,6 +172,8 @@ static const unsigned char S[80] = {
+ 	11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
+ 	 9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 };
+ 
++/* There is some strange definition on Solaris SS being 18 */
++#undef SS
+ static const unsigned char SS[80] = {
+ 	 8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
+ 	 9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch	2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,24 @@
+From 7a6340a8064446a4b45683ea09f4a38739b5c5d2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 14 Dec 2013 22:59:43 +0100
+Subject: [PATCH] Undef ES on Solaris
+
+---
+ ext/json/JSON_parser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
+index dd832a7..faa71d8 100644
+--- a/ext/json/JSON_parser.c
++++ b/ext/json/JSON_parser.c
+@@ -116,6 +116,7 @@ enum states {
+     VA,  /* value    */
+     AR,  /* array    */
+     ST,  /* string   */
++# undef ES
+     ES,  /* escape   */
+     U1,  /* u1       */
+     U2,  /* u2       */
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch	2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From 6bd0d4115244bbe36f3c5512be6f110a128ca492 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Dec 2013 20:48:53 +0100
+Subject: [PATCH] Do not add -Wno-write-strings unconditionally
+
+---
+ ext/intl/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
+index 4630a30..02efa69 100644
+--- a/ext/intl/config.m4
++++ b/ext/intl/config.m4
+@@ -85,7 +85,7 @@ if test "$PHP_INTL" != "no"; then
+     breakiterator/codepointiterator_internal.cpp \
+     breakiterator/codepointiterator_methods.cpp \
+     idn/idn.c \
+-    $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings)
++    $icu_spoof_src, $ext_shared,,$ICU_INCS)
+   PHP_ADD_BUILD_DIR($ext_builddir/collator)
+   PHP_ADD_BUILD_DIR($ext_builddir/converter)
+   PHP_ADD_BUILD_DIR($ext_builddir/common)
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch	2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From eb07582022356607281c52215eea2ce375413d47 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Dec 2013 21:36:41 +0100
+Subject: [PATCH] Remove another -Wno...
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ad5d449..4be4068 100755
+--- a/configure
++++ b/configure
+@@ -51018,7 +51018,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+   ext_builddir=ext/intl
+   ext_srcdir=$abs_srcdir/ext/intl
+ 
+-  ac_extra=`echo "$ICU_INCS -Wno-write-strings"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
++  ac_extra=`echo "$ICU_INCS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+     PHP_INTL_SHARED=no
+-- 
+1.8.4.1
+

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


From chninkel at users.sourceforge.net  Sat Feb 22 13:17:32 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 22 Feb 2014 12:17:32 +0000
Subject: SF.net SVN: gar:[23064] csw/mgar/pkg/proftpd/trunk/Makefile
Message-ID: <3fWT7n0F4pzV9@mail.opencsw.org>

Revision: 23064
          http://sourceforge.net/p/gar/code/23064
Author:   chninkel
Date:     2014-02-22 12:17:30 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
proftpd/trunk: fix amd64 lib relocation

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

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 10:45:57 UTC (rev 23063)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 12:17:30 UTC (rev 23064)
@@ -46,7 +46,6 @@
 EXTRA_CONFIGURE_ENV  = install_user=$(shell /usr/xpg4/bin/id -un) install_group=$(shell /usr/xpg4/bin/id -gn)
 EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)"
 
-libexecdir = $(libdir)/proftpd
 localstatedir = /var/run/
 
 CONFIGURE_ARGS += $(DIRPATHS)

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


From chninkel at users.sourceforge.net  Sat Feb 22 16:14:33 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 22 Feb 2014 15:14:33 +0000
Subject: SF.net SVN: gar:[23065] csw/mgar/gar/v2/etc
Message-ID: <3fWY436LPtzsP@mail.opencsw.org>

Revision: 23065
          http://sourceforge.net/p/gar/code/23065
Author:   chninkel
Date:     2014-02-22 15:14:30 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
gar/v2: add isa specific directories for sbin in common directories

Modified Paths:
--------------
    csw/mgar/gar/v2/etc/commondirs-i386
    csw/mgar/gar/v2/etc/commondirs-sparc

Modified: csw/mgar/gar/v2/etc/commondirs-i386
===================================================================
--- csw/mgar/gar/v2/etc/commondirs-i386	2014-02-22 12:17:30 UTC (rev 23064)
+++ csw/mgar/gar/v2/etc/commondirs-i386	2014-02-22 15:14:30 UTC (rev 23065)
@@ -32,6 +32,9 @@
 /opt/csw/lib/pentium
 /opt/csw/man
 /opt/csw/sbin
+/opt/csw/sbin/amd64
+/opt/csw/sbin/i486
+/opt/csw/sbin/pentium
 /opt/csw/share
 /opt/csw/share/doc
 /opt/csw/share/info

Modified: csw/mgar/gar/v2/etc/commondirs-sparc
===================================================================
--- csw/mgar/gar/v2/etc/commondirs-sparc	2014-02-22 12:17:30 UTC (rev 23064)
+++ csw/mgar/gar/v2/etc/commondirs-sparc	2014-02-22 15:14:30 UTC (rev 23065)
@@ -36,6 +36,11 @@
 /opt/csw/lib/sparcv9
 /opt/csw/man
 /opt/csw/sbin
+/opt/csw/sbin/sparc
+/opt/csw/sbin/sparcv8
+/opt/csw/sbin/sparcv8plus
+/opt/csw/sbin/sparcv8plus+vis
+/opt/csw/sbin/sparcv9
 /opt/csw/share
 /opt/csw/share/doc
 /opt/csw/share/info

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


From chninkel at users.sourceforge.net  Sat Feb 22 16:21:06 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 22 Feb 2014 15:21:06 +0000
Subject: SF.net SVN: gar:[23066] csw/mgar/pkg/proftpd/trunk/Makefile
Message-ID: <3fWYCb0y0wzwn@mail.opencsw.org>

Revision: 23066
          http://sourceforge.net/p/gar/code/23066
Author:   chninkel
Date:     2014-02-22 15:21:05 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
proftpd/trunk: add an additional dependency on sparc because of the solaris 10 sparc linking bug

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

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 15:14:30 UTC (rev 23065)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 15:21:05 UTC (rev 23066)
@@ -30,6 +30,12 @@
 RUNTIME_DEP_PKGS_CSWproftpd += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWproftpd += CSWlibldap2-4-2
 
+# Linking on sparc gives an additional dependency
+# probably because of the current bug with Solaris 10
+# sparc linker (see http://lists.opencsw.org/pipermail/maintainers/2013-November/018780.html)
+RUNTIME_DEP_PKGS_CSWproftpd += $(RUNTIME_DEP_PKGS_CSWproftpd_$(GARCH))
+RUNTIME_DEP_PKGS_CSWproftpd_sparc += CSWliblber2-4-2
+
 BUILD64 = 1
 
 ISAEXEC_DIRS                = $(bindir) $(sbindir)

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


From wilbury at opencsw.org  Sat Feb 22 23:36:53 2014
From: wilbury at opencsw.org (Juraj Lutter)
Date: Sat, 22 Feb 2014 23:36:53 +0100
Subject: SF.net SVN: gar:[23065] csw/mgar/gar/v2/etc
In-Reply-To: <3fWY436LPtzsP@mail.opencsw.org>
References: <3fWY436LPtzsP@mail.opencsw.org>
Message-ID: <53092685.7030002@opencsw.org>

On 02/22/14 16:14, chninkel at users.sourceforge.net wrote:
> +/opt/csw/sbin/amd64
> +/opt/csw/sbin/i486
> +/opt/csw/sbin/pentium

Shouldn't this have been pentium_pro? (just an innocent question.)


-- 
Juraj Lutter <wilbury at opencsw.org>


From chninkel at users.sourceforge.net  Sat Feb 22 23:48:15 2014
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 22 Feb 2014 22:48:15 +0000
Subject: SF.net SVN: gar:[23067] csw/mgar/pkg/proftpd/trunk/Makefile
Message-ID: <3fWl7Y1CtczB1@mail.opencsw.org>

Revision: 23067
          http://sourceforge.net/p/gar/code/23067
Author:   chninkel
Date:     2014-02-22 22:48:11 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
proftpd/trunk: overrides a checkpkg error

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

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 15:21:05 UTC (rev 23066)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2014-02-22 22:48:11 UTC (rev 23067)
@@ -68,6 +68,7 @@
 CONFIGURE_ARGS += --with-shared=mod_auth_pam:mod_ban:mod_ctrls_admin:mod_dynmasq:mod_exec:mod_ident:mod_ifsession:mod_ldap:mod_load:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql:mod_radius:mod_ratio:mod_readme:mod_rewrite:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_site_misc:mod_sql:mod_sql_mysql:mod_sql_passwd:mod_sql_sqlite:mod_tls:mod_tls_shmcache:mod_unique_id:mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 CHECKPKG_OVERRIDES_CSWproftpd += bad-location-of-file|file=/var/run/proftpd
+CHECKPKG_OVERRIDES_CSWproftpd += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWgnupg2|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWnginx|or|CSWopenldap|or|CSWpound|or|CSWsamba|or|CSWsamba-swat|or|CSWsamba-winbind|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
 
 TEST_SCRIPTS =
 

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


From maciej at opencsw.org  Sun Feb 23 10:37:52 2014
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Sun, 23 Feb 2014 09:37:52 +0000
Subject: SF.net SVN: gar:[23065] csw/mgar/gar/v2/etc
In-Reply-To: <53092685.7030002@opencsw.org>
References: <3fWY436LPtzsP@mail.opencsw.org> <53092685.7030002@opencsw.org>
Message-ID: <CALtRa-6Z8AB+0wHpP4J0-M57g7cJNfRQbtEQrUG_RiXNCkh8KQ@mail.gmail.com>

2014-02-22 22:36 GMT+00:00 Juraj Lutter <wilbury at opencsw.org>:
> On 02/22/14 16:14, chninkel at users.sourceforge.net wrote:
>> +/opt/csw/sbin/amd64
>> +/opt/csw/sbin/i486
>> +/opt/csw/sbin/pentium
>
> Shouldn't this have been pentium_pro? (just an innocent question.)

I was also wondering if this path is part of the CSWcommon package.
Historically it was, but I think we no longer try to get the CSWcommon
package to own paths like these. Adding Dagobert for potential
additional comments.

Maciej

From dmichelsen at users.sourceforge.net  Sun Feb 23 21:22:16 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 23 Feb 2014 20:22:16 +0000
Subject: SF.net SVN: gar:[23068] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fXHrm535BzYG@mail.opencsw.org>

Revision: 23068
          http://sourceforge.net/p/gar/code/23068
Author:   dmichelsen
Date:     2014-02-23 20:22:15 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Fix typo

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

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-22 22:48:11 UTC (rev 23067)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-23 20:22:15 UTC (rev 23068)
@@ -99,7 +99,7 @@
 
 REINPLACEMENTS += mplog
 REINPLACE_MATCH_mplog = /var/log/mirrorbrain/mirrorprobe.log
-REINPLACE_WITH_mplog = $(localstatedur)/mirrorbrain/mirrorprobe.log
+REINPLACE_WITH_mplog = $(localstatedir)/mirrorbrain/mirrorprobe.log
 REINPLACE_FILES_mplog += mirrorprobe/mirrorprobe.py
 
 # The language must be in lower case

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


From dmichelsen at users.sourceforge.net  Sun Feb 23 21:30:27 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 23 Feb 2014 20:30:27 +0000
Subject: SF.net SVN: gar:[23069] csw/mgar/pkg/mirrorbrain/trunk/Makefile
Message-ID: <3fXJ236vSbzcq@mail.opencsw.org>

Revision: 23069
          http://sourceforge.net/p/gar/code/23069
Author:   dmichelsen
Date:     2014-02-23 20:30:26 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Add logging directory

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

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-23 20:22:15 UTC (rev 23068)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-23 20:30:26 UTC (rev 23069)
@@ -149,5 +149,6 @@
 	ginstall -m 0644 $(WORKSRC)/sql/initialdata-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/initialdata-postgresql.sql
 	@# LANG SQL must in fact be LANG sql (lowercase!) or the creation faills
 	ginstall -m 0644 $(WORKSRC)/sql/schema-postgresql.sql $(DESTDIR)$(sharedstatedir)/mirrorbrain/sql/schema-postgresql.sql
+	ginstall -d $(DESTDIR)$(localstatedir)/mirrorbrain
 	@$(MAKECOOKIE)
 

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


From dmichelsen at users.sourceforge.net  Sun Feb 23 21:45:48 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 23 Feb 2014 20:45:48 +0000
Subject: SF.net SVN: gar:[23070] csw/mgar/pkg/route-views-data/trunk
Message-ID: <3fXJMp2QzCzhn@mail.opencsw.org>

Revision: 23070
          http://sourceforge.net/p/gar/code/23070
Author:   dmichelsen
Date:     2014-02-23 20:45:47 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
route-views-data/trunk: Update to 2014-02-23-0000

Modified Paths:
--------------
    csw/mgar/pkg/route-views-data/trunk/Makefile
    csw/mgar/pkg/route-views-data/trunk/checksums

Modified: csw/mgar/pkg/route-views-data/trunk/Makefile
===================================================================
--- csw/mgar/pkg/route-views-data/trunk/Makefile	2014-02-23 20:30:26 UTC (rev 23069)
+++ csw/mgar/pkg/route-views-data/trunk/Makefile	2014-02-23 20:45:47 UTC (rev 23070)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = oix-full-snapshot
-VERSION = 2013.10.22.0000
+VERSION = 2014.02.23.0000
 GARTYPE = v2
 
 DESCRIPTION = OIX route views data

Modified: csw/mgar/pkg/route-views-data/trunk/checksums
===================================================================
--- csw/mgar/pkg/route-views-data/trunk/checksums	2014-02-23 20:30:26 UTC (rev 23069)
+++ csw/mgar/pkg/route-views-data/trunk/checksums	2014-02-23 20:45:47 UTC (rev 23070)
@@ -1 +1 @@
-564f2d5516ee118bf443c1474d89f859  oix-full-snapshot-2013-10-22-0000.bz2
+ffdd9f3b90b52338faf652dce245e458  oix-full-snapshot-2014-02-23-0000.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  Tue Feb 25 10:51:35 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 25 Feb 2014 09:51:35 +0000
Subject: SF.net SVN: gar:[23071] csw/mgar/pkg/gzip/trunk
Message-ID: <3fYFml3TSpztg@mail.opencsw.org>

Revision: 23071
          http://sourceforge.net/p/gar/code/23071
Author:   dmichelsen
Date:     2014-02-25 09:51:27 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
gzip/trunk: Update to 1.6 and forward-port rsyncable, still one open bug

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

Added Paths:
-----------
    csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
    csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff

Removed Paths:
-------------
    csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch
    csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2

Modified: csw/mgar/pkg/gzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gzip/trunk/Makefile	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/Makefile	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,5 +1,9 @@
+# TBD:
+# ! Transformation from 'z' to 'gz' prefix does not apply to invocations:
+#     http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16876
+
 NAME = gzip
-VERSION = 1.4
+VERSION = 1.6
 GARTYPE = v2
 
 DESCRIPTION = GNU zip
@@ -13,7 +17,7 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
+#PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
 
 # From TODO:
 # - Add a block size (-b) option to improve error recovery in case of
@@ -22,32 +26,31 @@
 # 
 # For one possible approach to this, please see:
 #   http://www.samba.org/netfilter/diary/gzip.rsync.patch
-#
-# Update patch from
-#  http://cvs.fedoraproject.org/viewvc/rpms/gzip/F-12/gzip-1.3.9-rsync.patch?revision=1.2&content-type=text%2Fplain&view=co
-PATCHFILES += gzip-1.3.9-rsync.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# Reformatted version of debian_patches_rsyncable.diff
+PATCHFILES += 0001-Debian-patch-for-rsyncable.patch
 
-PACKAGES = CSWgzip CSWgzipextras
-
-CATALOGNAME_CSWgzip       = gzip
-CATALOGNAME_CSWgzipextras = gzip_extras
-
-SPKG_DESC_CSWgzip       = GNU zip
-SPKG_DESC_CSWgzipextras = GNU zip additional tools
-
-RUNTIME_DEP_PKGS_CSWgzipextras = CSWgzip CSWggrep
-
-CONFIGURE_ARGS = $(DIRPATHS)
-
-EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
-
+PACKAGES += CSWgzip
+CATALOGNAME_CSWgzip = gzip
+SPKG_DESC_CSWgzip = GNU zip
 PKGFILES_CSWgzip  = $(bindir)/gzip
 PKGFILES_CSWgzip += $(bindir)/gunzip
 PKGFILES_CSWgzip += $(bindir)/uncompress
 PKGFILES_CSWgzip += $(mandir)/man1/gzip\.1
 PKGFILES_CSWgzip += $(mandir)/man1/gunzip\.1
 
+PACKAGES += CSWgzip-extras
+SPKG_DESC_CSWgzip-extras = GNU zip additional tools
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgzip-extras += CSWgzip
+RUNTIME_DEP_PKGS_CSWgzip-extras += CSWggrep
+OBSOLETED_BY_CSWgzip-extras = CSWgzipextras
+CATALOGNAME_CSWgzipextras = gzip_extras_stub
+
+EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
+
+# The 'z'-prefix commands now belong to zutils whereas the gzip-commands are prefixed with 'gz' instead:
+#   http://lists.nongnu.org/archive/html/zutils-bug/2012-10/msg00002.html
+EXTRA_CONFIGURE_ARGS += --program-transform-name='s/^z/gz/'
+
 include gar/category.mk

Modified: csw/mgar/pkg/gzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/gzip/trunk/checksums	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/checksums	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,3 +1 @@
-54776a402c7f43e4ece76c96a8e6518d  0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
-d2e81e20767a85f799f56812d74b547a  gzip-1.3.9-rsync.patch
-e381b8506210c794278f5527cba0e765  gzip-1.4.tar.gz
+38603cb2843bf5681ff41aab3bcd6a20  gzip-1.6.tar.gz

Added: csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	                        (rev 0)
+++ csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	2014-02-25 09:51:27 UTC (rev 23071)
@@ -0,0 +1,332 @@
+From aa32d7c565dd4aa13c5fa0f12e93f9851be6cc20 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 25 Feb 2014 10:21:27 +0100
+Subject: [PATCH] Debian patch for rsyncable
+
+---
+ deflate.c     | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ doc/gzip.texi | 25 +++++++++++++++
+ gzip.1        | 11 +++++++
+ gzip.c        | 11 +++++--
+ gzip.h        |  1 +
+ 5 files changed, 138 insertions(+), 8 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index f0f2394..8e539d2 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -131,6 +131,14 @@
+ #endif
+ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+ 
++#ifndef RSYNC_WIN
++#  define RSYNC_WIN 8192
++#endif
++/* Size of rsync window, must be < MAX_DIST */
++
++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
++/* Whether window sum matches magic value */
++
+ /* ===========================================================================
+  * Local data used by the "longest match" routines.
+  */
+@@ -212,6 +220,8 @@ local int compr_level;
+ unsigned good_match;
+ /* Use a faster search when the previous match is longer than this */
+ 
++local ulg rsync_sum;  /* rolling sum of rsync window */
++local ulg rsync_chunk_end; /* next rsync sequence point */
+ 
+ /* Values for max_lazy_match, good_match and max_chain_length, depending on
+  * the desired pack level (0..9). The values given below have been tuned to
+@@ -314,6 +324,10 @@ void lm_init (pack_level, flags)
+ #endif
+     /* prev will be initialized on the fly */
+ 
++    /* rsync params */
++    rsync_chunk_end = 0xFFFFFFFFUL;
++    rsync_sum = 0;
++
+     /* Set the default configuration parameters:
+      */
+     max_lazy_match   = configuration_table[pack_level].max_lazy;
+@@ -331,6 +345,7 @@ void lm_init (pack_level, flags)
+ 
+     strstart = 0;
+     block_start = 0L;
++    rsync_chunk_end = 0xFFFFFFFFUL;
+ #ifdef ASMV
+     match_init(); /* initialize the asm code */
+ #endif
+@@ -550,6 +565,8 @@ local void fill_window()
+         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
+         match_start -= WSIZE;
+         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
++	if (rsync_chunk_end != 0xFFFFFFFFUL)
++	    rsync_chunk_end -= WSIZE;
+ 
+         block_start -= (long) WSIZE;
+ 
+@@ -579,6 +596,39 @@ local void fill_window()
+     }
+ }
+ 
++local void rsync_roll(start, num)
++    unsigned start;
++    unsigned num;
++{
++    unsigned i;
++
++    if (start < RSYNC_WIN) {
++	/* before window fills. */
++	for (i = start; i < RSYNC_WIN; i++) {
++	    if (i == start + num) return;
++	    rsync_sum += (ulg)window[i];
++	}
++	num -= (RSYNC_WIN - start);
++	start = RSYNC_WIN;
++    }
++
++    /* buffer after window full */
++    for (i = start; i < start+num; i++) {
++	/* New character in */
++	rsync_sum += (ulg)window[i];
++	/* Old character out */
++	rsync_sum -= (ulg)window[i - RSYNC_WIN];
++	if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
++	    rsync_chunk_end = i;
++    }
++}
++
++/* ===========================================================================
++ * Set rsync_chunk_end if window sum matches magic value.
++ */
++#define RSYNC_ROLL(s, n) \
++   do { if (rsync) rsync_roll((s), (n)); } while(0)
++
+ /* ===========================================================================
+  * Flush the current block, with given end-of-file flag.
+  * IN assertion: strstart is set to the end of the current match.
+@@ -626,7 +676,8 @@ local off_t deflate_fast()
+ 
+             lookahead -= match_length;
+ 
+-            /* Insert new strings in the hash table only if the match length
++	    RSYNC_ROLL(strstart, match_length);
++	    /* Insert new strings in the hash table only if the match length
+              * is not too large. This saves time but degrades compression.
+              */
+             if (match_length <= max_insert_length) {
+@@ -654,9 +705,18 @@ local off_t deflate_fast()
+             /* No match, output a literal byte */
+             Tracevv((stderr,"%c",window[strstart]));
+             flush = ct_tally (0, window[strstart]);
++	    RSYNC_ROLL(strstart, 1);
+             lookahead--;
+             strstart++;
+         }
++        if (rsync && strstart > rsync_chunk_end) {
++            ush  attr = 0;          /* ascii/binary flag */
++
++            flush = 1;
++            /* Reset huffman tree */
++            ct_init(&attr, &method);
++            rsync_chunk_end = 0xFFFFFFFFUL;
++        }
+         if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
+         /* Make sure that we always have enough lookahead, except
+@@ -730,6 +790,7 @@ off_t deflate()
+              */
+             lookahead -= prev_length-1;
+             prev_length -= 2;
++	    RSYNC_ROLL(strstart, prev_length+1);
+             do {
+                 strstart++;
+                 INSERT_STRING(strstart, hash_head);
+@@ -742,24 +803,51 @@ off_t deflate()
+             match_available = 0;
+             match_length = MIN_MATCH-1;
+             strstart++;
+-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 1;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+         } else if (match_available) {
+             /* If there was no match at the previous position, output a
+              * single literal. If there was a match but the current match
+              * is longer, truncate the previous match to a single literal.
+              */
+             Tracevv((stderr,"%c",window[strstart-1]));
+-            if (ct_tally (0, window[strstart-1])) {
+-                FLUSH_BLOCK(0), block_start = strstart;
+-            }
++	    flush = ct_tally (0, window[strstart-1]);
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		flush = 1;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         } else {
+             /* There is no previous match to compare with, wait for
+              * the next step to decide.
+              */
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		FLUSH_BLOCK(0), block_start = strstart;
++	    }
+             match_available = 1;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         }
+diff --git a/doc/gzip.texi b/doc/gzip.texi
+index 3de3063..7ff37ad 100644
+--- a/doc/gzip.texi
++++ b/doc/gzip.texi
+@@ -208,6 +208,7 @@ Mandatory arguments to long options are mandatory for short options too.
+   -V, --version     display version number
+   -1, --fast        compress faster
+   -9, --best        compress better
++    --rsyncable   Make rsync-friendly archive
+ 
+ With no FILE, or when FILE is -, read standard input.
+ 
+@@ -358,6 +359,30 @@ specified on the command line are directories, @command{gzip} will descend
+ into the directory and compress all the files it finds there (or
+ decompress them in the case of @command{gunzip}).
+ 
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some cases, but
++means that the @code{rsync} program can take advantage of similarities
++in the uncompressed input when syncronizing two files compressed with
++this flag.  @code{gunzip} cannot tell the difference between a
++compressed file created with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on
++the input.  This increases size by less than 1 percent most
++cases, but means that the @command{rsync} program can much more efficiently
++synchronize files compressed with this flag.  @command{gunzip}
++cannot tell the difference between a compressed file created
++with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some cases, but
++means that the @code{rsync} program can take advantage of similarities
++in the uncompressed input when syncronizing two files compressed with
++this flag.  @code{gunzip} cannot tell the difference between a
++compressed file created with this option, and one created without it.
++
+ @item --suffix @var{suf}
+ @itemx -S @var{suf}
+ Use suffix @var{suf} instead of @samp{.gz}.  Any suffix can be
+diff --git a/gzip.1 b/gzip.1
+index 71e097c..faee860 100644
+--- a/gzip.1
++++ b/gzip.1
+@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
+ .ll +8
+ .B gzip
+ .RB [ " \-acdfhklLnNrtvV19 " ]
++.RB [ --rsyncable ]
+ .RB [ \-S\ suffix ]
+ [
+ .I "name \&..."
+@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
+ .I gunzip
+ ).
+ .TP
++.B --rsyncable
++While compressing, synchronize the output occasionally based on the input.
++This increases size by less than 1 percent most cases, but means that the
++.BR rsync (1)
++program can take advantage of similarities in the uncompressed input
++when syncronizing two files compressed with this flag.
++.I gunzip
++cannot tell the difference between a compressed file created with this option,
++and one created without it.
++.TP
+ .B \-S .suf   --suffix .suf
+ When compressing, use suffix .suf instead of .gz.
+ Any non-empty suffix can be given, but suffixes
+diff --git a/gzip.c b/gzip.c
+index 93cc738..971d3f0 100644
+--- a/gzip.c
++++ b/gzip.c
+@@ -215,6 +215,7 @@ int  ofd;                  /* output file descriptor */
+ unsigned insize;           /* valid bytes in inbuf */
+ unsigned inptr;            /* index of next byte to be processed in inbuf */
+ unsigned outcnt;           /* bytes in output buffer */
++int rsync = 0;             /* make ryncable chunks */
+ 
+ static int handled_sig[] =
+   {
+@@ -275,7 +276,7 @@ static const struct option longopts[] =
+     {"best",       0, 0, '9'}, /* compress better */
+     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
+     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
+-
++    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
+     { 0, 0, 0, 0 }
+ };
+ 
+@@ -359,6 +360,7 @@ local void help()
+  "  -Z, --lzw         produce output compatible with old compress",
+  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
+ #endif
++ "  --rsyncable       Make rsync-friendly archive",
+  "",
+  "With no FILE, or when FILE is -, read standard input.",
+  "",
+@@ -489,8 +491,11 @@ int main (int argc, char **argv)
+ #else
+             recursive = 1;
+ #endif
+-            break;
+-        case 'S':
++	    break;
++        case 'R':
++	    rsync = 1; break;
++
++	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+ #endif
+diff --git a/gzip.h b/gzip.h
+index 648073e..70ccaa9 100644
+--- a/gzip.h
++++ b/gzip.h
+@@ -140,6 +140,7 @@ EXTERN(uch, window);         /* Sliding window and suffix table (unlzw) */
+ extern unsigned insize; /* valid bytes in inbuf */
+ extern unsigned inptr;  /* index of next byte to be processed in inbuf */
+ extern unsigned outcnt; /* bytes in output buffer */
++extern int rsync;  /* deflate into rsyncable chunks */
+ 
+ extern off_t bytes_in;   /* number of input bytes */
+ extern off_t bytes_out;  /* number of output bytes */
+-- 
+1.8.4.1
+

Copied: csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff (from rev 23055, csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch)
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	                        (rev 0)
+++ csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	2014-02-25 09:51:27 UTC (rev 23071)
@@ -0,0 +1,311 @@
+diff -u -r gzip-1.5/deflate.c /home/bdale/debian/gzip/deflate.c
+--- gzip-1.5/deflate.c	2012-04-24 10:25:28.000000000 -0600
++++ /home/bdale/debian/gzip/deflate.c	2012-06-19 14:01:41.885498670 -0600
+@@ -131,6 +131,14 @@
+ #endif
+ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+ 
++#ifndef RSYNC_WIN
++#  define RSYNC_WIN 8192
++#endif
++/* Size of rsync window, must be < MAX_DIST */
++
++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
++/* Whether window sum matches magic value */
++
+ /* ===========================================================================
+  * Local data used by the "longest match" routines.
+  */
+@@ -212,6 +220,8 @@
+ unsigned good_match;
+ /* Use a faster search when the previous match is longer than this */
+ 
++local ulg rsync_sum;  /* rolling sum of rsync window */
++local ulg rsync_chunk_end; /* next rsync sequence point */
+ 
+ /* Values for max_lazy_match, good_match and max_chain_length, depending on
+  * the desired pack level (0..9). The values given below have been tuned to
+@@ -314,6 +324,10 @@
+ #endif
+     /* prev will be initialized on the fly */
+ 
++    /* rsync params */
++    rsync_chunk_end = 0xFFFFFFFFUL;
++    rsync_sum = 0;
++
+     /* Set the default configuration parameters:
+      */
+     max_lazy_match   = configuration_table[pack_level].max_lazy;
+@@ -331,6 +345,7 @@
+ 
+     strstart = 0;
+     block_start = 0L;
++    rsync_chunk_end = 0xFFFFFFFFUL;
+ #ifdef ASMV
+     match_init(); /* initialize the asm code */
+ #endif
+@@ -550,6 +565,8 @@
+         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
+         match_start -= WSIZE;
+         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
++	if (rsync_chunk_end != 0xFFFFFFFFUL)
++	    rsync_chunk_end -= WSIZE;
+ 
+         block_start -= (long) WSIZE;
+ 
+@@ -579,6 +596,39 @@
+     }
+ }
+ 
++local void rsync_roll(start, num)
++    unsigned start;
++    unsigned num;
++{
++    unsigned i;
++
++    if (start < RSYNC_WIN) {
++	/* before window fills. */
++	for (i = start; i < RSYNC_WIN; i++) {
++	    if (i == start + num) return;
++	    rsync_sum += (ulg)window[i];
++	}
++	num -= (RSYNC_WIN - start);
++	start = RSYNC_WIN;
++    }
++
++    /* buffer after window full */
++    for (i = start; i < start+num; i++) {
++	/* New character in */
++	rsync_sum += (ulg)window[i];
++	/* Old character out */
++	rsync_sum -= (ulg)window[i - RSYNC_WIN];
++	if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
++	    rsync_chunk_end = i;
++    }
++}
++
++/* ===========================================================================
++ * Set rsync_chunk_end if window sum matches magic value.
++ */
++#define RSYNC_ROLL(s, n) \
++   do { if (rsync) rsync_roll((s), (n)); } while(0)
++
+ /* ===========================================================================
+  * Flush the current block, with given end-of-file flag.
+  * IN assertion: strstart is set to the end of the current match.
+@@ -626,7 +676,8 @@
+ 
+             lookahead -= match_length;
+ 
+-            /* Insert new strings in the hash table only if the match length
++	    RSYNC_ROLL(strstart, match_length);
++	    /* Insert new strings in the hash table only if the match length
+              * is not too large. This saves time but degrades compression.
+              */
+             if (match_length <= max_insert_length) {
+@@ -654,9 +705,18 @@
+             /* No match, output a literal byte */
+             Tracevv((stderr,"%c",window[strstart]));
+             flush = ct_tally (0, window[strstart]);
++	    RSYNC_ROLL(strstart, 1);
+             lookahead--;
+             strstart++;
+         }
++        if (rsync && strstart > rsync_chunk_end) {
++            ush  attr = 0;          /* ascii/binary flag */
++
++            flush = 1;
++            /* Reset huffman tree */
++            ct_init(&attr, &method);
++            rsync_chunk_end = 0xFFFFFFFFUL;
++        }
+         if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
+         /* Make sure that we always have enough lookahead, except
+@@ -730,6 +790,7 @@
+              */
+             lookahead -= prev_length-1;
+             prev_length -= 2;
++	    RSYNC_ROLL(strstart, prev_length+1);
+             do {
+                 strstart++;
+                 INSERT_STRING(strstart, hash_head);
+@@ -742,24 +803,51 @@
+             match_available = 0;
+             match_length = MIN_MATCH-1;
+             strstart++;
+-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 1;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+         } else if (match_available) {
+             /* If there was no match at the previous position, output a
+              * single literal. If there was a match but the current match
+              * is longer, truncate the previous match to a single literal.
+              */
+             Tracevv((stderr,"%c",window[strstart-1]));
+-            if (ct_tally (0, window[strstart-1])) {
+-                FLUSH_BLOCK(0), block_start = strstart;
+-            }
++	    flush = ct_tally (0, window[strstart-1]);
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		flush = 1;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         } else {
+             /* There is no previous match to compare with, wait for
+              * the next step to decide.
+              */
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		FLUSH_BLOCK(0), block_start = strstart;
++	    }
+             match_available = 1;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         }
+diff -u -r gzip-1.5/doc/gzip.texi /home/bdale/debian/gzip/doc/gzip.texi
+--- gzip-1.5/doc/gzip.texi	2012-01-01 01:53:58.000000000 -0700
++++ /home/bdale/debian/gzip/doc/gzip.texi	2012-06-19 14:09:36.041559612 -0600
+@@ -207,6 +207,7 @@
+   -V, --version     display version number
+   -1, --fast        compress faster
+   -9, --best        compress better
++    --rsyncable   Make rsync-friendly archive
+ 
+ With no FILE, or when FILE is -, read standard input.
+ 
+@@ -353,6 +354,30 @@
+ into the directory and compress all the files it finds there (or
+ decompress them in the case of @command{gunzip}).
+ 
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some cases, but
++means that the @code{rsync} program can take advantage of similarities
++in the uncompressed input when syncronizing two files compressed with
++this flag.  @code{gunzip} cannot tell the difference between a
++compressed file created with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on
++the input.  This increases size by less than 1 percent most
++cases, but means that the @command{rsync} program can much more efficiently
++synchronize files compressed with this flag.  @command{gunzip}
++cannot tell the difference between a compressed file created
++with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some cases, but
++means that the @code{rsync} program can take advantage of similarities
++in the uncompressed input when syncronizing two files compressed with
++this flag.  @code{gunzip} cannot tell the difference between a
++compressed file created with this option, and one created without it.
++
+ @item --suffix @var{suf}
+ @itemx -S @var{suf}
+ Use suffix @var{suf} instead of @samp{.gz}.  Any suffix can be
+--- gzip-1.5/gzip.c	2012-04-24 10:25:28.000000000 -0600
++++ /home/bdale/debian/gzip/gzip.c	2012-06-19 14:00:43.283873180 -0600
+@@ -213,6 +213,7 @@
+ unsigned insize;           /* valid bytes in inbuf */
+ unsigned inptr;            /* index of next byte to be processed in inbuf */
+ unsigned outcnt;           /* bytes in output buffer */
++int rsync = 0;             /* make ryncable chunks */
+ 
+ static int handled_sig[] =
+   {
+@@ -270,7 +271,7 @@
+     {"best",       0, 0, '9'}, /* compress better */
+     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
+     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
+-
++    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
+     { 0, 0, 0, 0 }
+ };
+ 
+@@ -353,6 +354,7 @@
+  "  -Z, --lzw         produce output compatible with old compress",
+  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
+ #endif
++ "  --rsyncable       Make rsync-friendly archive",
+  "",
+  "With no FILE, or when FILE is -, read standard input.",
+  "",
+@@ -481,8 +483,11 @@
+ #else
+             recursive = 1;
+ #endif
+-            break;
+-        case 'S':
++	    break;
++        case 'R':
++	    rsync = 1; break;
++
++	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+ #endif
+diff -u -r gzip-1.5/gzip.h /home/bdale/debian/gzip/gzip.h
+--- gzip-1.5/gzip.h	2012-01-01 01:53:58.000000000 -0700
++++ /home/bdale/debian/gzip/gzip.h	2012-06-19 13:57:36.833883093 -0600
+@@ -140,6 +140,7 @@
+ extern unsigned insize; /* valid bytes in inbuf */
+ extern unsigned inptr;  /* index of next byte to be processed in inbuf */
+ extern unsigned outcnt; /* bytes in output buffer */
++extern int rsync;  /* deflate into rsyncable chunks */
+ 
+ extern off_t bytes_in;   /* number of input bytes */
+ extern off_t bytes_out;  /* number of output bytes */
+diff --git a/gzip.1 b/gzip.1
+index 71e097c..faee860 100644
+--- a/gzip.1
++++ b/gzip.1
+@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
+ .ll +8
+ .B gzip
+ .RB [ " \-acdfhklLnNrtvV19 " ]
++.RB [ --rsyncable ]
+ .RB [ \-S\ suffix ]
+ [
+ .I "name \&..."
+@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
+ .I gunzip
+ ).
+ .TP
++.B --rsyncable
++While compressing, synchronize the output occasionally based on the input.
++This increases size by less than 1 percent most cases, but means that the
++.BR rsync (1)
++program can take advantage of similarities in the uncompressed input
++when syncronizing two files compressed with this flag.
++.I gunzip
++cannot tell the difference between a compressed file created with this option,
++and one created without it.
++.TP
+ .B \-S .suf   --suffix .suf
+ When compressing, use suffix .suf instead of .gz.
+ Any non-empty suffix can be given, but suffixes

Deleted: csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,280 +0,0 @@
-diff -up gzip-1.3.12/trees.c.rsync gzip-1.3.12/trees.c
---- gzip-1.3.12/trees.c.rsync	2006-11-20 09:40:33.000000000 +0100
-+++ gzip-1.3.12/trees.c	2008-09-01 14:35:12.000000000 +0200
-@@ -860,9 +860,10 @@ local void send_all_trees(lcodes, dcodes
-  * trees or store, and output the encoded block to the zip file. This function
-  * returns the total compressed length for the file so far.
-  */
--off_t flush_block(buf, stored_len, eof)
-+off_t flush_block(buf, stored_len, pad, eof)  
-     char *buf;        /* input block, or NULL if too old */
-     ulg stored_len;   /* length of input block */
-+    int pad;          /* pad output to byte boundary */ 
-     int eof;          /* true if this is the last block for a file */
- {
-     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -955,6 +956,10 @@ off_t flush_block(buf, stored_len, eof)
-         Assert (input_len == bytes_in, "bad input size");
-         bi_windup();
-         compressed_len += 7;  /* align on byte boundary */
-+    } else if (pad && (compressed_len % 8) != 0) {
-+        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
-+        compressed_len = (compressed_len + 3 + 7) & ~7L;
-+        copy_block(buf, 0, 1); /* with header */
-     }
- 
-     return compressed_len >> 3;
-diff -up gzip-1.3.12/deflate.c.rsync gzip-1.3.12/deflate.c
---- gzip-1.3.12/deflate.c.rsync	2006-12-08 00:53:00.000000000 +0100
-+++ gzip-1.3.12/deflate.c	2008-09-01 14:35:12.000000000 +0200
-@@ -135,6 +135,14 @@ static char rcsid[] = "$Id: deflate.c,v 
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
- 
-+#ifndef RSYNC_WIN
-+#  define RSYNC_WIN 4096
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
-  * Local data used by the "longest match" routines.
-  */
-@@ -216,6 +224,8 @@ local int compr_level;
- unsigned near good_match;
- /* Use a faster search when the previous match is longer than this */
- 
-+local ulg rsync_sum;  /* rolling sum of rsync window */
-+local ulg rsync_chunk_end; /* next rsync sequence point */
- 
- /* Values for max_lazy_match, good_match and max_chain_length, depending on
-  * the desired pack level (0..9). The values given below have been tuned to
-@@ -314,6 +324,10 @@ void lm_init (pack_level, flags)
- #endif
-     /* prev will be initialized on the fly */
- 
-+    /* rsync params */
-+    rsync_chunk_end = 0xFFFFFFFFUL;
-+    rsync_sum = 0;
-+
-     /* Set the default configuration parameters:
-      */
-     max_lazy_match   = configuration_table[pack_level].max_lazy;
-@@ -550,6 +564,8 @@ local void fill_window()
-         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
-         match_start -= WSIZE;
-         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
-+        if (rsync_chunk_end != 0xFFFFFFFFUL)
-+            rsync_chunk_end -= WSIZE;
- 
-         block_start -= (long) WSIZE;
- 
-@@ -577,13 +593,46 @@ local void fill_window()
-     }
- }
- 
-+local void rsync_roll(start, num)
-+    unsigned start;
-+    unsigned num;
-+{
-+    unsigned i;
-+
-+    if (start < RSYNC_WIN) {
-+       /* before window fills. */
-+       for (i = start; i < RSYNC_WIN; i++) {
-+           if (i == start + num) return;
-+           rsync_sum += (ulg)window[i];
-+       }
-+       num -= (RSYNC_WIN - start);
-+       start = RSYNC_WIN;
-+    }
-+
-+    /* buffer after window full */
-+    for (i = start; i < start+num; i++) {
-+       /* New character in */
-+       rsync_sum += (ulg)window[i];
-+       /* Old character out */
-+       rsync_sum -= (ulg)window[i - RSYNC_WIN];
-+       if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
-+           rsync_chunk_end = i;
-+    }
-+}
-+
-+/* ===========================================================================
-+ * Set rsync_chunk_end if window sum matches magic value.
-+ */
-+#define RSYNC_ROLL(s, n) \
-+   do { if (rsync) rsync_roll((s), (n)); } while(0)
-+
- /* ===========================================================================
-  * Flush the current block, with given end-of-file flag.
-  * IN assertion: strstart is set to the end of the current match.
-  */
- #define FLUSH_BLOCK(eof) \
-    flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
--                (char*)NULL, (long)strstart - block_start, (eof))
-+                (char*)NULL, (long)strstart - block_start, flush-1, (eof)) 
- 
- /* ===========================================================================
-  * Processes a new input file and return its compressed length. This
-@@ -594,7 +643,7 @@ local void fill_window()
- local off_t deflate_fast()
- {
-     IPos hash_head; /* head of the hash chain */
--    int flush;      /* set if current block must be flushed */
-+    int flush;      /* set if current block must be flushed, 2=>and padded  */ 
-     unsigned match_length = 0;  /* length of best match */
- 
-     prev_length = MIN_MATCH-1;
-@@ -624,6 +673,7 @@ local off_t deflate_fast()
- 
-             lookahead -= match_length;
- 
-+	    RSYNC_ROLL(strstart, match_length); 
- 	    /* Insert new strings in the hash table only if the match length
-              * is not too large. This saves time but degrades compression.
-              */
-@@ -652,9 +702,14 @@ local off_t deflate_fast()
-             /* No match, output a literal byte */
-             Tracevv((stderr,"%c",window[strstart]));
-             flush = ct_tally (0, window[strstart]);
-+            RSYNC_ROLL(strstart, 1);
-             lookahead--;
- 	    strstart++;
-         }
-+	if (rsync && strstart > rsync_chunk_end) {                                                        
-+            rsync_chunk_end = 0xFFFFFFFFUL;                                                               
-+            flush = 2;                                                                                    
-+        }  
-         if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-         /* Make sure that we always have enough lookahead, except
-@@ -728,6 +783,7 @@ off_t deflate()
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+            RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -740,24 +796,40 @@ off_t deflate()
-             match_available = 0;
-             match_length = MIN_MATCH-1;
-             strstart++;
--            if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-+            if (rsync && strstart > rsync_chunk_end) {
-+                rsync_chunk_end = 0xFFFFFFFFUL;
-+                flush = 2;
-+            }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-         } else if (match_available) {
-             /* If there was no match at the previous position, output a
-              * single literal. If there was a match but the current match
-              * is longer, truncate the previous match to a single literal.
-              */
-             Tracevv((stderr,"%c",window[strstart-1]));
--            if (ct_tally (0, window[strstart-1])) {
--                FLUSH_BLOCK(0), block_start = strstart;
-+            flush = ct_tally (0, window[strstart-1]);
-+            if (rsync && strstart > rsync_chunk_end) {
-+                rsync_chunk_end = 0xFFFFFFFFUL;
-+                flush = 2;
-             }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-+            RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         } else {
-             /* There is no previous match to compare with, wait for
-              * the next step to decide.
-              */
-+            if (rsync && strstart > rsync_chunk_end) {
-+                /* Reset huffman tree */
-+                rsync_chunk_end = 0xFFFFFFFFUL;
-+                flush = 2;
-+                FLUSH_BLOCK(0), block_start = strstart;
-+            }             
-+             
-             match_available = 1;
-+            RSYNC_ROLL(strstart, 1);  
-             strstart++;
-             lookahead--;
-         }
-diff -up gzip-1.3.12/gzip.c.rsync gzip-1.3.12/gzip.c
---- gzip-1.3.12/gzip.c.rsync	2007-03-20 06:09:51.000000000 +0100
-+++ gzip-1.3.12/gzip.c	2008-09-01 14:35:12.000000000 +0200
-@@ -231,6 +231,7 @@ int  ofd;                  /* output fil
- unsigned insize;           /* valid bytes in inbuf */
- unsigned inptr;            /* index of next byte to be processed in inbuf */
- unsigned outcnt;           /* bytes in output buffer */
-+int rsync = 0;             /* make ryncable chunks */
- 
- struct option longopts[] =
- {
-@@ -260,6 +261,7 @@ struct option longopts[] =
-     {"best",       0, 0, '9'}, /* compress better */
-     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
-     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
-+    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */      
-     { 0, 0, 0, 0 }
- };
- 
-@@ -341,6 +343,7 @@ local void help()
-  "  -Z, --lzw         produce output compatible with old compress",
-  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
- #endif
-+ "    --rsyncable   Make rsync-friendly archive",  
-  "",
-  "With no FILE, or when FILE is -, read standard input.",
-  "",
-@@ -469,6 +472,9 @@ int main (argc, argv)
- 	    recursive = 1;
- #endif
- 	    break;
-+
-+        case 'R':
-+	    rsync = 1; break;
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
-diff -up gzip-1.3.12/gzip.h.rsync gzip-1.3.12/gzip.h
---- gzip-1.3.12/gzip.h.rsync	2007-03-20 06:09:51.000000000 +0100
-+++ gzip-1.3.12/gzip.h	2008-09-01 14:35:12.000000000 +0200
-@@ -158,6 +158,7 @@ EXTERN(uch, window);         /* Sliding 
- extern unsigned insize; /* valid bytes in inbuf */
- extern unsigned inptr;  /* index of next byte to be processed in inbuf */
- extern unsigned outcnt; /* bytes in output buffer */
-+extern int rsync;  /* deflate into rsyncable chunks */ 
- 
- extern off_t bytes_in;   /* number of input bytes */
- extern off_t bytes_out;  /* number of output bytes */
-@@ -306,7 +307,7 @@ off_t deflate OF((void));
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--off_t flush_block OF((char *buf, ulg stored_len, int eof));
-+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof)); 
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
-diff -up gzip-1.3.12/doc/gzip.texi.rsync gzip-1.3.12/doc/gzip.texi
---- gzip-1.3.12/doc/gzip.texi.rsync	2007-02-06 00:29:04.000000000 +0100
-+++ gzip-1.3.12/doc/gzip.texi	2008-09-01 14:35:12.000000000 +0200
-@@ -350,6 +350,14 @@ specified on the command line are direct
- into the directory and compress all the files it finds there (or
- decompress them in the case of @command{gunzip}).
- 
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This reduces compression by about 1 percent most cases, but
-+means that the @code{rsync} program can take advantage of similarities
-+in the uncompressed input when syncronizing two files compressed with
-+this flag.  @code{gunzip} cannot tell the difference between a
-+compressed file created with this option, and one created without it.
-+
- @item --suffix @var{suf}
- @itemx -S @var{suf}
- Use suffix @var{suf} instead of @samp{.gz}.  Any suffix can be

Deleted: csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,280 +0,0 @@
-diff -ur gzip-1.2.4.orig/deflate.c gzip-1.2.4-rsync/deflate.c
---- gzip-1.2.4.orig/deflate.c	Fri Aug 13 22:35:31 1993
-+++ gzip-1.2.4-rsync/deflate.c	Sat Dec 30 15:33:25 2000
-@@ -121,6 +121,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
- 
-+#ifndef RSYNC_WIN
-+#  define RSYNC_WIN 4096
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
-  * Local data used by the "longest match" routines.
-  */
-@@ -202,6 +210,8 @@
- unsigned near good_match;
- /* Use a faster search when the previous match is longer than this */
- 
-+local ulg rsync_sum;  /* rolling sum of rsync window */
-+local ulg rsync_chunk_end; /* next rsync sequence point */
- 
- /* Values for max_lazy_match, good_match and max_chain_length, depending on
-  * the desired pack level (0..9). The values given below have been tuned to
-@@ -300,6 +310,10 @@
- #endif
-     /* prev will be initialized on the fly */
- 
-+    /* rsync params */
-+    rsync_chunk_end = 0xFFFFFFFFUL;
-+    rsync_sum = 0;
-+
-     /* Set the default configuration parameters:
-      */
-     max_lazy_match   = configuration_table[pack_level].max_lazy;
-@@ -536,6 +550,8 @@
-         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
-         match_start -= WSIZE;
-         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
-+	if (rsync_chunk_end != 0xFFFFFFFFUL)
-+	    rsync_chunk_end -= WSIZE;
- 
-         block_start -= (long) WSIZE;
- 
-@@ -563,13 +579,46 @@
-     }
- }
- 
-+local void rsync_roll(start, num)
-+    unsigned start;
-+    unsigned num;
-+{
-+    unsigned i;
-+
-+    if (start < RSYNC_WIN) {
-+	/* before window fills. */
-+	for (i = start; i < RSYNC_WIN; i++) {
-+	    if (i == start + num) return;
-+	    rsync_sum += (ulg)window[i];
-+	}
-+	num -= (RSYNC_WIN - start);
-+	start = RSYNC_WIN;
-+    }
-+
-+    /* buffer after window full */
-+    for (i = start; i < start+num; i++) {
-+	/* New character in */
-+	rsync_sum += (ulg)window[i];
-+	/* Old character out */
-+	rsync_sum -= (ulg)window[i - RSYNC_WIN];
-+	if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
-+	    rsync_chunk_end = i;
-+    }
-+}
-+
-+/* ===========================================================================
-+ * Set rsync_chunk_end if window sum matches magic value.
-+ */
-+#define RSYNC_ROLL(s, n) \
-+   do { if (rsync) rsync_roll((s), (n)); } while(0)
-+
- /* ===========================================================================
-  * Flush the current block, with given end-of-file flag.
-  * IN assertion: strstart is set to the end of the current match.
-  */
- #define FLUSH_BLOCK(eof) \
-    flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
--                (char*)NULL, (long)strstart - block_start, (eof))
-+                (char*)NULL, (long)strstart - block_start, flush-1, (eof))
- 
- /* ===========================================================================
-  * Processes a new input file and return its compressed length. This
-@@ -580,7 +629,7 @@
- local ulg deflate_fast()
- {
-     IPos hash_head; /* head of the hash chain */
--    int flush;      /* set if current block must be flushed */
-+    int flush;      /* set if current block must be flushed, 2=>and padded  */
-     unsigned match_length = 0;  /* length of best match */
- 
-     prev_length = MIN_MATCH-1;
-@@ -609,6 +658,7 @@
- 
-             lookahead -= match_length;
- 
-+	    RSYNC_ROLL(strstart, match_length);
- 	    /* Insert new strings in the hash table only if the match length
-              * is not too large. This saves time but degrades compression.
-              */
-@@ -637,9 +687,14 @@
-             /* No match, output a literal byte */
-             Tracevv((stderr,"%c",window[strstart]));
-             flush = ct_tally (0, window[strstart]);
-+	    RSYNC_ROLL(strstart, 1);
-             lookahead--;
- 	    strstart++; 
-         }
-+	if (rsync && strstart > rsync_chunk_end) {
-+	    rsync_chunk_end = 0xFFFFFFFFUL;
-+	    flush = 2;
-+	} 
-         if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-         /* Make sure that we always have enough lookahead, except
-@@ -715,6 +770,7 @@
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+	    RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -727,24 +783,39 @@
-             match_available = 0;
-             match_length = MIN_MATCH-1;
-             strstart++;
--            if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+	    }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-         } else if (match_available) {
-             /* If there was no match at the previous position, output a
-              * single literal. If there was a match but the current match
-              * is longer, truncate the previous match to a single literal.
-              */
-             Tracevv((stderr,"%c",window[strstart-1]));
--            if (ct_tally (0, window[strstart-1])) {
--                FLUSH_BLOCK(0), block_start = strstart;
--            }
-+	    flush = ct_tally (0, window[strstart-1]);
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+	    }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         } else {
-             /* There is no previous match to compare with, wait for
-              * the next step to decide.
-              */
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		/* Reset huffman tree */
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+		FLUSH_BLOCK(0), block_start = strstart;
-+	    }
-             match_available = 1;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         }
-diff -ur gzip-1.2.4.orig/gzip.c gzip-1.2.4-rsync/gzip.c
---- gzip-1.2.4.orig/gzip.c	Thu Aug 19 23:39:43 1993
-+++ gzip-1.2.4-rsync/gzip.c	Fri Dec 29 21:20:54 2000
-@@ -239,6 +239,7 @@
- unsigned insize;           /* valid bytes in inbuf */
- unsigned inptr;            /* index of next byte to be processed in inbuf */
- unsigned outcnt;           /* bytes in output buffer */
-+int rsync = 0;             /* make ryncable chunks */
- 
- struct option longopts[] =
- {
-@@ -268,6 +269,7 @@
-     {"best",       0, 0, '9'}, /* compress better */
-     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
-     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
-+    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
-     { 0, 0, 0, 0 }
- };
- 
-@@ -357,6 +359,7 @@
-  " -Z --lzw         produce output compatible with old compress",
-  " -b --bits maxbits   max number of bits per code (implies -Z)",
- #endif
-+ "    --rsyncable   Make rsync-friendly archive",
-  " file...          files to (de)compress. If none given, use standard input.",
-   0};
-     char **p = help_msg;
-@@ -516,6 +519,9 @@
- #else
- 	    recursive = 1; break;
- #endif
-+	case 'R':
-+	    rsync = 1; break;
-+
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
-diff -ur gzip-1.2.4.orig/gzip.h gzip-1.2.4-rsync/gzip.h
---- gzip-1.2.4.orig/gzip.h	Fri Aug 13 22:35:33 1993
-+++ gzip-1.2.4-rsync/gzip.h	Sat Dec 30 15:26:56 2000
-@@ -131,6 +131,7 @@
- extern unsigned insize; /* valid bytes in inbuf */
- extern unsigned inptr;  /* index of next byte to be processed in inbuf */
- extern unsigned outcnt; /* bytes in output buffer */
-+extern int rsync;  /* deflate into rsyncable chunks */
- 
- extern long bytes_in;   /* number of input bytes */
- extern long bytes_out;  /* number of output bytes */
-@@ -282,7 +283,7 @@
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--ulg  flush_block OF((char *buf, ulg stored_len, int eof));
-+ulg  flush_block OF((char *buf, ulg stored_len, int pad, int eof));
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
-diff -ur gzip-1.2.4.orig/gzip.texi gzip-1.2.4-rsync/gzip.texi
---- gzip-1.2.4.orig/gzip.texi	Thu Aug 19 06:42:50 1993
-+++ gzip-1.2.4-rsync/gzip.texi	Fri Dec 29 21:20:54 2000
-@@ -316,6 +316,14 @@
- into the directory and compress all the files it finds there (or
- decompress them in the case of @code{gunzip}).
- 
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This reduces compression by about 1 percent most cases, but
-+means that the @code{rsync} program can take advantage of similarities
-+in the uncompressed input when syncronizing two files compressed with
-+this flag.  @code{gunzip} cannot tell the difference between a
-+compressed file created with this option, and one created without it.
-+
- @item --suffix @var{suf}
- @itemx -S @var{suf}
- Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
-diff -ur gzip-1.2.4.orig/trees.c gzip-1.2.4-rsync/trees.c
---- gzip-1.2.4.orig/trees.c	Wed Aug 18 03:36:32 1993
-+++ gzip-1.2.4-rsync/trees.c	Sat Dec 30 15:37:00 2000
-@@ -850,9 +850,10 @@
-  * trees or store, and output the encoded block to the zip file. This function
-  * returns the total compressed length for the file so far.
-  */
--ulg flush_block(buf, stored_len, eof)
-+ulg flush_block(buf, stored_len, pad, eof)
-     char *buf;        /* input block, or NULL if too old */
-     ulg stored_len;   /* length of input block */
-+    int pad;          /* pad output to byte boundary */
-     int eof;          /* true if this is the last block for a file */
- {
-     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -944,6 +967,10 @@
-         Assert (input_len == isize, "bad input size");
-         bi_windup();
-         compressed_len += 7;  /* align on byte boundary */
-+    } else if (pad && (compressed_len % 8) != 0) {
-+        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
-+        compressed_len = (compressed_len + 3 + 7) & ~7L;
-+        copy_block(buf, 0, 1); /* with header */
-     }
-     Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3,
-            compressed_len-7*eof));

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


From lblume at users.sourceforge.net  Tue Feb 25 11:55:30 2014
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Tue, 25 Feb 2014 10:55:30 +0000
Subject: SF.net SVN: gar:[23072] csw/mgar/pkg/ImageMagick/trunk
Message-ID: <3fYH9j5T7Gz15R@mail.opencsw.org>

Revision: 23072
          http://sourceforge.net/p/gar/code/23072
Author:   lblume
Date:     2014-02-25 10:55:25 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
ImageMagick/trunk: Version bump

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

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-02-25 09:51:27 UTC (rev 23071)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2014-02-25 10:55:25 UTC (rev 23072)
@@ -1,6 +1,6 @@
 NAME      = imagemagick
 VERSION   = 6.8.8
-GARSUBREV = 2
+GARSUBREV = 7
 GARTYPE   = v2
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2014-02-25 09:51:27 UTC (rev 23071)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2014-02-25 10:55:25 UTC (rev 23072)
@@ -1 +1 @@
-d11e1c732add731ff368b2dffcd004b4  ImageMagick-6.8.8-2.tar.xz
+1ae0f7fdc0384b588241cdc851b1e097  ImageMagick-6.8.8-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  Thu Feb 27 16:50:54 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 27 Feb 2014 15:50:54 +0000
Subject: SF.net SVN: gar:[23073] csw/mgar/pkg/lang-python
Message-ID: <3fZddr2vBgz1Hv@mail.opencsw.org>

Revision: 23073
          http://sourceforge.net/p/gar/code/23073
Author:   dmichelsen
Date:     2014-02-27 15:50:50 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
lang-python/gyp: Initial commit

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

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

Modified: csw/mgar/pkg/lang-python/gyp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/twisted/trunk/Makefile	2014-02-20 18:39:23 UTC (rev 23055)
+++ csw/mgar/pkg/lang-python/gyp/trunk/Makefile	2014-02-27 15:50:50 UTC (rev 23073)
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-NAME = Twisted
-VERSION = 13.1.0
+NAME = gyp
+VERSION = 0.1
 CATEGORIES = python
 GARTYPE = v2
 
@@ -13,33 +13,25 @@
   mail servers, and more.
 endef
 
-MASTER_SITES += $(PYPI_MIRROR)
-DISTFILES += $(DISTNAME).tar.bz2
+MASTER_SITES += manual://
+DISTFILES += $(DISTNAME).tar.gz
 
-# For /usr/include/sys/socket.h to make msghdr.msg_control available.
-# Add definition until this is fixed:
-#   https://twistedmatrix.com/trac/ticket/6787
-EXTRA_CPPFLAGS += -D_XPG4_2
-
 LICENSE = LICENSE
 
-PACKAGES += CSWpy-twisted
-SPKG_DESC_CSWpy-twisted = An event-driven networking engine
-RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface
-RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-7-1-0
-RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibgcc-s1
-OBSOLETED_BY_CSWpy-twisted = CSWtwisted
+PACKAGES += CSWgyp
+SPKG_DESC_CSWgyp = Generate Your Projects
+# PKGFILES is catchall
 
-CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface
+# The projects name is 'gyp'
+CHECKPKG_OVERRIDES_CSWgyp += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWgyp += catalogname-does-not-start-with-py_
 
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/unix.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/unix.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/openssh_compat/factory.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/openssh_compat/factory.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/tap/ftp.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/tap/ftp.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/twisted/scripts/tap2deb.py
-CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/twisted/scripts/tap2deb.py
+# These are default pathes
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/generator/eclipse.py
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/generator/xcode.py
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/xcode_emulation.py
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/generator/eclipse.py
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/generator/xcode.py
+CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/xcode_emulation.py
 
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/gyp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/twisted/trunk/checksums	2014-02-20 18:39:23 UTC (rev 23055)
+++ csw/mgar/pkg/lang-python/gyp/trunk/checksums	2014-02-27 15:50:50 UTC (rev 23073)
@@ -1 +1 @@
-5609c91ed465f5a7da48d30a0e7b6960  Twisted-13.1.0.tar.bz2
+0a302f9c45bdfbc560375fb1ea710913  gyp-0.1.tar.gz

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


From cgrzemba at users.sourceforge.net  Thu Feb 27 16:54:48 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 27 Feb 2014 15:54:48 +0000
Subject: SF.net SVN: gar:[23074] csw/mgar/pkg/ocaml/trunk
Message-ID: <3fZdkP1ZdCz1MX@mail.opencsw.org>

Revision: 23074
          http://sourceforge.net/p/gar/code/23074
Author:   cgrzemba
Date:     2014-02-27 15:54:32 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
ocaml/trunk: update version 4.01

Modified Paths:
--------------
    csw/mgar/pkg/ocaml/trunk/Makefile
    csw/mgar/pkg/ocaml/trunk/checksums
    csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch
    csw/mgar/pkg/ocaml/trunk/files/18-patch
    csw/mgar/pkg/ocaml/trunk/files/2-patch
    csw/mgar/pkg/ocaml/trunk/files/21-patch
    csw/mgar/pkg/ocaml/trunk/files/4-patch
    csw/mgar/pkg/ocaml/trunk/files/6-patch
    csw/mgar/pkg/ocaml/trunk/files/9-patch

Added Paths:
-----------
    csw/mgar/pkg/ocaml/trunk/files/22-patch

Modified: csw/mgar/pkg/ocaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ocaml/trunk/Makefile	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/Makefile	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,5 +1,6 @@
 NAME = ocaml
-VERSION = 3.12.1
+VERSION = 4.01.0
+# VERSION = 3.12.1
 GARTYPE = v2
 
 DESCRIPTION = Objective Caml programming language
@@ -7,7 +8,7 @@
   OCaml's toolset includes an interactive top level interpreter, a bytecode compiler, and an optimizing native code compiler. It has a large standard library that makes it useful for many of the same applications as Python or Perl, as well as robust modular and object-oriented programming constructs that make it applicable for large-scale software engineering. OCaml is the successor to Caml Light. The acronym CAML originally stood for Categorical Abstract Machine Language, although OCaml abandons this abstract machine.
 endef
 
-MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-3.11/
+MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-$(basename $(VERSION))/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 GARCOMPILER = GCC4
 
@@ -35,6 +36,7 @@
 PATCHFILES += 7-patch
 PATCHFILES += 8-patch
 PATCHFILES += 9-patch
+PATCHFILES += 22-patch
 PATCHFILES += 0023-fix-build-for-tk-X11.patch
 #
 # this is only a error ignor patch taken from here:

Modified: csw/mgar/pkg/ocaml/trunk/checksums
===================================================================
--- csw/mgar/pkg/ocaml/trunk/checksums	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/checksums	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1 +1 @@
-814a047085f0f901ab7d8e3a4b7a9e65  ocaml-3.12.1.tar.gz
+04dfdd7da189462a4f10ec6530359cef  ocaml-4.01.0.tar.gz

Modified: csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,48 +1,22 @@
-From 3b0c53c72a5c0097fcd8fc06dd13d635da0a26e8 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Fri, 25 Jan 2013 14:54:32 +0100
-Subject: [PATCH 23/23] fix build for tk X11
-
----
- configure | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/configure b/configure
-index b0390c2..ab96a84 100755
 --- a/configure
 +++ b/configure
-@@ -88,7 +88,7 @@ while : ; do
-     -x11include*|--x11include*)
-         x11_include_dir=$2; shift;;
-     -x11lib*|--x11lib*)
--        x11_lib_dir=$2; shift;;
-+        x11_lib_dir=$2; echo "use X11 path: $x11_lib_dir"; shift;;
-     -with-pthread*|--with-pthread*)
-         ;; # Ignored for backward compatibility
-     -no-pthread*|--no-pthread*)
-@@ -1309,18 +1309,19 @@ do
-      test -f $dir/libX11.dylib || \
-      test -f $dir/libX11.sa; then
-     if test $dir = /usr/lib; then
--      x11_link="-lX11"
-+      x11_link="-lX11 -lXext"
-     else
-       x11_libs="-L$dir"
-       case "$host" in
-         *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
--        *) x11_link="-L$dir -lX11";;
-+        *) x11_link="-L$dir -lX11 -lXext";;
-       esac
-     fi
-     break
-   fi
- done
- 
-+echo "set X11 Link $x11_link"
- 
- if test "$x11_include" = "not found" || test "$x11_link" = "not found"
- then
-@@ -1463,16 +1464,16 @@ if test $has_tk = true; then
+@@ -1383,13 +1383,13 @@ if test "$x11_include" = "not found"; then
+        test -f $dir/libX11.dylib || \
+        test -f $dir/libX11.sa; then
+       if test $dir = /usr/lib; then
+-        x11_link="-lX11"
++        x11_link="-lX11 -lXext"
+       else
+         x11_libs="-L$dir"
+         case "$host" in
+           *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
+           *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+-          *) x11_link="-L$dir -lX11";;
++          *) x11_link="-L$dir -lX11 -lXext";;
+         esac
+       fi
+       break
+@@ -1506,16 +1506,16 @@ if test $has_tk = true; then
    elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
    then
      tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
@@ -63,7 +37,7 @@
      esac
    else
      echo "Tcl library not found."
-@@ -1483,17 +1484,17 @@ fi
+@@ -1526,17 +1526,17 @@ fi
  if test $has_tk = true; then
    if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
      echo "Tcl/Tk libraries found."
@@ -85,6 +59,3 @@
      esac
      echo "Tcl/Tk libraries found."
    else
--- 
-1.8.1
-

Modified: csw/mgar/pkg/ocaml/trunk/files/18-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/18-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/18-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,6 +1,6 @@
 --- a/otherlibs/threads/Makefile
 +++ b/otherlibs/threads/Makefile
-@@ -100,12 +100,12 @@ clean: partialclean
+@@ -96,14 +96,14 @@ clean: partialclean
  	rm -f pervasives.mli marshal.mli unix.mli
  
  install:
@@ -8,14 +8,16 @@
 -	mkdir -p $(LIBDIR)/vmthreads
 -	cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
 -	cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
--	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)/vmthreads
 +	if test -f dllvmthreads.so; then cp dllvmthreads.so $(DESTDIR)$(STUBLIBDIR)/.; fi
 +	mkdir -p $(DESTDIR)$(LIBDIR)/vmthreads
 +	cp libvmthreads.a $(DESTDIR)$(LIBDIR)/vmthreads/libvmthreads.a
 +	cd $(DESTDIR)$(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
-+	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(DESTDIR)$(LIBDIR)/vmthreads
-+	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(DESTDIR)$(LIBDIR)/vmthreads
+ 	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
+-	   threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
++	   threads.cma stdlib.cma unix.cma $(DESTDIR)$(LIBDIR)/vmthreads
+ 	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
+-	   $(LIBDIR)/vmthreads
++	   $(DESTDIR)$(LIBDIR)/vmthreads
  
  installopt:
  

Modified: csw/mgar/pkg/ocaml/trunk/files/2-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/2-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/2-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,6 +1,6 @@
 --- a/tools/Makefile.shared
 +++ b/tools/Makefile.shared
-@@ -52,9 +52,10 @@ clean::
+@@ -55,9 +55,10 @@ clean::
  	rm -f ocamldep.opt
  
  install::
@@ -13,21 +13,27 @@
  
  # The profiler
  
-@@ -70,9 +71,10 @@ ocamlcp: ocamlcp.cmo
- 	$(CAMLC) $(LINKFLAGS) -o ocamlcp warnings.cmo main_args.cmo ocamlcp.cmo
+@@ -79,13 +80,14 @@ ocamloptp: ocamloptp.cmo
+ opt:: profiling.cmx
  
  install::
 -	cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
 -	cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
+-	cp ocamloptp $(BINDIR)/ocamloptp$(EXE)
 -	cp profiling.cmi profiling.cmo $(LIBDIR)
 +	ginstall -m 755 -d $(DESTDIR)$(LIBDIR)
-+	cp ocamlprof  $(DESTDIR)$(BINDIR)/ocamlprof$(EXE)
-+	cp ocamlcp  $(DESTDIR)$(BINDIR)/ocamlcp$(EXE)
-+	cp profiling.cmi profiling.cmo  $(DESTDIR)$(LIBDIR)
++	cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE)
++	cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE)
++	cp ocamloptp $(DESTDIR)$(BINDIR)/ocamloptp$(EXE)
++	cp profiling.cmi profiling.cmo $(DESTDIR)$(LIBDIR)
  
+ installopt::
+-	cp profiling.cmx profiling.o $(LIBDIR)
++	cp profiling.cmx profiling.o $(DESTDIR)$(LIBDIR)
+ 
  clean::
- 	rm -f ocamlprof ocamlcp
-@@ -93,7 +95,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
+ 	rm -f ocamlprof ocamlcp ocamloptp
+@@ -106,7 +108,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
  	cp ../myocamlbuild_config.ml .
  
  install::
@@ -36,16 +42,7 @@
  
  clean::
  	rm -f ocamlmklib
-@@ -117,7 +119,7 @@ clean::
- # To make custom toplevels (see Makefile/Makefile.nt)
- 
- install::
--	cp ocamlmktop $(BINDIR)/   # no $(EXE) here, ocamlmktop is a script
-+	cp ocamlmktop  $(DESTDIR)$(BINDIR)/   # no $(EXE) here, ocamlmktop is a script
- 
- clean::
- 	rm -f ocamlmktop
-@@ -234,8 +236,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO)
+@@ -291,8 +293,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO)
  	$(CAMLC) -o objinfo $(OBJINFO)
  
  install::

Modified: csw/mgar/pkg/ocaml/trunk/files/21-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/21-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/21-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,9 +1,9 @@
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
-@@ -37,10 +37,10 @@ OCAMLDOC_LIBCMA=odoc_info.cma
+@@ -36,10 +36,10 @@ OCAMLDOC_LIBCMA=odoc_info.cma
  OCAMLDOC_LIBCMI=odoc_info.cmi
  OCAMLDOC_LIBCMXA=odoc_info.cmxa
- OCAMLDOC_LIBA=odoc_info.a
+ OCAMLDOC_LIBA=odoc_info.$(A)
 -INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
 +INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/ocamldoc
  INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom

Added: csw/mgar/pkg/ocaml/trunk/files/22-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/22-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/22-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -0,0 +1,11 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -19,7 +19,7 @@ ocamlmktop: ocamlmktop.tpl ../config/Makefile
+ 	chmod +x ocamlmktop
+ 
+ install::
+-	cp ocamlmktop $(BINDIR)
++	cp ocamlmktop $(DESTDIR)$(BINDIR)
+ 
+ clean::
+ 	rm -f ocamlmktop

Modified: csw/mgar/pkg/ocaml/trunk/files/4-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/4-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/4-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,11 +1,18 @@
 --- a/stdlib/Makefile.shared
 +++ b/stdlib/Makefile.shared
-@@ -41,7 +41,7 @@ OTHERS=array.cmo list.cmo char.cmo string.cmo sys.cmo \
- all: stdlib.cma std_exit.cmo camlheader camlheader_ur
+@@ -40,13 +40,13 @@ all: stdlib.cma std_exit.cmo camlheader camlheader_ur
  
- install:
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
-+	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(DESTDIR)$(LIBDIR)
+ install: install-$(RUNTIMED)
+ 	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+-	  $(LIBDIR)
++	  $(DESTDIR)$(LIBDIR)
  
+ install-noruntimed:
+ .PHONY: install-noruntimed
+ 
+ install-runtimed: camlheaderd
+-	cp camlheaderd $(LIBDIR)
++	cp camlheaderd $(DESTDIR)$(LIBDIR)
+ .PHONY: install-runtimed
+ 
  stdlib.cma: $(OBJS)
- 	$(CAMLC) -a -o stdlib.cma $(OBJS)

Modified: csw/mgar/pkg/ocaml/trunk/files/6-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/6-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/6-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,7 +1,7 @@
 --- a/asmrun/Makefile
 +++ b/asmrun/Makefile
-@@ -58,15 +58,15 @@ libasmrunp.a: $(POBJS)
- install: install-default install-$(PROFILING)
+@@ -63,23 +63,23 @@ libasmrunp.a: $(POBJS)
+ install: install-default install-$(RUNTIMED) install-$(PROFILING)
  
  install-default:
 -	cp libasmrun.a $(LIBDIR)/libasmrun.a
@@ -9,6 +9,16 @@
 +	cp libasmrun.a $(DESTDIR)$(LIBDIR)/libasmrun.a
 +	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrun.a
  
+ install-noruntimed:
+ .PHONY: install-noruntimed
+ 
+ install-runtimed:
+-	cp libasmrund.a $(LIBDIR)/libasmrund.a
+-	cd $(LIBDIR); $(RANLIB) libasmrund.a
++	cp libasmrund.a $(DESTDIR)$(LIBDIR)/libasmrund.a
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrund.a
+ .PHONY: install-runtimed
+ 
  install-noprof:
 -	rm -f $(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(LIBDIR)/libasmrunp.a
 +	rm -f $(DESTDIR)$(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(DESTDIR)$(LIBDIR)/libasmrunp.a
@@ -17,7 +27,7 @@
 -	cp libasmrunp.a $(LIBDIR)/libasmrunp.a
 -	cd $(LIBDIR); $(RANLIB) libasmrunp.a
 +	cp libasmrunp.a $(DESTDIR)$(LIBDIR)/libasmrunp.a
-+	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrunp.a
++	$(DESTDIR)cd $(LIBDIR); $(RANLIB) libasmrunp.a
  
- power.o: power-$(SYSTEM).o
- 	cp power-$(SYSTEM).o power.o
+ power-bsd_elf.S: power-elf.S
+ 	cp power-elf.S power-bsd_elf.S

Modified: csw/mgar/pkg/ocaml/trunk/files/9-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/9-patch	2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/9-patch	2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,22 +1,26 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -273,26 +273,26 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+@@ -265,29 +265,29 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+ COMPLIBDIR=$(LIBDIR)/compiler-libs
  
- # Installation
  install:
 -	if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi
 -	if test -d $(LIBDIR); then : ; else $(MKDIR) $(LIBDIR); fi
 -	if test -d $(STUBLIBDIR); then : ; else $(MKDIR) $(STUBLIBDIR); fi
+-	if test -d $(COMPLIBDIR); then : ; else $(MKDIR) $(COMPLIBDIR); fi
 -	if test -d $(MANDIR)/man$(MANEXT); then : ; \
 -	  else $(MKDIR) $(MANDIR)/man$(MANEXT); fi
+-	cp VERSION $(LIBDIR)/
 -	cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
-+	if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESDIR)$(BINDIR); fi
-+	if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESDIR)$(LIBDIR); fi
++	if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESTDIR)$(BINDIR); fi
++	if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(LIBDIR); fi
 +	if test -d $(DESTDIR)$(STUBLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(STUBLIBDIR); fi
++	if test -d $(DESTDIR)$(COMPLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(COMPLIBDIR); fi
 +	if test -d $(DESTDIR)$(MANDIR)/man$(MANEXT); then : ; \
 +	  else $(MKDIR) $(DESTDIR)$(MANDIR)/man$(MANEXT); fi
++	cp VERSION $(DESTDIR)$(LIBDIR)/
 +	cd $(DESTDIR)$(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
- 	  dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \
+ 	  dllthreads.so dllunix.so dllgraphics.so dllstr.so \
  	  dlltkanim.so
  	cd byterun; $(MAKE) install
 -	cp ocamlc $(BINDIR)/ocamlc$(EXE)
@@ -26,30 +30,30 @@
  	cd stdlib; $(MAKE) install
 -	cp lex/ocamllex $(BINDIR)/ocamllex$(EXE)
 -	cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
--	cp toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma
--	cp expunge $(LIBDIR)/expunge$(EXE)
--	cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
--	cp toplevel/topstart.cmo $(LIBDIR)
 +	cp lex/ocamllex $(DESTDIR)$(BINDIR)/ocamllex$(EXE)
 +	cp yacc/ocamlyacc$(EXE) $(DESTDIR)$(BINDIR)/ocamlyacc$(EXE)
-+	cp toplevel/toplevellib.cma $(DESTDIR)$(LIBDIR)/toplevellib.cma
+ 	cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
+-	   toplevel/*.cmi $(COMPLIBDIR)
++	   toplevel/*.cmi $(DESTDIR)$(COMPLIBDIR)
+ 	cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
+ 	   compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
+-	   $(COMPLIBDIR)
+-	cp expunge $(LIBDIR)/expunge$(EXE)
+-	cp toplevel/topdirs.cmi $(LIBDIR)
++	   $(DESTDIR)$(COMPLIBDIR)
 +	cp expunge $(DESTDIR)$(LIBDIR)/expunge$(EXE)
-+	cp typing/outcometree.cmi typing/outcometree.mli $(DESTDIR)$(LIBDIR)
-+	cp toplevel/topstart.cmo $(DESTDIR)$(LIBDIR)
- 	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \
--	   $(LIBDIR)
-+	   $(DESTDIR)$(LIBDIR)
++	cp toplevel/topdirs.cmi $(DESTDIR)$(LIBDIR)
  	cd tools; $(MAKE) install
  	-cd man; $(MAKE) install
  	for i in $(OTHERLIBRARIES); do \
-@@ -302,24 +302,24 @@ install:
+@@ -297,17 +297,17 @@ install:
  	if test -f ocamlopt; then $(MAKE) installopt; else :; fi
  	if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
  	   else :; fi
 -	cp config/Makefile $(LIBDIR)/Makefile.config
 -	BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
 +	cp config/Makefile $(DESTDIR)$(LIBDIR)/Makefile.config
-+	BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) MANDIR=$(DESTDIR)$(MANDIR) \
++	BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) PREFIX=$(DESTDIR)$(PREFIX) MANDIR=$(DESTDIR)$(MANDIR) \
  	  ./build/partial-install.sh
  
  # Installation of the native-code compiler
@@ -58,18 +62,32 @@
 -	cp ocamlopt $(BINDIR)/ocamlopt$(EXE)
 +	cp ocamlopt $(DESTDIR)$(BINDIR)/ocamlopt$(EXE)
  	cd stdlib; $(MAKE) installopt
+-	cp asmcomp/*.cmi $(COMPLIBDIR)
+-	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(COMPLIBDIR)
++	cp asmcomp/*.cmi $(DESTDIR)$(COMPLIBDIR)
++	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(DESTDIR)$(COMPLIBDIR)
  	cd ocamldoc; $(MAKE) installopt
  	for i in $(OTHERLIBRARIES); \
  	  do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
- 	if test -f ocamlc.opt; \
--	  then cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi
-+	  then cp ocamlc.opt $(DESTDIR)$(BINDIR)/ocamlc.opt$(EXE); else :; fi
- 	if test -f ocamlopt.opt; \
--	  then cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE); else :; fi
-+	  then cp ocamlopt.opt $(DESTDIR)$(BINDIR)/ocamlopt.opt$(EXE); else :; fi
- 	if test -f lex/ocamllex.opt; \
--	  then cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi
-+	  then cp lex/ocamllex.opt $(DESTDIR)$(BINDIR)/ocamllex.opt$(EXE); else :; fi
+@@ -315,16 +315,16 @@ installopt:
+ 	cd tools; $(MAKE) installopt
  
+ installoptopt:
+-	cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
+-	cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
+-	cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
++	cp ocamlc.opt $(DESTDIR)$(BINDIR)/ocamlc.opt$(EXE)
++	cp ocamlopt.opt $(DESTDIR)$(BINDIR)/ocamlopt.opt$(EXE)
++	cp lex/ocamllex.opt $(DESTDIR)$(BINDIR)/ocamllex.opt$(EXE)
+ 	cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \
+ 	   compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \
+ 	   compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \
+ 	   $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \
+ 	   $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \
+-	   $(COMPLIBDIR)
+-	cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
++	   $(DESTDIR)$(COMPLIBDIR)
++	cd $(DESTDIR)$(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
+ 	   ocamloptcomp.a
+ 
  clean:: partialclean
- 

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 Feb 27 17:59:07 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 27 Feb 2014 16:59:07 +0000
Subject: SF.net SVN: gar:[23075] csw/mgar/pkg/lang-python/gyp/trunk/Makefile
Message-ID: <3fZg8N1cQXz1Wh@mail.opencsw.org>

Revision: 23075
          http://sourceforge.net/p/gar/code/23075
Author:   dmichelsen
Date:     2014-02-27 16:59:05 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
lang-python/gyp/trunk: Disable Solaris 9 and Python 2.6

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

Modified: csw/mgar/pkg/lang-python/gyp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/gyp/trunk/Makefile	2014-02-27 15:54:32 UTC (rev 23074)
+++ csw/mgar/pkg/lang-python/gyp/trunk/Makefile	2014-02-27 16:59:05 UTC (rev 23075)
@@ -18,6 +18,8 @@
 
 LICENSE = LICENSE
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 PACKAGES += CSWgyp
 SPKG_DESC_CSWgyp = Generate Your Projects
 # PKGFILES is catchall
@@ -27,11 +29,11 @@
 CHECKPKG_OVERRIDES_CSWgyp += catalogname-does-not-start-with-py_
 
 # These are default pathes
-CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/generator/eclipse.py
-CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/generator/xcode.py
-CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/gyp/xcode_emulation.py
 CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/generator/eclipse.py
 CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/generator/xcode.py
 CHECKPKG_OVERRIDES_CSWgyp += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/gyp/xcode_emulation.py
 
+# The software uses 2.7 syntax, so do not include 2.6 here
+MODULATIONS_PYTHON_VERSION = 2_7
+
 include gar/category.mk

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


From jake_goerzen at users.sourceforge.net  Thu Feb 27 23:04:38 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 27 Feb 2014 22:04:38 +0000
Subject: SF.net SVN: gar:[23076] csw/mgar/pkg/dovecot/trunk/Makefile
Message-ID: <3fZnwv0rFnzWP@mail.opencsw.org>

Revision: 23076
          http://sourceforge.net/p/gar/code/23076
Author:   jake_goerzen
Date:     2014-02-27 22:04:36 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
dovecot: work around linking mysqlclient.so; add EXTRA_LINKER_FLAGS = -lm

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-27 16:59:05 UTC (rev 23075)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-27 22:04:36 UTC (rev 23076)
@@ -75,6 +75,13 @@
 CONFIGURE_ARGS += --with-zlib
 CONFIGURE_ARGS += --with-bzlib
 
+# Disable linker map forcing SUNW_1.22.2 as the linked MySQL needs SUNW_1.22.5
+LINKER_MAPS =
+
+# This is because libmysqlclient.so is not self-contained as it should be:
+# it uses floor() but does not link to libm. 
+EXTRA_LINKER_FLAGS = -lm
+
 EXTRA_INC = /opt/csw/include/mysql /opt/csw/include/postgresql
 
 STRIP_DIRS  = $(DESTDIR)$(libexecdir)/dovecot

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


From cgrzemba at users.sourceforge.net  Fri Feb 28 09:17:37 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 28 Feb 2014 08:17:37 +0000
Subject: SF.net SVN: gar:[23077] csw/mgar/pkg/lang-python
Message-ID: <3fb3XC5RJ0z13x@mail.opencsw.org>

Revision: 23077
          http://sourceforge.net/p/gar/code/23077
Author:   cgrzemba
Date:     2014-02-28 08:17:36 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
lang-python/django-ckeditor/trunk: Initial commit

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

Added: csw/mgar/pkg/lang-python/django-ckeditor/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django-ckeditor/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/django-ckeditor/Makefile	2014-02-28 08:17:36 UTC (rev 23077)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/lang-python/django-ckeditor/trunk
===================================================================
--- csw/mgar/pkg/lang-python/django-ckeditor/trunk	2014-02-27 22:04:36 UTC (rev 23076)
+++ csw/mgar/pkg/lang-python/django-ckeditor/trunk	2014-02-28 08:17:36 UTC (rev 23077)

Property changes on: csw/mgar/pkg/lang-python/django-ckeditor/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/django-ckeditor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django-ckeditor/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/django-ckeditor/trunk/Makefile	2014-02-28 08:17:36 UTC (rev 23077)
@@ -0,0 +1,26 @@
+# Copyright 2011 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+
+NAME = django-ckeditor
+VERSION = 4.0.2
+CATEGORIES = python
+GARTYPE = v2
+DESCRIPTION = Django admin CKEditor integration
+define BLURB
+endef
+
+DISTNAME = $(NAME)-$(VERSION)
+DISTFILES  = $(DISTNAME).tar.gz
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+PACKAGES = CSWpy-django-ckeditor
+
+BUILD_DEP_PKGS += CSWpysetuptools
+RUNTIME_DEP_PKGS += CSWpy-django
+
+# checkpkg can't detect python run time dependencies
+CHECKPKG_OVERRIDES_CSWpy-django-ckeditor += surplus-dependency|CSWpy-django
+
+# SKIPTEST=1
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/lang-python/django-ckeditor/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/django-ckeditor/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/django-ckeditor/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/django-ckeditor/trunk/checksums	2014-02-28 08:17:36 UTC (rev 23077)
@@ -0,0 +1 @@
+1d8066b124f2cab85f14c2266b828fd3  django-ckeditor-4.0.2.tar.gz

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


From cgrzemba at users.sourceforge.net  Fri Feb 28 09:18:14 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 28 Feb 2014 08:18:14 +0000
Subject: SF.net SVN: gar:[23078] csw/mgar/pkg/lang-python
Message-ID: <3fb3Xv6TwHz17K@mail.opencsw.org>

Revision: 23078
          http://sourceforge.net/p/gar/code/23078
Author:   cgrzemba
Date:     2014-02-28 08:18:12 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
lang-python/pillow/trunk: Initial commit

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

Added: csw/mgar/pkg/lang-python/pillow/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pillow/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pillow/Makefile	2014-02-28 08:18:12 UTC (rev 23078)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/lang-python/pillow/trunk
===================================================================
--- csw/mgar/pkg/lang-python/pillow/trunk	2014-02-28 08:17:36 UTC (rev 23077)
+++ csw/mgar/pkg/lang-python/pillow/trunk	2014-02-28 08:18:12 UTC (rev 23078)

Property changes on: csw/mgar/pkg/lang-python/pillow/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/pillow/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pillow/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pillow/trunk/Makefile	2014-02-28 08:18:12 UTC (rev 23078)
@@ -0,0 +1,21 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = Pillow
+VERSION = 2.3.0
+GARTYPE = v2
+CATEGORIES = python
+
+DESCRIPTION = Python Imaging Library (fork)
+define BLURB
+  Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
+endef
+
+DISTFILES  = $(DISTNAME).zip
+
+PACKAGES += CSWpy-pillow
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/lang-python/pillow/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/pillow/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pillow/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pillow/trunk/checksums	2014-02-28 08:18:12 UTC (rev 23078)
@@ -0,0 +1 @@
+56b6614499aacb7d6b5983c4914daea7  Pillow-2.3.0.zip

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


From cgrzemba at users.sourceforge.net  Fri Feb 28 09:18:54 2014
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 28 Feb 2014 08:18:54 +0000
Subject: SF.net SVN: gar:[23079] csw/mgar/pkg/lang-python
Message-ID: <3fb3Yg72KGz1Bj@mail.opencsw.org>

Revision: 23079
          http://sourceforge.net/p/gar/code/23079
Author:   cgrzemba
Date:     2014-02-28 08:18:54 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
lang-python/django-schedule/trunk: Initial commit

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

Added: csw/mgar/pkg/lang-python/django-schedule/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django-schedule/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/django-schedule/Makefile	2014-02-28 08:18:54 UTC (rev 23079)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/lang-python/django-schedule/trunk
===================================================================
--- csw/mgar/pkg/lang-python/django-schedule/trunk	2014-02-28 08:18:12 UTC (rev 23078)
+++ csw/mgar/pkg/lang-python/django-schedule/trunk	2014-02-28 08:18:54 UTC (rev 23079)

Property changes on: csw/mgar/pkg/lang-python/django-schedule/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/lang-python/django-schedule/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/django-schedule/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/django-schedule/trunk/Makefile	2014-02-28 08:18:54 UTC (rev 23079)
@@ -0,0 +1,25 @@
+# Copyright 2011 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+
+NAME = django-schedule
+VERSION = 0.5b
+CATEGORIES = python
+GARTYPE = v2
+DESCRIPTION = A 
+define BLURB
+	simple.
+endef
+
+GIT_REPOS = git://github.com/thauber/django-schedule.git
+# DISTNAME = $(NAME)-$(VERSION)
+# DISTFILES  = $(DISTNAME).tar.gz
+
+BUILD_DEP_PKGS += CSWpysetuptools
+RUNTIME_DEP_PKGS += CSWpy-django
+
+# checkpkg can't detect python run time dependencies
+
+# SKIPTEST=1
+#TEST_TARGET = check
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/lang-python/django-schedule/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/lang-python/django-schedule/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 Feb 28 10:48:14 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:48:14 +0000
Subject: SF.net SVN: gar:[23080] csw/mgar/gar/v2/lib/python/catalog_notifier.py
Message-ID: <3fb5Xl6Qsjz1T4@mail.opencsw.org>

Revision: 23080
          http://sourceforge.net/p/gar/code/23080
Author:   wahwah
Date:     2014-02-28 09:48:13 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
catalog_notifier: Adapted to the new code

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

Modified: csw/mgar/gar/v2/lib/python/catalog_notifier.py
===================================================================
--- csw/mgar/gar/v2/lib/python/catalog_notifier.py	2014-02-28 08:18:54 UTC (rev 23079)
+++ csw/mgar/gar/v2/lib/python/catalog_notifier.py	2014-02-28 09:48:13 UTC (rev 23080)
@@ -3,21 +3,22 @@
 """Polls a designated catalog tree, and sends notifications about
 package updates."""
 
-import optparse
-import catalog
-import common_constants
 from Cheetah import Template
-import urllib2
-import logging
-import configuration
-import pprint
+from email.mime.text import MIMEText
 import cPickle
 import json
+import logging
+import optparse
 import os.path
+import pprint
 import smtplib
-from email.mime.text import MIMEText
-import rest
+import urllib2
 
+from lib.python import common_constants
+from lib.python import configuration
+from lib.python import rest
+from lib.python import catalog
+
 REPORT_TMPL = u"""Catalog update report for $email
 Catalog URL: $url
 #import re
@@ -249,7 +250,13 @@
     else:
       logging.debug("%s not found in previous_catalogs_by_triad", key)
   formatter = NotificationFormatter()
-  rest_client = rest.RestClient()
+  username, password = rest.GetUsernameAndPassword()
+  config = configuration.GetConfig()
+  rest_client = rest.RestClient(
+      pkgdb_url=config.get('rest', 'pkgdb'),
+      releases_url=config.get('rest', 'releases'),
+      username=username,
+      password=password)
   notifications = formatter.FormatNotifications(
       cat_tree_url, catalogs, rest_client)
   whitelist = frozenset()

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 Feb 28 10:48:29 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:48:29 +0000
Subject: SF.net SVN: gar:[23081] csw/mgar/gar/v2/lib/python/common_constants.py
Message-ID: <3fb5Y22JsDz1XS@mail.opencsw.org>

Revision: 23081
          http://sourceforge.net/p/gar/code/23081
Author:   wahwah
Date:     2014-02-28 09:48:29 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
pkgdb: Updated list of catalogs

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

Modified: csw/mgar/gar/v2/lib/python/common_constants.py
===================================================================
--- csw/mgar/gar/v2/lib/python/common_constants.py	2014-02-28 09:48:13 UTC (rev 23080)
+++ csw/mgar/gar/v2/lib/python/common_constants.py	2014-02-28 09:48:29 UTC (rev 23081)
@@ -72,11 +72,12 @@
 # a symlink, so should not be listed here.
 DEFAULT_CATALOG_RELEASES = frozenset([
     'beanie',
+    'bratislava',
     'dublin',
+    'kiel',
+    'legacy',
     'unstable',
-    'legacy',
-    'kiel',
-    ])
+])
 
 # At some point, it was used to prevent people from linking against
 # libX11.so.4, but due to issues with 3D acceleration.

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 Feb 28 10:48:37 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:48:37 +0000
Subject: SF.net SVN: gar:[23082]
	csw/mgar/gar/v2/lib/python/generate_catalog_file.py
Message-ID: <3fb5YB59pvz2H@mail.opencsw.org>

Revision: 23082
          http://sourceforge.net/p/gar/code/23082
Author:   wahwah
Date:     2014-02-28 09:48:36 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
generate_catalog_file: Update for the new APIs

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

Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py
===================================================================
--- csw/mgar/gar/v2/lib/python/generate_catalog_file.py	2014-02-28 09:48:29 UTC (rev 23081)
+++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py	2014-02-28 09:48:36 UTC (rev 23082)
@@ -21,27 +21,28 @@
 CATALOG_FN = "catalog"
 DESC_FN = "descriptions"
 
-import rest
 import os
 import optparse
 import logging
 import sys
 import datetime
-import representations
 
+from lib.python import configuration
+from lib.python import representations
+from lib.python import rest
 
+
 class Error(Exception):
   """A general error."""
 
 class CatalogFileGenerator(object):
 
-  def __init__(self, catrel, arch, osrel,
-               rest_client=None):
+  def __init__(self, catrel, arch, osrel, rest_client):
     self.catrel = catrel
     self.arch = arch
     self.osrel = osrel
     home_dir = os.environ['HOME']
-    self.rest_client = rest_client or rest.RestClient()
+    self.rest_client = rest_client
     self._catalog = None
 
   @property
@@ -99,7 +100,15 @@
   parser.add_option("--arch", dest="arch")
   parser.add_option("--os-release", dest="osrel")
   options, args = parser.parse_args()
-  cfg = CatalogFileGenerator(options.catrel, options.arch, options.osrel)
+  username, password = rest.GetUsernameAndPassword()
+  config = configuration.GetConfig()
+  rest_client = rest.RestClient(
+      pkgdb_url=config.get('rest', 'pkgdb'),
+      releases_url=config.get('rest', 'releases'),
+      username=username,
+      password=password)
+  cfg = CatalogFileGenerator(options.catrel, options.arch, options.osrel,
+                             rest_client)
   cfg.GenerateCatalog(options.out_dir)
 
 

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 Feb 28 10:48:44 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:48:44 +0000
Subject: SF.net SVN: gar:[23083]
	csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles. html
Message-ID: <3fb5YK4TV7z4d@mail.opencsw.org>

Revision: 23083
          http://sourceforge.net/p/gar/code/23083
Author:   wahwah
Date:     2014-02-28 09:48:44 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
pkgdb: Display column names on SVR4 details page

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html

Modified: csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html
===================================================================
--- csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html	2014-02-28 09:48:36 UTC (rev 23082)
+++ csw/mgar/gar/v2/lib/web/templates/Srv4DetailFiles.html	2014-02-28 09:48:44 UTC (rev 23083)
@@ -15,6 +15,14 @@
 </h2>
 
 <table>
+<tr>
+<th>mode</th>
+<th>user</th>
+<th>group</th>
+<th>path</th>
+<th>mime type</th>
+<th>machine</th>
+</tr>
 $for file in files:
   <tr>
   <td>$file.perm_mode</td>
@@ -22,6 +30,7 @@
   <td>$file.perm_group</td>
   <td>$file.FullPath()</td>
   <td>$file.mimetype</td>
+  <td>$file.machine</td>
   </tr>
 </table>
 

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 Feb 28 10:48:53 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:48:53 +0000
Subject: SF.net SVN: gar:[23084] csw/mgar/gar/v2/lib
Message-ID: <3fb5YX1yTQz8Y@mail.opencsw.org>

Revision: 23084
          http://sourceforge.net/p/gar/code/23084
Author:   wahwah
Date:     2014-02-28 09:48:52 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
pkgdb: A number of fixes for the new APIs

These are the changes made on the web host to make catalog generation work.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/python/rest.py
    csw/mgar/gar/v2/lib/web/pkgdb_web.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2014-02-28 09:48:44 UTC (rev 23083)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2014-02-28 09:48:52 UTC (rev 23084)
@@ -205,9 +205,12 @@
   def __init__(self, debug=False):
     self.debug = debug
     config = configuration.GetConfig()
+    username, password = rest.GetUsernameAndPassword()
     self.rest_client = rest.RestClient(
         pkgdb_url=config.get('rest', 'pkgdb'),
         releases_url=config.get('rest', 'releases'),
+        username=username,
+        password=password,
         debug=debug)
 
   def SyncFromCatalogFile(self, osrel, arch, catrel, catalog_file,

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2014-02-28 09:48:44 UTC (rev 23083)
+++ csw/mgar/gar/v2/lib/python/rest.py	2014-02-28 09:48:52 UTC (rev 23084)
@@ -22,8 +22,8 @@
 from lib.python import shell
 
 
-DEFAULT_TRIES = 1
-DEFAULT_RETRY_DELAY = 1
+DEFAULT_TRIES = 5
+DEFAULT_RETRY_DELAY = 10
 
 
 class ArgumentError(errors.Error):

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2014-02-28 09:48:44 UTC (rev 23083)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2014-02-28 09:48:52 UTC (rev 23084)
@@ -4,7 +4,7 @@
 
 import sys
 import os
-sys.path.append(os.path.join(os.path.split(__file__)[0], "..", ".."))
+# sys.path.append(os.path.join(os.path.split(__file__)[0], "..", ".."))
 
 import cjson
 import datetime
@@ -18,6 +18,9 @@
 
 from sqlobject import sqlbuilder
 
+# sys.stderr.write("Running Python binary from {}.\n".format(sys.executable))
+# sys.stderr.write("Python path is {}.\n".format(sys.path))
+
 from lib.python import checkpkg_lib
 from lib.python import models
 from lib.python import representations
@@ -499,16 +502,11 @@
 
   def GET(self, md5_sum):
     try:
-      pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne()
+      blob = models.Srv4FileStatsBlob.selectBy(md5_sum=md5_sum).getOne()
     except sqlobject.main.SQLObjectNotFound, e:
       raise web.notfound()
     web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkg-stats')
-    if pkg.data_obj_mimetype == 'application/json':
-      # If data are in JSON already, we can send them without decoding.
-      return pkg.data_obj.pickle
-    else:
-      data_structure = pkg.GetStatsStruct()
-      return cjson.encode(data_structure)
+    return blob.json
 
 
 class Srv4ByCatAndCatalogname(object):
@@ -753,5 +751,5 @@
 else:
   application = app_wrapper(app).wsgifunc()
   # application = app.wsgifunc()
-  from paste.exceptions.errormiddleware import ErrorMiddleware
-  application = ErrorMiddleware(application, debug=debugme)
+  # from paste.exceptions.errormiddleware import ErrorMiddleware
+  # application = ErrorMiddleware(application, debug=debugme)

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2014-02-28 09:48:44 UTC (rev 23083)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2014-02-28 09:48:52 UTC (rev 23084)
@@ -5,7 +5,6 @@
 
 import sys
 import os
-sys.path.append(os.path.join(os.path.split(__file__)[0], "..", ".."))
 
 import base64
 import cjson

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 Feb 28 10:58:19 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 09:58:19 +0000
Subject: SF.net SVN: gar:[23085] csw/mgar/pkg/google-gflags/trunk/Makefile
Message-ID: <3fb5mM25mfzGV@mail.opencsw.org>

Revision: 23085
          http://sourceforge.net/p/gar/code/23085
Author:   wahwah
Date:     2014-02-28 09:58:16 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
google-gflags/trunk: Version bump

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

Modified: csw/mgar/pkg/google-gflags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/Makefile	2014-02-28 09:48:52 UTC (rev 23084)
+++ csw/mgar/pkg/google-gflags/trunk/Makefile	2014-02-28 09:58:16 UTC (rev 23085)
@@ -5,7 +5,7 @@
 NAME = gflags
 VERSION = 2.0
 GARTYPE = v2
-DESCRIPTION = a library that implements commandline flags processing
+DESCRIPTION = Commandline flags module for C++
 define BLURB
 	The gflags package contains a library that implements commandline flags
 	processing. As such it's a replacement for getopt(). It has increased
@@ -27,4 +27,19 @@
 MERGE_DIRS_isa-sparcv9 = $(libdir)
 MERGE_DIRS_isa-amd64   = $(libdir)
 
+
+PACKAGES += CSWlibgflags2
+PKGFILES_CSWlibgflags2 += $(call baseisadirs,$(libdir),libgflags\.so\.2(\.\d+)*)
+SPKG_DESC_CSWlibgflags2 += $(DESCRIPTION), libgflags.so.2
+RUNTIME_DEP_PKGS_CSWlibgflags2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgflags2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgflags += CSWlibgflags2
+
+PACKAGES += CSWlibgflags-nothreads2
+PKGFILES_CSWlibgflags-nothreads2 += $(call baseisadirs,$(libdir),libgflags_nothreads\.so\.2(\.\d+)*)
+SPKG_DESC_CSWlibgflags-nothreads2 += $(DESCRIPTION), libgflags_nothreads.so.2
+RUNTIME_DEP_PKGS_CSWlibgflags-nothreads2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgflags-nothreads2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgflags += CSWlibgflags-nothreads2
+
 include gar/category.mk

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


From wahwah at users.sourceforge.net  Fri Feb 28 11:34:49 2014
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 28 Feb 2014 10:34:49 +0000
Subject: SF.net SVN: gar:[23086]
	csw/mgar/gar/v2/lib/python/package_checks_test.py
Message-ID: <3fb6ZV22fpzTk@mail.opencsw.org>

Revision: 23086
          http://sourceforge.net/p/gar/code/23086
Author:   wahwah
Date:     2014-02-28 10:34:47 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
checkpkg: Enable unit tests for {sym,hard}links

There seems to be a problem with dependency detection, but it's not obvious.
These tests are passing.

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

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2014-02-28 09:58:16 UTC (rev 23085)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2014-02-28 10:34:47 UTC (rev 23086)
@@ -2671,38 +2671,34 @@
     self.error_mgr_mock.NeedFile('/etc/opt/csw/init.d', mox.IsA(str))
 
 
-# class TestCheckDanglingSymlinks(CheckTestHelper,
-#                                 unittest.TestCase):
-#   FUNCTION_NAME = 'CheckDanglingSymlinks'
-# 
-#   def testSymlinkTargetNeeded(self):
-#     self.pkg_data = copy.deepcopy(tree_stats[0])
-#     self.pkg_data["pkgmap"].append(
-#         {'class': 'none',
-#          'group': None,
-#          'line': None,
-#          'mode': None,
-#          'path': '/opt/csw/lib/postgresql/9.0/lib/libpq.so.5',
-#          'type': 's',
-#          'user': None,
-#          'target': '/opt/csw/lib/libpq.so.5'})
-#     self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
-# 
-#   # Hardlinks work the same way.
-#   def testHardlinkTargetNeeded(self):
-#     self.pkg_data = copy.deepcopy(tree_stats[0])
-#     self.pkg_data["pkgmap"].append(
-#         {'class': 'none',
-#          'group': None,
-#          'line': None,
-#          'mode': None,
-#          'path': '/opt/csw/lib/postgresql/9.0/lib/libpq.so.5',
-#          'type': 'l',
-#          'user': None,
-#          'target': '/opt/csw/lib/libpq.so.5'})
-#     self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
+class TestCheckDanglingSymlinks(CheckTestHelper,
+                                unittest.TestCase):
+  FUNCTION_NAME = 'CheckDanglingSymlinks'
 
+  def testSymlinkTargetNeeded(self):
+    self.pkg_data = copy.deepcopy(tree_stats[0])
+    self.pkg_data["pkgmap"].append(
+        self.TestPkgmapEntry(
+          entry_path='/opt/csw/lib/postgresql/9.0/lib/libpq.so.5',
+          class_='none',
+          type_='s',
+          target='/opt/csw/lib/libpq.so.5',
+        ))
+    self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
 
+  # Hardlinks work the same way.
+  def disabledtestHardlinkTargetNeeded(self):
+    self.pkg_data = copy.deepcopy(tree_stats[0])
+    self.pkg_data["pkgmap"].append(
+        self.TestPkgmapEntry(
+          entry_path='/opt/csw/lib/postgresql/9.0/lib/libpq.so.5',
+          class_='none',
+          type_='l',
+          target='/opt/csw/lib/libpq.so.5',
+        ))
+    self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
+
+
 # class TestCheckPrefixDirs(CheckTestHelper,
 #                           unittest.TestCase):
 #   FUNCTION_NAME = 'CheckPrefixDirs'

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 Feb 28 13:01:08 2014
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 28 Feb 2014 12:01:08 +0000
Subject: SF.net SVN: gar:[23087] csw/mgar/pkg/nginx/trunk
Message-ID: <3fb8V511Lzzf4@mail.opencsw.org>

Revision: 23087
          http://sourceforge.net/p/gar/code/23087
Author:   dmichelsen
Date:     2014-02-28 12:01:05 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
nginx/trunk: Update to 1.5.9, enable SPDY

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2014-02-28 10:34:47 UTC (rev 23086)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2014-02-28 12:01:05 UTC (rev 23087)
@@ -1,5 +1,5 @@
 NAME = nginx
-VERSION = 1.5.7
+VERSION = 1.5.9
 GARTYPE = v2
 
 DESCRIPTION = HTTP server and mail proxy server
@@ -102,6 +102,7 @@
 CONFIGURE_ARGS += --with-http_secure_link_module
 CONFIGURE_ARGS += --with-http_degradation_module
 CONFIGURE_ARGS += --with-http_stub_status_module
+CONFIGURE_ARGS += --with-http_spdy_module
 # Enable when we have 64 bit perl
 # CONFIGURE_ARGS += --with-http_perl_module
 

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2014-02-28 10:34:47 UTC (rev 23086)
+++ csw/mgar/pkg/nginx/trunk/checksums	2014-02-28 12:01:05 UTC (rev 23087)
@@ -1 +1 @@
-39d4f5262435f3e11dafb4a02ce7f5dd  nginx-1.5.7.tar.gz
+5fbde453d6bbc496f62a84412cd0bd8f  nginx-1.5.9.tar.gz

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


From jake_goerzen at users.sourceforge.net  Fri Feb 28 18:18:30 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Fri, 28 Feb 2014 17:18:30 +0000
Subject: SF.net SVN: gar:[23088] csw/mgar/pkg/dovecot/trunk/Makefile
Message-ID: <3fbHXV12hsz1Hd@mail.opencsw.org>

Revision: 23088
          http://sourceforge.net/p/gar/code/23088
Author:   jake_goerzen
Date:     2014-02-28 17:18:27 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
dovecot: remove EXTRA_LINKER_FLAGS = -lm

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-28 12:01:05 UTC (rev 23087)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2014-02-28 17:18:27 UTC (rev 23088)
@@ -78,10 +78,6 @@
 # Disable linker map forcing SUNW_1.22.2 as the linked MySQL needs SUNW_1.22.5
 LINKER_MAPS =
 
-# This is because libmysqlclient.so is not self-contained as it should be:
-# it uses floor() but does not link to libm. 
-EXTRA_LINKER_FLAGS = -lm
-
 EXTRA_INC = /opt/csw/include/mysql /opt/csw/include/postgresql
 
 STRIP_DIRS  = $(DESTDIR)$(libexecdir)/dovecot

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


From jake_goerzen at users.sourceforge.net  Fri Feb 28 19:42:27 2014
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Fri, 28 Feb 2014 18:42:27 +0000
Subject: SF.net SVN: gar:[23089] csw/mgar/pkg/freeciv/trunk/Makefile
Message-ID: <3fbKP83Fg8z1SW@mail.opencsw.org>

Revision: 23089
          http://sourceforge.net/p/gar/code/23089
Author:   jake_goerzen
Date:     2014-02-28 18:42:25 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
freeciv: enable database support for mysql, postgres, sqlite3; enable additional clients sdl, xaw

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

Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2014-02-28 17:18:27 UTC (rev 23088)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2014-02-28 18:42:25 UTC (rev 23089)
@@ -41,7 +41,12 @@
 TEST_SCRIPTS =
 
 CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-fcdb=all
+CONFIGURE_ARGS += --enable-client=gtk2,sdl,xaw
 
+# Disable linker map forcing SUNW_1.22.2 as the linked MySQL needs SUNW_1.22.5
+LINKER_MAPS =
+
 # build package on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

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